update wdk distribution to use relative paths where possible

10 files changed, 10 insertions, 17 deletions

diff --git a/plugins/checksum/makefile.mak b/plugins/checksum/makefile.mak
index 8d72d094..ec8e0455 100644
--- a/plugins/checksum/makefile.mak
+++ b/plugins/checksum/makefile.mak
@@ -9,7 +9,7 @@ checksum.def:
 	echo xchat_plugin_deinit >> checksum.def

 

 checksum.obj: checksum.c makefile.mak

-	cl $(CFLAGS) checksum.c

+	cl $(CFLAGS) /I.. checksum.c

 

 clean:

 	del *.obj

diff --git a/plugins/lua/makefile.mak b/plugins/lua/makefile.mak
index e1ef8822..81399ac6 100644
--- a/plugins/lua/makefile.mak
+++ b/plugins/lua/makefile.mak
@@ -1,7 +1,7 @@
 include "..\..\src\makeinc.mak"

 

 all: lua.obj lua.def

-	link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /libpath:$(LUAPATH)\lib $(LUALIB).lib /def:lua.def lua.obj 

+	link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll $(LUALIB).lib /def:lua.def lua.obj 

 

 lua.def:

 	echo EXPORTS > lua.def

@@ -9,7 +9,7 @@ lua.def:
 	echo xchat_plugin_deinit >> lua.def

 

 lua.obj: lua.c makefile.mak

-	cl $(CFLAGS) /Dsnprintf=g_snprintf /I$(LUAPATH)\include lua.c

+	cl $(CFLAGS) /I.. /Dsnprintf=g_snprintf lua.c

 

 clean:

 	del *.obj

diff --git a/plugins/makefile.mak b/plugins/makefile.mak
index 788a0fb8..ecb6222a 100644
--- a/plugins/makefile.mak
+++ b/plugins/makefile.mak
@@ -1,6 +1,4 @@
 all:
-#	@cd ewc
-#	@-$(MAKE) /nologo /s /f makefile.mak $@
 	@cd checksum
 	@-$(MAKE) /nologo /s /f makefile.mak $@
 	@cd ..\lua
@@ -19,11 +17,6 @@ all:
 	@-$(MAKE) /nologo /s /f makefile.mak $@	
 
 clean:
-#	@del ewc\*.def
-#	@del ewc\*.dll
-#	@del ewc\*.exp
-#	@del ewc\*.lib
-#	@del ewc\*.obj
 	@del checksum\*.def
 	@del checksum\*.dll
 	@del checksum\*.exp
diff --git a/plugins/perl/makefile-510.mak b/plugins/perl/makefile-510.mak
index 619566b5..f407eadb 100644
--- a/plugins/perl/makefile-510.mak
+++ b/plugins/perl/makefile-510.mak
@@ -18,7 +18,7 @@ perl.def:
 	echo xchat_plugin_get_info >> perl.def
 
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
 
 perl.c: xchat.pm.h
 
diff --git a/plugins/perl/makefile-512.mak b/plugins/perl/makefile-512.mak
index 4ba6a7f7..523c1dcf 100644
--- a/plugins/perl/makefile-512.mak
+++ b/plugins/perl/makefile-512.mak
@@ -18,7 +18,7 @@ perl.def:
 	echo xchat_plugin_get_info >> perl.def
 
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
 
 perl.c: xchat.pm.h
 
diff --git a/plugins/python/makefile.mak b/plugins/python/makefile.mak
index a0eb7b0c..7414f188 100644
--- a/plugins/python/makefile.mak
+++ b/plugins/python/makefile.mak
@@ -11,7 +11,7 @@ python.def:
 	echo xchat_plugin_get_info >> python.def
 
 python.obj: python.c
-	$(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\"
+	$(CC) $(CFLAGS) /I.. /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\"
 
 $(TARGET): python.obj python.def
 	$(LINK) /dll /out:$(TARGET) $(LDFLAGS) python.obj /libpath:$(PYTHONPATH)\libs $(PYTHONLIB).lib $(LIBS) /def:python.def
diff --git a/plugins/tcl/makefile.mak b/plugins/tcl/makefile.mak
index 252af81b..c88f5c4f 100644
--- a/plugins/tcl/makefile.mak
+++ b/plugins/tcl/makefile.mak
@@ -11,7 +11,7 @@ tcl.def:
 	echo xchat_plugin_get_info >> tcl.def
 
 tclplugin.obj: tclplugin.c
-	$(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\include /DTCL_DLL=\"$(TCLLIB).dll\"
+	$(CC) $(CFLAGS) /I.. tclplugin.c /I$(TCLPATH)\include /DTCL_DLL=\"$(TCLLIB).dll\"
 
 $(TARGET): tclplugin.obj tcl.def
 	$(LINK) /dll /out:$(TARGET) $(LDFLAGS) tclplugin.obj /libpath:$(TCLPATH)\lib $(TCLLIB).lib /delayload:$(TCLLIB).dll delayimp.lib /def:tcl.def
diff --git a/plugins/upd/makefile.mak b/plugins/upd/makefile.mak
index 63a9ace4..34b54cb8 100644
--- a/plugins/upd/makefile.mak
+++ b/plugins/upd/makefile.mak
@@ -9,7 +9,7 @@ upd.def:
 	echo xchat_plugin_deinit >> upd.def

 

 upd.obj: upd.c makefile.mak

-	cl $(CFLAGS) $(GLIB) upd.c

+	cl $(CFLAGS) $(GLIB) /I.. upd.c

 

 clean:

 	del *.obj

diff --git a/plugins/winamp/makefile.mak b/plugins/winamp/makefile.mak
index 6fd431bd..79adf87e 100644
--- a/plugins/winamp/makefile.mak
+++ b/plugins/winamp/makefile.mak
@@ -9,7 +9,7 @@ winamp.def:
 	echo xchat_plugin_deinit >> winamp.def

 

 winamp.obj: winamp.c makefile.mak

-	cl $(CFLAGS) winamp.c

+	cl $(CFLAGS) /I.. winamp.c

 

 clean:

 	del *.obj

diff --git a/plugins/xdcc/makefile.mak b/plugins/xdcc/makefile.mak
index 280d8d84..0a12347e 100644
--- a/plugins/xdcc/makefile.mak
+++ b/plugins/xdcc/makefile.mak
@@ -9,7 +9,7 @@ xdcc.def:
 	echo xchat_plugin_deinit >> xdcc.def

 

 xdcc.obj: xdcc.c makefile.mak

-	cl $(CFLAGS) $(GLIB) xdcc.c

+	cl $(CFLAGS) $(GLIB) /I.. xdcc.c

 

 clean:

 	del *.obj