test for GL/glu.h too (fixes part of bug 879474)

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 20592cbcb77023fc36e9a16402e5b9d0e7be9f06..ed82cb1a0ba70c3d8005c98dda157e9a9af9c948 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -17,9 +17,11 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \

-       USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
-       USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       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)" 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)" \
        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)" \


@@ -31,20 +33,16 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: configtool emulator helpview tex2rtf helpgen
+all: emulator helpview tex2rtf helpgen

 
 clean: 
        -if exist .\*.o del .\*.o
        -if exist .\*.d del .\*.d
 
 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
 
        $(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
 
 emulator: 
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
 


@@ -57,7 +55,7 @@ tex2rtf:
 helpgen: 
        $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
 
 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:
 
 
 # Dependencies tracking: