--with-sdl option should be taken into account for non-GUI builds too (closes bug...

[wxWidgets.git] / utils / makefile.vc

diff --git a/utils/makefile.vc b/utils/makefile.vc
index 92699cab0e5af7cf3fc71005b0bb886c8e696097..b0a5d657c328c0b42f30450790745990d3f0ae3c 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -13,13 +13,19 @@
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \

-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \

        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \

-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-       DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
-       USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_OPENGL="$(USE_OPENGL)" \
-       USE_ODBC="$(USE_ODBC)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" CFG="$(CFG)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       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)" \

        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###


@@ -28,33 +34,42 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: sub_configtool sub_emulator sub_helpview sub_tex2rtf sub_helpgen
+all: sub_emulator sub_helpview sub_tex2rtf sub_helpgen

 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res

-
-sub_configtool: 
-       cd configtool\src
-       $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
+       -if exist .\*.pch del .\*.pch
+       cd emulator\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd helpview\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd tex2rtf\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd HelpGen\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"

 
 sub_emulator: 
        cd emulator\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
 
 sub_emulator: 
        cd emulator\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"

 
 sub_helpview: 
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
 
 sub_helpview: 
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"

 
 sub_tex2rtf: 
        cd tex2rtf\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
 
 sub_tex2rtf: 
        cd tex2rtf\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"

 
 sub_helpgen: 
 
 sub_helpgen: 

-       cd HelpGen
+       cd HelpGen\src

        $(MAKE) -f makefile.vc $(MAKEARGS) all
        $(MAKE) -f makefile.vc $(MAKEARGS) all

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
+