reversed change

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

diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index 4c174f9d4579fda21c5661d4e6a7a273febcd45f..bd68f3a0efff1535e1a3d4e9a54b82ab121f2234 100644 (file)
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -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: ###
 


@@ -27,15 +35,15 @@ clean:
 
 sub_cube: 
        cd cube
 
 sub_cube: 
        cd cube

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
 sub_isosurf: 
        cd isosurf
        cd $(MAKEDIR)
 
 sub_isosurf: 
        cd isosurf

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
 sub_penguin: 
        cd penguin
        cd $(MAKEDIR)
 
 sub_penguin: 
        cd penguin

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
        cd $(MAKEDIR)