Use template class instead of template function in wxVectorSort().

[wxWidgets.git] / samples / html / helpview / makefile.vc

diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index f1f37bb18b709e10428988c0848d29b87a4b792a..80c08510a6e89996df69535ffad513593ce575c9 100644 (file)
--- a/samples/html/helpview/makefile.vc
+++ b/samples/html/helpview/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -20,16 +20,18 @@ LIBDIRNAME = \
        .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.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
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
+HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
+       $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_3_p) \\r
+       $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_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
 HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.obj \\r
+       $(OBJS)\helpview_helpview.obj\r
+HELPVIEW_RESOURCES =  \\r
        $(OBJS)\helpview_helpview.res\r
 \r
 ### Conditionally set variables: ###\r
@@ -74,13 +76,13 @@ LIBTYPE_SUFFIX = lib
 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
-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
@@ -115,71 +117,95 @@ __DEBUGINFO_1 =
 !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
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\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
-____DEBUGRUNTIME_2_p = \r
+____DEBUGRUNTIME_3_p = \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
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\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
-____DEBUGRUNTIME_2_p_1 = \r
+____DEBUGRUNTIME_3_p_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
-__DEBUGRUNTIME_3 = d\r
+__DEBUGRUNTIME_4 = d\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
-__DEBUGRUNTIME_3 = \r
+__DEBUGRUNTIME_4 = \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
-__OPTIMIZEFLAG_4 = /Od\r
+__OPTIMIZEFLAG_6 = /Od\r
 !endif\r
 !if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
+__OPTIMIZEFLAG_6 = /O2\r
 !endif\r
 !if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
+__THREADSFLAG_9 = L\r
 !endif\r
 !if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
+__THREADSFLAG_9 = T\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
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)\r
 !endif\r
 !if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
+__RTTIFLAG_11 = \r
 !endif\r
 !if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
+__RTTIFLAG_11 = /GR\r
 !endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
+__EXCEPTIONSFLAG_12 = \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
@@ -205,6 +231,18 @@ __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
 !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
@@ -241,11 +279,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 "$(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
-!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
@@ -281,8 +319,11 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !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
@@ -303,8 +344,8 @@ clean:
        -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb\r
 \r
 $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HELPVIEW_OBJECTS)  $(__WXLIB_HTML_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) 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)\helpview.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
+       $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES)  $(__WXLIB_HTML_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) $(__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
 data: \r
@@ -315,5 +356,5 @@ $(OBJS)\helpview_helpview.obj: .\helpview.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
 \r
 $(OBJS)\helpview_helpview.res: .\helpview.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 .\helpview.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) $(__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 .\helpview.rc\r
 \r