Use UTF16 for text data object on Mac. Fixes #10902

[wxWidgets.git] / demos / makefile.wat

diff --git a/demos/makefile.wat b/demos/makefile.wat
index 246fa5ffb1d03988c6975490a6caee38f75ab65f..8467e5fc44584d721ddb0709c9dc5f9115512c0e 100644 (file)
--- a/demos/makefile.wat
+++ b/demos/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.6 (http://www.bakefile.org)

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


@@ -18,7 +18,11 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386

+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else

 !  loaddll wlink    wlink
 !  loaddll wlink    wlink

+! endif

 !  loaddll wlib     wlibd
 !endif
 
 !  loaddll wlib     wlibd
 !endif
 


@@ -31,31 +35,34 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 ### 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)" BUILD="$(BUILD)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        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)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" &
-       CPPUNIT_LIBS="$(CPPUNIT_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" &
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" 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)"

 
 
 ### Targets: ###
 
 
 
 ### Targets: ###
 

-all : .SYMBOLIC bombs dbbrowse forty fractal life poem
+all : .SYMBOLIC bombs forty fractal life poem

 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
        -if exist .\*.lbc del .\*.lbc
        -if exist .\*.ilk del .\*.ilk
 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
        -if exist .\*.lbc del .\*.lbc
        -if exist .\*.ilk del .\*.ilk

+       -if exist .\*.pch del .\*.pch

        cd bombs
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
        cd bombs
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)

-       cd dbbrowse
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
-       cd $(WATCOM_CWD)

        cd forty
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
        cd forty
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)


@@ -74,11 +81,6 @@ bombs : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 

-dbbrowse : .SYMBOLIC 
-       cd dbbrowse
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-       cd $(WATCOM_CWD)
-

 forty : .SYMBOLIC 
        cd forty
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 forty : .SYMBOLIC 
        cd forty
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all


@@ -98,3 +100,4 @@ poem : .SYMBOLIC
        cd poem
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
        cd poem
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)

+