Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat
index 5d33f717829b52b42029bf848b7980e546a71497..c483e22beba7a7ed9da6b8eb892737292e870321 100644 (file)
--- a/samples/render/makefile.wat
+++ b/samples/render/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

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


@@ -31,13 +31,35 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

+WIN32_TOOLKIT_LOWERCASE =
+!ifeq TOOLKIT GTK
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!ifeq TOOLKIT MSW
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif

 PORTNAME =\r
 !ifeq USE_GUI 0\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME =\r
 !ifeq USE_GUI 0\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r

-PORTNAME = msw\r
-!endif\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+!endif
+WXBASEPORT =
+!ifeq TOOLKIT MAC
+WXBASEPORT = _carbon
+!endif
+COMPILER_VERSION =
+!ifeq OFFICIAL_BUILD 1
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+WXCOMPILER =
+!ifeq OFFICIAL_BUILD 0
+WXCOMPILER = _wat
+!endif
+!ifeq OFFICIAL_BUILD 1
+WXCOMPILER = _wat$(COMPILER_VERSION)
+!endif

 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\r


@@ -66,12 +88,20 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r

-EXTRALIBS_FOR_BASE =  \r
-!endif\r
+EXTRALIBS_FOR_BASE =   \r
+!endif\r
+LIB_GTK =
+!ifeq TOOLKIT GTK
+!ifeq TOOLKIT_VERSION 2
+LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
+       gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
+       glib-2.0.lib
+!endif
+!endif

 __renddll___depname =\r
 !ifeq SHARED 1\r
 __renddll___depname = &\r
 __renddll___depname =\r
 !ifeq SHARED 1\r
 __renddll___depname = &\r

-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll\r
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll

 !endif\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r
 !endif\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r


@@ -173,10 +203,6 @@ __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r

-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r

 ____CAIRO_INCLUDEDIR_FILENAMES =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r
 ____CAIRO_INCLUDEDIR_FILENAMES =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r


@@ -193,7 +219,7 @@ __WXLIB_CORE_p = &
 __WXLIB_BASE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_BASE_p = &\r
 __WXLIB_BASE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_BASE_p = &\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif\r
 __WXLIB_MONO_p =\r
 !ifeq MONOLITHIC 1\r
 !endif\r
 __WXLIB_MONO_p =\r
 !ifeq MONOLITHIC 1\r


@@ -212,10 +238,6 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1\r
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
 !endif\r
 !ifeq USE_GUI 1\r
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
 !endif\r

-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r

 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r


@@ -228,29 +250,30 @@ ____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r

-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5

 COMPILER_PREFIX = wat\r
 OBJS = &\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r

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

 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r

-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples &\r
-       -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__RUNTIME_LIBS) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
+       -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 RENDER_OBJECTS =  &\r
        $(OBJS)\render_render.obj\r
 RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
 RENDER_OBJECTS =  &\r
        $(OBJS)\render_render.obj\r
 RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r

-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXUSINGDLL $(__RTTIFLAG) &\r
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__RUNTIME_LIBS) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXUSINGDLL $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 RENDDLL_OBJECTS =  &\r
        $(OBJS)\renddll_renddll.obj\r
 \r
 RENDDLL_OBJECTS =  &\r
        $(OBJS)\renddll_renddll.obj\r
 \r


@@ -270,7 +293,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r

-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll\r
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll

 \r
 $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
        @%create $(OBJS)\render.lbc\r
 \r
 $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
        @%create $(OBJS)\render.lbc\r


@@ -279,27 +302,27 @@ $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res
        @%append $(OBJS)\render.lbc option caseexact\r
        @%append $(OBJS)\render.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i\r
        @%append $(OBJS)\render.lbc option caseexact\r
        @%append $(OBJS)\render.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i\r

-       @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) $(__CAIRO_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)\render.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_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)\render.lbc library %i

        @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res\r
        @for %i in () do @%append $(OBJS)\render.lbc option stack=%i\r
        wlink @$(OBJS)\render.lbc\r
 \r
 !ifeq SHARED 1\r
        @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res\r
        @for %i in () do @%append $(OBJS)\render.lbc option stack=%i\r
        wlink @$(OBJS)\render.lbc\r
 \r
 !ifeq SHARED 1\r

-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll :  $(RENDDLL_OBJECTS)\r
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll :  $(RENDDLL_OBJECTS)

        @%create $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc option quiet\r
        @%append $(OBJS)\renddll.lbc name $^@\r
        @%append $(OBJS)\renddll.lbc option caseexact\r
        @%append $(OBJS)\renddll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i\r
        @%create $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc option quiet\r
        @%append $(OBJS)\renddll.lbc name $^@\r
        @%append $(OBJS)\renddll.lbc option caseexact\r
        @%append $(OBJS)\renddll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i\r

-       @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) $(__CAIRO_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)\renddll.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_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)\renddll.lbc library %i

        @%append $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc system nt_dll\r
        wlink @$(OBJS)\renddll.lbc\r
 !endif\r
 \r
 $(OBJS)\render_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
        @%append $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc system nt_dll\r
        wlink @$(OBJS)\renddll.lbc\r
 !endif\r
 \r
 $(OBJS)\render_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r

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

 \r
 $(OBJS)\render_render.obj :  .AUTODEPEND .\render.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RENDER_CXXFLAGS) $<\r
 \r
 $(OBJS)\render_render.obj :  .AUTODEPEND .\render.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RENDER_CXXFLAGS) $<\r