Use X64 machine type for MSVC linker instead of old AMD64.

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

diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat
index 0dc76cfb4d12cffcf6f687e55f3fb99c64a8d522..66e5735ae351af87aa70318cf351fc4404575787 100644 (file)
--- a/samples/opengl/makefile.wat
+++ b/samples/opengl/makefile.wat
@@ -1,60 +1,89 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-
-### Variables: ###
-
-
-MAKEARGS = 
-
-
-### Targets: ###
-
-all : .SYMBOLIC cube isosurf penguin
-
-clean : .SYMBOLIC 
-       -if exist .\*.obj del .\*.obj
-       -if exist .\*.res del .\*.res
-       -if exist .\*.lbc del .\*.lbc
-       -if exist .\*.ilk del .\*.ilk
-
-cube : .SYMBOLIC 
-       cd cube
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-       cd $(WATCOM_CWD)
-
-isosurf : .SYMBOLIC 
-       cd isosurf
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-       cd $(WATCOM_CWD)
-
-penguin : .SYMBOLIC 
-       cd penguin
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-       cd $(WATCOM_CWD)
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Do not modify, all changes will be overwritten!\r
+# =========================================================================\r
+\r
+!include ../../build/msw/config.wat\r
+\r
+# -------------------------------------------------------------------------\r
+# Do not modify the rest of this file!\r
+# -------------------------------------------------------------------------\r
+\r
+# Speed up compilation a bit:\r
+!ifdef __LOADDLL__\r
+!  loaddll wcc      wccd\r
+!  loaddll wccaxp   wccdaxp\r
+!  loaddll wcc386   wccd386\r
+!  loaddll wpp      wppdi86\r
+!  loaddll wppaxp   wppdaxp\r
+!  loaddll wpp386   wppd386\r
+! if $(__VERSION__) >= 1280\r
+!  loaddll wlink    wlinkd\r
+! else\r
+!  loaddll wlink    wlink\r
+! endif\r
+!  loaddll wlib     wlibd\r
+!endif\r
+\r
+# We need these variables in some bakefile-made rules:\r
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
+\r
+### Conditionally set variables: ###\r
+\r
+\r
+### Variables: ###\r
+\r
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\r
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &\r
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &\r
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &\r
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
+       USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" &\r
+       USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &\r
+       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &\r
+       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &\r
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
+\r
+\r
+### Targets: ###\r
+\r
+all : .SYMBOLIC cube isosurf penguin\r
+\r
+clean : .SYMBOLIC \r
+       -if exist .\*.obj del .\*.obj\r
+       -if exist .\*.res del .\*.res\r
+       -if exist .\*.lbc del .\*.lbc\r
+       -if exist .\*.ilk del .\*.ilk\r
+       -if exist .\*.pch del .\*.pch\r
+       cd cube\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
+       cd $(WATCOM_CWD)\r
+       cd isosurf\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
+       cd $(WATCOM_CWD)\r
+       cd penguin\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
+       cd $(WATCOM_CWD)\r
+\r
+cube : .SYMBOLIC \r
+       cd cube\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
+       cd $(WATCOM_CWD)\r
+\r
+isosurf : .SYMBOLIC \r
+       cd isosurf\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
+       cd $(WATCOM_CWD)\r
+\r
+penguin : .SYMBOLIC \r
+       cd penguin\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
+       cd $(WATCOM_CWD)\r
+\r