diff options
| -rw-r--r-- | config.nmake | 5 | ||||
| -rw-r--r-- | plugins/Makefile.nmake | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index 45dfa7da4c..0876980be7 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.56 2003/08/04 14:34:16 gerald Exp $ +# $Id: config.nmake,v 1.57 2003/08/19 02:16:25 guy Exp $ VERSION=0.9.14 # @@ -83,11 +83,14 @@ MAKENSIS="C:/program files/nsis/makensis.exe" # !IF "$(GLIB_VERSION)" == "1.3" GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule +GCC_GLIB_CFLAGS=-I$(GLIB_DIR) -I$(GLIB_DIR)\gmodule GLIB_LIBS=$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib !ELSE GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \ /I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include +GCC_GLIB_CFLAGS=-I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \ + -I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index 48ee950813..722a338c66 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.23 2003/08/18 20:17:55 guy Exp $ +# $Id: Makefile.nmake,v 1.24 2003/08/19 02:16:26 guy Exp $ # include ..\config.nmake @@ -21,7 +21,7 @@ Xplugin_api.c: plugin_gen.py plugin_api_list.c plugin_api.obj: plugin_api.c Xplugin_api.c xyzzy: plugin_gen.py plugin_api_list.c - gcc -aux-info xyzzy -DHAVE_CONFIG_H -I$(GLIB_DIR) -I.. -c plugin_api_list.c + gcc -aux-info xyzzy -DHAVE_CONFIG_H $(GCC_GLIB_CFLAGS) -I.. -c plugin_api_list.c $(PYTHON) plugin_gen.py xyzzy artnet:: |