some makefile cleanup

6 files changed, 29 insertions, 38 deletions

diff --git a/build/build-small.bat b/build/build-small.bat
index 6e50266f..ce766497 100644
--- a/build/build-small.bat
+++ b/build/build-small.bat
@@ -3,7 +3,7 @@ set WDK_ROOT=c:\WinDDK\7600.16385.1
 cd ..
 set DEV_32=%cd%\dep-x86
 cd src
-echo DEV32 = %DEV_32% > makeinc.mak
+echo DEV = %DEV_32% > makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386
diff --git a/build/build-x64.bat b/build/build-x64.bat
index ab8988cb..a4148768 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -5,7 +5,7 @@ cd ..
 set DEV_64=%cd%\dep-x64
 cd src
 echo X64 = YES > makeinc.mak
-echo DEV64 = %DEV_64% >> makeinc.mak
+echo DEV = %DEV_64% >> makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
 set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 02411222..7776ee4d 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -9,7 +9,7 @@ echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk.iss
 type build\xchat-wdk.skel.iss >> build\xchat-wdk.iss
 set DEV_32=%cd%\dep-x86
 cd src
-echo DEV32 = %DEV_32% > makeinc.mak
+echo DEV = %DEV_32% > makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386
diff --git a/plugins/perl/makefile-510.mak b/plugins/perl/makefile-510.mak
index a91587d2..5a57a707 100644
--- a/plugins/perl/makefile-510.mak
+++ b/plugins/perl/makefile-510.mak
@@ -1,7 +1,6 @@
 include "..\..\src\makeinc.mak"
 
-TARGET = xcperl-510.dll
-PERLLIB = perl510
+TARGET = $(PERL510OUTPUT)
 
 all: $(TARGET)
 
@@ -12,7 +11,7 @@ perl.def:
 	echo xchat_plugin_get_info >> perl.def
 
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL510PATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL510PATH) /I.. /DPERL_DLL=\"$(PERL510LIB).dll\"
 
 perl.c: xchat.pm.h
 
@@ -20,7 +19,7 @@ xchat.pm.h: Xchat.pm IRC.pm
 	perl.exe generate_header
 
 $(TARGET): perl.obj perl.def
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERL510PATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
+	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL510LIB).lib /libpath:$(PERL510PATH) /DELAYLOAD:$(PERL510LIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
 
 clean:
 	@del $(TARGET)
diff --git a/plugins/perl/makefile-512.mak b/plugins/perl/makefile-512.mak
index 2ef298d8..5a714f1d 100644
--- a/plugins/perl/makefile-512.mak
+++ b/plugins/perl/makefile-512.mak
@@ -1,7 +1,6 @@
 include "..\..\src\makeinc.mak"
 
-TARGET = xcperl-512.dll
-PERLLIB = perl512
+TARGET = $(PERL512OUTPUT)
 
 all: $(TARGET)
 
@@ -12,7 +11,7 @@ perl.def:
 	echo xchat_plugin_get_info >> perl.def
 
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH) /I.. /DPERL_DLL=\"$(PERL512LIB).dll\"
 
 perl.c: xchat.pm.h
 
@@ -20,7 +19,7 @@ xchat.pm.h: Xchat.pm IRC.pm
 	perl.exe generate_header
 
 $(TARGET): perl.obj perl.def
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERL512PATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
+	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL512LIB).lib /libpath:$(PERL512PATH) /DELAYLOAD:$(PERL512LIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
 
 clean:
 	@del $(TARGET)
diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak
index 8097d6d4..212bcb17 100644
--- a/src/makeinc.skel.mak
+++ b/src/makeinc.skel.mak
@@ -2,21 +2,32 @@ CC = cl
 LINK = link
 CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo
 CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_PIXBUF_DISABLE_DEPRECATED /DGDK_DISABLE_DEPRECATED /DUSE_IPV6 /DHAVE_STRTOULL /Dstrtoull=_strtoui64 /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /DUSE_OPENSSL
-CFLAGS = $(CFLAGS)
+CFLAGS = $(CFLAGS) /I$(DEV)\include
 CPPFLAGS = /c /MD /W0 /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 wininet.lib comdlg32.lib libeay32.lib ssleay32.lib
 
-!ifdef X64
-#############################################################
-#x64 config
+GLIB = /I$(DEV)\include\glib-2.0 /I$(DEV)\lib\glib-2.0\include
+GTK = /I$(DEV)\include\gtk-2.0 /I$(DEV)\lib\gtk-2.0\include /I$(DEV)\include\atk-1.0 /I$(DEV)\include\cairo /I$(DEV)\include\pango-1.0 /I$(DEV)\include\gdk-pixbuf-2.0
+LIBS = $(LIBS) /libpath:$(DEV)\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
+
+LUALIB = lua51
+LUAOUTPUT = xclua.dll
 
-GLIB = /I$(DEV64)\include\glib-2.0 /I$(DEV64)\lib\glib-2.0\include
-GTK = /I$(DEV64)\include\gtk-2.0 /I$(DEV64)\lib\gtk-2.0\include /I$(DEV64)\include\atk-1.0 /I$(DEV64)\include\cairo /I$(DEV64)\include\pango-1.0 /I$(DEV64)\include\gdk-pixbuf-2.0
-LIBS = $(LIBS) /libpath:$(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
+PERL510LIB = perl510
+PERL510OUTPUT = xcperl-510.dll
+PERL512LIB = perl512
+PERL512OUTPUT = xcperl-512.dll
 
-CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include
-CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include
+PYTHONLIB = python26
+PYTHONOUTPUT = xcpython.dll
+
+TCLLIB = tcl85
+TCLOUTPUT = xctcl.dll
+
+!ifdef X64
+CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64
+CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64
 LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
 
 PERL510PATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
@@ -24,14 +35,6 @@ PERL512PATH = c:\mozilla-build\perl-5.12-x64\lib\CORE
 PYTHONPATH = c:\mozilla-build\python-2.6-x64
 TCLPATH = c:\mozilla-build\tcl-8.5-x64
 !else
-#############################################################
-#x86 config
-
-GLIB = /I$(DEV32)\include\glib-2.0 /I$(DEV32)\lib\glib-2.0\include
-GTK = /I$(DEV32)\include\gtk-2.0 /I$(DEV32)\lib\gtk-2.0\include /I$(DEV32)\include\atk-1.0 /I$(DEV32)\include\cairo /I$(DEV32)\include\pango-1.0 /I$(DEV32)\include\gdk-pixbuf-2.0
-LIBS = $(LIBS) /libpath:$(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
-
-CFLAGS = $(CFLAGS) /I$(DEV32)\include
 LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
 
 PERL510PATH = c:\mozilla-build\perl-5.10-x86\lib\CORE
@@ -39,13 +42,3 @@ PERL512PATH = c:\mozilla-build\perl-5.12-x86\lib\CORE
 PYTHONPATH = c:\mozilla-build\python-2.6-x86
 TCLPATH = c:\mozilla-build\tcl-8.5-x86
 !endif
-#############################################################
-
-LUALIB = lua51
-LUAOUTPUT = xclua.dll
-
-PYTHONLIB = python26
-PYTHONOUTPUT = xcpython.dll
-
-TCLLIB = tcl85
-TCLOUTPUT = xctcl.dll