Applied patch [ 853031 ] Japanese po file

[wxWidgets.git] / samples / opengl / makefile.vc

diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index c8861af3b2647121e39591c72fe009187e264a3a..bd68f3a0efff1535e1a3d4e9a54b82ab121f2234 100644 (file)
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)

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

-!include <../../build/config.vc>
+!include <../../build/msw/config.vc>

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -12,6 +12,14 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
+       USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+       USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" \
+       SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -19,13 +27,23 @@
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: cube
+all: sub_cube sub_isosurf sub_penguin

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

-cube: 
+sub_cube: 

        cd cube
        cd cube

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_isosurf: 
+       cd isosurf
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_penguin: 
+       cd penguin
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
        cd $(MAKEDIR)