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)\r
LIBDIRNAME = \\r
- .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
- $(__DEBUGINFO_0) /Fd$(OBJS)\bench.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_CONSOLE \\r
- /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \\r
- $(CXXFLAGS)\r
+BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \\r
+ $(__DEBUGINFO) /Fd$(OBJS)\bench.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \\r
+ /D_CRT_SECURE_NO_DEPRECATE=1 /D_CRT_NON_CONFORMING_SWPRINTFS=1 \\r
+ /D_SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
+ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
+ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \\r
+ /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
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
$(OBJS)\bench_printfbench.obj\r
+BENCH_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \\r
+ $(__DEBUGINFO) /Fd$(OBJS)\bench_gui.pdb $(____DEBUGRUNTIME) \\r
+ $(__OPTIMIZEFLAG) /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
+ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. \\r
+ $(__DLLFLAG_p) /I.\..\..\samples /DNOPCH /D_CONSOLE $(__RTTIFLAG) \\r
+ $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+BENCH_GUI_OBJECTS = \\r
+ $(OBJS)\bench_gui_bench.obj \\r
+ $(OBJS)\bench_gui_image.obj\r
+BENCH_GUI_RESOURCES = \\r
+ $(OBJS)\bench_gui_sample.res\r
\r
### Conditionally set variables: ###\r
\r
+!if "$(TARGET_CPU)" == "AMD64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "amd64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "ia64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "x64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
!if "$(USE_GUI)" == "0"\r
PORTNAME = base\r
!endif\r
!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
!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
!if "$(TARGET_CPU)" == "IA64"\r
LINK_TARGET_CPU = /MACHINE:IA64\r
!endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
!if "$(TARGET_CPU)" == "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"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\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
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)\r
!endif\r
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
+__DEBUGINFO_2 = \r
!endif\r
!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
+__DEBUGINFO_2 = \r
!endif\r
!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_10 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_NET_p = \\r
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__bench_gui___depname = $(OBJS)\bench_gui.exe\r
!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_0)\r
!endif\r
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
+__DEBUGINFO_18 = \r
!endif\r
!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
+__DEBUGINFO_18 = \r
!endif\r
!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_0)\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_19_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_19_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+____DEBUGRUNTIME_19_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+____DEBUGRUNTIME_19_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_26 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_26 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
+__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p_3 = /d wxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p_3 = /d NDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p_3 = /d NDEBUG\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p_3 = /d wxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p_3 = /d wxNO_RTTI\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p_3 = /d wxNO_THREADS\r
+!endif\r
+!if "$(UNICODE)" == "0"\r
+__UNICODE_DEFINE_p_3 = /d wxUSE_UNICODE=0\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+__UNICODE_DEFINE_p_3 = /d _UNICODE\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p_3 = /d wxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p_3 = /d WXUSINGDLL\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_CORE_p = \\r
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+__DEBUGINFO = /Zi\r
!endif\r
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_2 = \r
+__DEBUGINFO = \r
!endif\r
!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_2 = \r
+__DEBUGINFO = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO = /Zi\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_1 = /DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_1 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_1 = \r
!endif\r
!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+__DEBUGINFO_1 = /DEBUG\r
!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_3_p = /D_DEBUG\r
+____DEBUGRUNTIME = /D_DEBUG\r
!endif\r
!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_3_p = \r
+____DEBUGRUNTIME = \r
!endif\r
!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_3_p = \r
+____DEBUGRUNTIME = \r
!endif\r
!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_3_p = /D_DEBUG\r
+____DEBUGRUNTIME = /D_DEBUG\r
!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_4 = d\r
+__DEBUGRUNTIME = d\r
!endif\r
!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_4 = \r
+__DEBUGRUNTIME = \r
!endif\r
!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_4 = \r
+__DEBUGRUNTIME = \r
!endif\r
!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_4 = d\r
+__DEBUGRUNTIME = d\r
!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_5 = \r
+__DEBUGRUNTIME_0 = \r
!endif\r
!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf\r
!endif\r
!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf\r
!endif\r
!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_5 = \r
+__DEBUGRUNTIME_0 = \r
!endif\r
!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_6 = /Od\r
+__OPTIMIZEFLAG = /Od\r
!endif\r
!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_6 = /O2\r
+__OPTIMIZEFLAG = /O2\r
!endif\r
!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_9 = L\r
+__THREADSFLAG = L\r
!endif\r
!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_9 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_10 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)\r
+__THREADSFLAG = T\r
!endif\r
!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_11 = \r
+__RTTIFLAG = \r
!endif\r
!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_11 = /GR\r
+__RTTIFLAG = /GR\r
!endif\r
!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_12 = \r
+__EXCEPTIONSFLAG = \r
!endif\r
!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_12 = /EHsc\r
+__EXCEPTIONSFLAG = /EHsc\r
!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
!endif\r
!if "$(USE_CAIRO)" == "1"\r
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r
+____CAIRO_INCLUDEDIR_FILENAMES = /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
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
__WXLIB_BASE_p = \\r
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
!endif\r
__WXLIB_MONO_p = \\r
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\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
__CAIRO_LIB_p = cairo.lib\r
!endif\r
!if "$(USE_CAIRO)" == "1"\r
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib\r
+____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib\r
!endif\r
\r
\r
\r
### Targets: ###\r
\r
-all: $(OBJS)\bench.exe data\r
+all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image\r
\r
clean: \r
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
-if exist $(OBJS)\bench.ilk del $(OBJS)\bench.ilk\r
-if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb\r
+ -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe\r
+ -if exist $(OBJS)\bench_gui.ilk del $(OBJS)\bench_gui.ilk\r
+ -if exist $(OBJS)\bench_gui.pdb del $(OBJS)\bench_gui.pdb\r
\r
$(OBJS)\bench.exe: $(BENCH_OBJECTS)\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) 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
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(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
if not exist $(OBJS) mkdir $(OBJS)\r
for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res\r
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench_gui.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+ $(BENCH_GUI_OBJECTS) $(BENCH_GUI_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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
+!endif\r
+\r
+data-image: \r
+ if not exist $(OBJS) mkdir $(OBJS)\r
+ for %f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
+\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
$(OBJS)\bench_printfbench.obj: .\printfbench.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp\r
\r
+$(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc\r
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_19_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\..\samples /d NOPCH /d _CONSOLE .\..\..\samples\sample.rc\r
+\r
+$(OBJS)\bench_gui_bench.obj: .\bench.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp\r
+\r
+$(OBJS)\bench_gui_image.obj: .\image.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp\r
+\r
projects / wxWidgets.git / blobdiff