Forward port of r60190 (wxMSW Cairo support) to trunk.

[wxWidgets.git] / utils / makefile.wat

diff --git a/utils/makefile.wat b/utils/makefile.wat
index 90a9324b7232817c17e1e52a23c786b540ae67cb..421980d2823c2cb4b6843bb77c64e089212c9f83 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.4 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -18,7 +18,11 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
 !  loaddll wlink    wlink
+! endif
 !  loaddll wlib     wlibd
 !endif
 
@@ -36,8 +40,9 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        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_RIBBON="$(USE_RIBBON)" 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)" &
@@ -48,7 +53,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 
 ### Targets: ###
 
-all : .SYMBOLIC emulator helpview hhp2cached ifacecheck screenshotgen
+all : .SYMBOLIC emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj
@@ -59,6 +64,9 @@ clean : .SYMBOLIC
        cd emulator\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
+       cd execmon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
        cd helpview\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
@@ -71,12 +79,20 @@ clean : .SYMBOLIC
        cd screenshotgen\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
+       cd wxrc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
 
 emulator : .SYMBOLIC 
        cd emulator\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
+execmon : .SYMBOLIC 
+       cd execmon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
 helpview : .SYMBOLIC 
        cd helpview\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
@@ -97,3 +113,8 @@ screenshotgen : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
+wxrc : .SYMBOLIC 
+       cd wxrc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+