add -mno-cygwin detection: we should treat cygwin as Windows, not Unix, when it's...

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index a63b81771dd707323793f735f23796063fc4e502..ed82cb1a0ba70c3d8005c98dda157e9a9af9c948 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -21,9 +21,9 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" \
        USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
-       USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
        RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
 
@@ -33,20 +33,16 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: configtool emulator helpview tex2rtf helpgen
+all: emulator helpview tex2rtf helpgen
 
 clean: 
        -if exist .\*.o del .\*.o
        -if exist .\*.d del .\*.d
-       $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) clean
 
-configtool: 
-       $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) all
-
 emulator: 
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
 
@@ -59,7 +55,7 @@ tex2rtf:
 helpgen: 
        $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean configtool emulator helpview tex2rtf helpgen
+.PHONY: all clean emulator helpview tex2rtf helpgen
 
 
 # Dependencies tracking: