deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-12 16:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

huge cleanup on build system

Browse Source
This commit is contained in:
berkeviktor@aol.com
2010-08-24 20:03:18 +02:00
parent e0e70fccd4
commit cbcf58aba6
17 changed files with 231 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/makefile.mak
View File

@@ -3,7 +3,7 @@ include "..\makeinc.mak"
all: $(COMMON_OBJECTS) xchatcommon.lib
xchatcommon.lib: $(COMMON_OBJECTS)
lib -out:xchatcommon.lib $(COMMON_OBJECTS)
lib /nologo /out:xchatcommon.lib $(COMMON_OBJECTS)
.c.obj:
$(CC) $(CFLAGS) $(GLIB) $<

7
src/fe-gtk/makefile.mak
View File

@@ -15,11 +15,10 @@ mmx_cmod.o: mmx_cmod.S
gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S
.c.obj:
$(CC) $(CFLAGS) $(GLIB) $(GTK) $(SPELL) $<
$(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $(SPELL) $<
$(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
$(LINK) /out:$(PROG) /ENTRY:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
@dir $(PROG)
$(LINK) /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
xchat.rc:
echo XC_ICON ICON "../../xchat.ico" > xchat.rc
@@ -28,7 +27,7 @@ xchat.res: xchat.rc ../../xchat.ico
rc /r xchat.rc
xchat-icon.obj: xchat.res
cvtres /NOLOGO $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res
cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res
clean:
del *.obj

25
src/makefile.mak
View File

@@ -1,16 +1,15 @@
all:
copy ..\plugins\xchat-plugin.h common
@cd common
@-$(MAKE) -f makefile.mak $@
@cd ..\fe-gtk
@-$(MAKE) -f makefile.mak $@
cd common
@-$(MAKE) /nologo /s /f makefile.mak $@
cd ..\fe-gtk
@-$(MAKE) /nologo /s /f makefile.mak $@
clean:
del common\*.obj
del common\xchatcommon.lib
del fe-gtk\*.obj
del fe-gtk\mmx_cmod.o
del fe-gtk\xchat.exe
del fe-gtk\xchat.rc
del fe-gtk\xchat.RES
del pixmaps\*.h
@del common\*.obj
@del common\xchatcommon.lib
@del fe-gtk\*.obj
@del fe-gtk\mmx_cmod.o
@del fe-gtk\xchat.exe
@del fe-gtk\xchat.rc
@del fe-gtk\xchat.RES
@del pixmaps\*.h

15
src/makeinc.skel
View File

@@ -1,6 +1,7 @@
CC = cl
LINK = link
CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6
CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6
CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins
CPPFLAGS = /c /MD /nologo /DWIN32
LDFLAGS = /subsystem:windows /nologo
LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ws2_32.lib
@@ -8,9 +9,9 @@ LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib
!ifdef X64
#############################################################
#x64 config
GLIB = -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include
GTK = -Ic:/mozilla-build/build/xchat-dev64/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/cairo -Ic:/mozilla-build/build/xchat-dev64/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/freetype2 -Ic:/mozilla-build/build/xchat-dev64/include -Ic:/mozilla-build/build/xchat-dev64/include/libpng14
LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev64/lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib gdi32.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib
GLIB = -Ic:\mozilla-build\build\xchat-dev64\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\glib-2.0\include
GTK = -Ic:\mozilla-build\build\xchat-dev64\include\gtk-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\gtk-2.0\include -Ic:\mozilla-build\build\xchat-dev64\include\atk-1.0 -Ic:\mozilla-build\build\xchat-dev64\include\cairo -Ic:\mozilla-build\build\xchat-dev64\include\pango-1.0 -Ic:\mozilla-build\build\xchat-dev64\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\glib-2.0\include -Ic:\mozilla-build\build\xchat-dev64\include
LIBS = $(LIBS) /libpath:c:\mozilla-build\build\xchat-dev64\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib
OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x64
CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include
@@ -27,9 +28,9 @@ TCLPATH = c:\mozilla-build\tcl-8.5-x64
!else
#############################################################
#x86 config
GLIB = -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include
GTK = -Ic:/mozilla-build/build/xchat-dev32/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/cairo -Ic:/mozilla-build/build/xchat-dev32/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/freetype2 -Ic:/mozilla-build/build/xchat-dev32/include -Ic:/mozilla-build/build/xchat-dev32/include/libpng14
LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev32/lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib gdi32.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib
GLIB = -Ic:\mozilla-build\build\xchat-dev32\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\glib-2.0\include
GTK = -Ic:\mozilla-build\build\xchat-dev32\include\gtk-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\gtk-2.0\include -Ic:\mozilla-build\build\xchat-dev32\include\atk-1.0 -Ic:\mozilla-build\build\xchat-dev32\include\cairo -Ic:\mozilla-build\build\xchat-dev32\include\pango-1.0 -Ic:\mozilla-build\build\xchat-dev32\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\glib-2.0\include -Ic:\mozilla-build\build\xchat-dev32\include
LIBS = $(LIBS) /libpath:c:\mozilla-build\build\xchat-dev32\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib
OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x86
CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include

2
src/pixmaps/makefile.mak
View File

@@ -12,7 +12,7 @@ LIST = bookpng book.png \
xchatpng ..\..\xchat.png
all:
$(CONV) --build-list $(LIST) > inline_pngs.h
@$(CONV) --build-list $(LIST) > inline_pngs.h
clean:
del *.h