Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / samples / grid / makefile.vc

diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc
index cdcc7b41db4069b6ca23854bea9aa8dc72eaa708..19cb672f8a8d825ad6377b997031dfe6dbc9b0b5 100644 (file)
--- a/samples/grid/makefile.vc
+++ b/samples/grid/makefile.vc
@@ -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


@@ -15,32 +15,64 @@
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)

 LIBDIRNAME = \\r
 LIBDIRNAME = \\r

-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
        $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(____DEBUGRUNTIME_3_p) \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
        $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(____DEBUGRUNTIME_3_p) \\r

-       $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \\r
-       /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
+       /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \
+       $(CPPFLAGS) $(CXXFLAGS)

 GRID_OBJECTS =  \\r
        $(OBJS)\grid_griddemo.obj\r
 GRID_RESOURCES =  \\r
 GRID_OBJECTS =  \\r
        $(OBJS)\grid_griddemo.obj\r
 GRID_RESOURCES =  \\r

-       $(OBJS)\grid_griddemo.res\r
+       $(OBJS)\grid_sample.res\r

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

+!if "$(TOOLKIT)" == "GTK"
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!if "$(TOOLKIT)" == "MSW"
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif

 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

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

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r


@@ -54,18 +86,6 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"\r
 WXUNIVNAME = univ\r
 !endif\r
 !if "$(WXUNIV)" == "1"\r
 WXUNIVNAME = univ\r
 !endif\r

-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r

 !if "$(SHARED)" == "1"\r
 WXDLLFLAG = dll\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 WXDLLFLAG = dll\r
 !endif\r


@@ -76,23 +96,34 @@ LIBTYPE_SUFFIX = lib
 LIBTYPE_SUFFIX = dll\r
 !endif\r
 !if "$(TARGET_CPU)" == "AMD64"\r
 LIBTYPE_SUFFIX = dll\r
 !endif\r
 !if "$(TARGET_CPU)" == "AMD64"\r

-LINK_TARGET_CPU = /MACHINE:AMD64\r
+LINK_TARGET_CPU = /MACHINE:X64\r

 !endif\r
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
 !endif\r
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r

+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif

 !if "$(TARGET_CPU)" == "amd64"\r
 !if "$(TARGET_CPU)" == "amd64"\r

-LINK_TARGET_CPU = /MACHINE:AMD64\r
+LINK_TARGET_CPU = /MACHINE:X64\r

 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r

+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif

 !if "$(MONOLITHIC)" == "0"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 !if "$(MONOLITHIC)" == "0"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r

 !endif\r
 !endif\r

+!if "$(TOOLKIT)" == "GTK" && "$(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

 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 __DEBUGINFO_0 = /Zi\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 __DEBUGINFO_0 = /Zi\r
 !endif\r


@@ -231,6 +262,18 @@ __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
 !endif\r
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
 !endif\r

+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r

 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
 !endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
 !endif\r


@@ -267,12 +310,6 @@ __MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
 !endif\r
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
 !endif\r

-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r

 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r
 !endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r
 !endif\r


@@ -295,7 +332,7 @@ __WXLIB_CORE_p = \
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_BASE_p = \\r
 !endif\r
 !if "$(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
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r


@@ -313,9 +350,6 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r

-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r

 !if "$(USE_CAIRO)" == "1"\r
 __CAIRO_LIB_p = cairo.lib\r
 !endif\r
 !if "$(USE_CAIRO)" == "1"\r
 __CAIRO_LIB_p = cairo.lib\r
 !endif\r


@@ -340,14 +374,14 @@ clean:
        -if exist $(OBJS)\grid.ilk del $(OBJS)\grid.ilk\r
        -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb\r
 \r
        -if exist $(OBJS)\grid.ilk del $(OBJS)\grid.ilk\r
        -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb\r
 \r

-$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res\r
+$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_sample.res\r

        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r

-       $(GRID_OBJECTS) $(GRID_RESOURCES)  $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_LIB_p) $(__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\r
+       $(GRID_OBJECTS) $(GRID_RESOURCES)  $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_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

 <<\r
 \r
 <<\r
 \r

+$(OBJS)\grid_sample.res: .\..\..\samples\sample.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+\r

 $(OBJS)\grid_griddemo.obj: .\griddemo.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) .\griddemo.cpp\r
 \r
 $(OBJS)\grid_griddemo.obj: .\griddemo.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) .\griddemo.cpp\r
 \r

-$(OBJS)\grid_griddemo.res: .\griddemo.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\griddemo.rc\r
-\r