# =========================================================================\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
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
- .\..\..\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
-BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
- $(__DEBUGINFO_0) /Fd$(OBJS)\bench.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. $(__DLLFLAG_p) \\r
- /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \\r
- $(CXXFLAGS)\r
+BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
+ $(__DEBUGINFO_0) /Fd$(OBJS)\bench.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__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_CONSOLE \
+ /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
+ $(CXXFLAGS)
BENCH_OBJECTS = \\r
$(OBJS)\bench_bench.obj \\r
+ $(OBJS)\bench_datetime.obj \\r
$(OBJS)\bench_htmlpars.obj \\r
$(OBJS)\bench_htmltag.obj \\r
$(OBJS)\bench_ipcclient.obj \\r
+ $(OBJS)\bench_log.obj \\r
$(OBJS)\bench_mbconv.obj \\r
$(OBJS)\bench_strings.obj \\r
$(OBJS)\bench_tls.obj \\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
-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
!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
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)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
!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)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
!if "$(MONOLITHIC)" == "0"\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
!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_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
!if "$(DEBUG_FLAG)" == "0"\r
__DEBUG_DEFINE_p = /DwxDEBUG_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 "$(USE_EXCEPTIONS)" == "0"\r
__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
!endif\r
!if "$(MSLU)" == "1"\r
__MSLU_DEFINE_p = /DwxUSE_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 "$(SHARED)" == "1"\r
__DLLFLAG_p = /DWXUSINGDLL\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
__WXLIB_NET_p = \\r
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+ wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!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
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
!endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).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
-if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb\r
\r
$(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
- $(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_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)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
+ $(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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
$(OBJS)\bench_bench.obj: .\bench.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp\r
\r
+$(OBJS)\bench_datetime.obj: .\datetime.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\datetime.cpp\r
+\r
$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp\r
\r
$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp\r
\r
+$(OBJS)\bench_log.obj: .\log.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\log.cpp\r
+\r
$(OBJS)\bench_mbconv.obj: .\mbconv.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\mbconv.cpp\r
\r
projects / wxWidgets.git / blobdiff