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

[wxWidgets.git] / utils / emulator / src / makefile.wat

diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat
index 1803e12abc84273b720a1575bf9e92901ff7f952..334cb41c169e34283e2b21e2f475bb5c898e6718 100644 (file)
--- a/utils/emulator/src/makefile.wat
+++ b/utils/emulator/src/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.7 (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
 


@@ -36,11 +40,6 @@ PORTNAME = msw
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug

-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1

 WXDEBUGFLAG = d
 !endif
 WXUNICODEFLAG =
 WXDEBUGFLAG = d
 !endif
 WXUNICODEFLAG =


@@ -174,13 +173,8 @@ __WXUNIV_DEFINE_p =
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 __DEBUG_DEFINE_p =
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 __DEBUG_DEFINE_p =

-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0

 !endif
 __EXCEPTIONS_DEFINE_p =
 !ifeq USE_EXCEPTIONS 0
 !endif
 __EXCEPTIONS_DEFINE_p =
 !ifeq USE_EXCEPTIONS 0


@@ -195,6 +189,9 @@ __THREAD_DEFINE_p =
 __THREAD_DEFINE_p = -dwxNO_THREADS
 !endif
 __UNICODE_DEFINE_p =
 __THREAD_DEFINE_p = -dwxNO_THREADS
 !endif
 __UNICODE_DEFINE_p =

+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif

 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif


@@ -209,10 +206,11 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 28
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat

 OBJS = &
 OBJS = &

-       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &


@@ -247,9 +245,9 @@ $(OBJS)\wxemulator.exe :  $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
        @%append $(OBJS)\wxemulator.lbc option quiet
        @%append $(OBJS)\wxemulator.lbc name $^@
        @%append $(OBJS)\wxemulator.lbc option caseexact
        @%append $(OBJS)\wxemulator.lbc option quiet
        @%append $(OBJS)\wxemulator.lbc name $^@
        @%append $(OBJS)\wxemulator.lbc option caseexact

-       @%append $(OBJS)\wxemulator.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\wxemulator.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)

        @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i
        @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i

-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\wxemulator.lbc library %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxemulator.lbc library %i

        @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res
        @for %i in () do @%append $(OBJS)\wxemulator.lbc option stack=%i
        wlink @$(OBJS)\wxemulator.lbc
        @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res
        @for %i in () do @%append $(OBJS)\wxemulator.lbc option stack=%i
        wlink @$(OBJS)\wxemulator.lbc


@@ -259,7 +257,7 @@ data : .SYMBOLIC
        for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\wxemulator_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
        for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\wxemulator_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<

 
 $(OBJS)\wxemulator_emulator.obj :  .AUTODEPEND .\emulator.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $<
 
 $(OBJS)\wxemulator_emulator.obj :  .AUTODEPEND .\emulator.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $<