Fix unit tests compilation in STL build.

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

diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc
index 456dd63ff42fb66b68405849fefe1d75d0bcc19d..b2bc8336e782c318d13d6f0785cf84a7e9502768 100644 (file)
--- a/samples/regtest/makefile.vc
+++ b/samples/regtest/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.6 (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


@@ -20,16 +20,19 @@ LIBDIRNAME = \
        .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
        .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r

-REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
+       $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(____DEBUGRUNTIME_3_p) \\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__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r

        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r

-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \\r
+       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \\r
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)\r

 REGTEST_OBJECTS =  \\r
 REGTEST_OBJECTS =  \\r

-       $(OBJS)\regtest_regtest.obj \\r
+       $(OBJS)\regtest_regtest.obj\r
+REGTEST_RESOURCES =  \\r

        $(OBJS)\regtest_regtest.res\r
 \r
 ### Conditionally set variables: ###\r
        $(OBJS)\regtest_regtest.res\r
 \r
 ### Conditionally set variables: ###\r


@@ -74,13 +77,13 @@ 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
 !if "$(TARGET_CPU)" == "amd64"\r
 !endif\r
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\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
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r


@@ -89,7 +92,7 @@ LINK_TARGET_CPU = /MACHINE:IA64
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r

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


@@ -115,71 +118,95 @@ __DEBUGINFO_1 =
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_1 = /DEBUG\r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_1 = /DEBUG\r
 !endif\r

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r

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

-____DEBUGRUNTIME_2_p = /D_DEBUG\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r

 !endif\r
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r

-____DEBUGRUNTIME_2_p = \r
+____DEBUGRUNTIME_3_p = \r

 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"\r

-____DEBUGRUNTIME_2_p = \r
+____DEBUGRUNTIME_3_p = \r

 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"\r

-____DEBUGRUNTIME_2_p = /D_DEBUG\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r

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

-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r

 !endif\r
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r

-____DEBUGRUNTIME_2_p_1 = \r
+____DEBUGRUNTIME_3_p_1 = \r

 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"\r

-____DEBUGRUNTIME_2_p_1 = \r
+____DEBUGRUNTIME_3_p_1 = \r

 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"\r

-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r

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

-__DEBUGRUNTIME_3 = d\r
+__DEBUGRUNTIME_4 = d\r

 !endif\r
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r

-__DEBUGRUNTIME_3 = \r
+__DEBUGRUNTIME_4 = \r

 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"\r

-__DEBUGRUNTIME_3 = \r
+__DEBUGRUNTIME_4 = \r

 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
 !endif\r
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"\r

-__DEBUGRUNTIME_3 = d\r
+__DEBUGRUNTIME_4 = d\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = \r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+__DEBUGRUNTIME_5 = \r

 !endif\r
 !if "$(BUILD)" == "debug"\r
 !endif\r
 !if "$(BUILD)" == "debug"\r

-__OPTIMIZEFLAG_4 = /Od\r
+__OPTIMIZEFLAG_6 = /Od\r

 !endif\r
 !if "$(BUILD)" == "release"\r
 !endif\r
 !if "$(BUILD)" == "release"\r

-__OPTIMIZEFLAG_4 = /O2\r
+__OPTIMIZEFLAG_6 = /O2\r

 !endif\r
 !if "$(USE_THREADS)" == "0"\r
 !endif\r
 !if "$(USE_THREADS)" == "0"\r

-__THREADSFLAG_7 = L\r
+__THREADSFLAG_9 = L\r

 !endif\r
 !if "$(USE_THREADS)" == "1"\r
 !endif\r
 !if "$(USE_THREADS)" == "1"\r

-__THREADSFLAG_7 = T\r
+__THREADSFLAG_9 = T\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r

-__RUNTIME_LIBS_8 = D\r
+__RUNTIME_LIBS_10 = D\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "static"\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "static"\r

-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)\r

 !endif\r
 !if "$(USE_RTTI)" == "0"\r
 !endif\r
 !if "$(USE_RTTI)" == "0"\r

-__RTTIFLAG_9 = \r
+__RTTIFLAG_11 = \r

 !endif\r
 !if "$(USE_RTTI)" == "1"\r
 !endif\r
 !if "$(USE_RTTI)" == "1"\r

-__RTTIFLAG_9 = /GR\r
+__RTTIFLAG_11 = /GR\r

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

-__EXCEPTIONSFLAG_10 = \r
+__EXCEPTIONSFLAG_12 = \r

 !endif\r
 !if "$(USE_EXCEPTIONS)" == "1"\r
 !endif\r
 !if "$(USE_EXCEPTIONS)" == "1"\r

-__EXCEPTIONSFLAG_10 = /EHsc\r
+__EXCEPTIONSFLAG_12 = /EHsc\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
 __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
 __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r


@@ -205,6 +232,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


@@ -241,11 +280,11 @@ __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
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r

 !endif\r
 !endif\r

-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo\r

 !endif\r
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p = /DWXUSINGDLL\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p = /DWXUSINGDLL\r


@@ -277,8 +316,11 @@ __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
+!if "$(USE_CAIRO)" == "1"\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib\r

 !endif\r
 \r
 \r
 !endif\r
 \r
 \r


@@ -299,13 +341,13 @@ clean:
        -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb\r
 \r
 $(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res\r
        -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb\r
 \r
 $(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res\r

-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(REGTEST_OBJECTS)  $(__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) 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
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
+       $(REGTEST_OBJECTS) $(REGTEST_RESOURCES)  $(__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) $(__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
 $(OBJS)\regtest_regtest.obj: .\regtest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(REGTEST_CXXFLAGS) .\regtest.cpp\r
 \r
 $(OBJS)\regtest_regtest.res: .\regtest.rc\r
 <<\r
 \r
 $(OBJS)\regtest_regtest.obj: .\regtest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(REGTEST_CXXFLAGS) .\regtest.cpp\r
 \r
 $(OBJS)\regtest_regtest.res: .\regtest.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_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 /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\regtest.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 __WXMSW__ $(__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 .\regtest.rc\r

 \r
 \r