diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index 39c8c680c6..201ef547c5 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -30,6 +30,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ CXXWARNINGS = @CXXWARNINGS@ HOST_SUFFIX = @HOST_SUFFIX@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ @@ -65,6 +66,13 @@ BENCH_GUI_OBJECTS = \ $(__bench_gui___win32rc) \ bench_gui_bench.o \ bench_gui_image.o +BENCH_GRAPHICS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ + $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) +BENCH_GRAPHICS_OBJECTS = \ + $(__bench_graphics___win32rc) \ + bench_graphics_graphics.o ### Conditionally set variables: ### @@ -92,19 +100,13 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \ @COND_PLATFORM_MAC_0@__bench_gui___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__bench_gui___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bench_gui$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_5 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_5 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_5 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_5 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_5 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p_5 = --define WXUSINGDLL -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__bench_gui___win32rc = bench_gui_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_gui_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ = bench_gui.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_gui_bundle___depname \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ = bench_gui_bundle +@COND_TOOLKIT_COCOA@____bench_gui_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ $(__bench_gui_app_Contents_PkgInfo___depname) @COND_TOOLKIT_MAC@____bench_gui_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_MAC@ $(__bench_gui_app_Contents_PkgInfo___depname) @COND_TOOLKIT_OSX_CARBON@____bench_gui_BUNDLE_TGT_REF_DEP \ @@ -113,11 +115,52 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \ @COND_TOOLKIT_OSX_COCOA@ = $(__bench_gui_app_Contents_PkgInfo___depname) @COND_TOOLKIT_OSX_IPHONE@____bench_gui_BUNDLE_TGT_REF_DEP \ @COND_TOOLKIT_OSX_IPHONE@ = $(__bench_gui_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_COCOA@____bench_gui_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ $(__bench_gui_app_Contents_PkgInfo___depname) +@COND_USE_GUI_1@__bench_graphics___depname = bench_graphics$(EXEEXT) +@COND_PLATFORM_MAC_0@__bench_graphics___mac_setfilecmd = @true +@COND_PLATFORM_MAC_1@__bench_graphics___mac_setfilecmd \ +@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL bench_graphics$(EXEEXT) +@COND_PLATFORM_WIN32_1@__bench_graphics___win32rc = \ +@COND_PLATFORM_WIN32_1@ bench_graphics_sample_rc.o +@COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_graphics_app_Contents_PkgInfo___depname \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = bench_graphics.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_graphics_bundle___depname \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = bench_graphics_bundle +@COND_TOOLKIT_COCOA@____bench_graphics_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_COCOA@ = $(__bench_graphics_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_MAC@____bench_graphics_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ $(__bench_graphics_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_CARBON@____bench_graphics_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_CARBON@ = \ +@COND_TOOLKIT_OSX_CARBON@ $(__bench_graphics_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_COCOA@____bench_graphics_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_COCOA@ = \ +@COND_TOOLKIT_OSX_COCOA@ $(__bench_graphics_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_IPHONE@____bench_graphics_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_IPHONE@ = \ +@COND_TOOLKIT_OSX_IPHONE@ $(__bench_graphics_app_Contents_PkgInfo___depname) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0 +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_0___WXLIB_BASE_p = \ + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \ @COND_MONOLITHIC_1_USE_STC_1@ = \ @COND_MONOLITHIC_1_USE_STC_1@ -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @@ -127,18 +170,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ @COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ @COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @@ -152,7 +183,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ ### Targets: ### -all: bench$(EXEEXT) data $(__bench_gui___depname) $(__bench_gui_bundle___depname) data-image +all: bench$(EXEEXT) data $(__bench_gui___depname) $(__bench_gui_bundle___depname) $(__bench_graphics___depname) $(__bench_graphics_bundle___depname) data-image install: @@ -166,6 +197,8 @@ clean: rm -f bench$(EXEEXT) rm -f bench_gui$(EXEEXT) rm -rf bench_gui.app + rm -f bench_graphics$(EXEEXT) + rm -rf bench_graphics.app distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -214,6 +247,33 @@ data: @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui_bundle: $(____bench_gui_BUNDLE_TGT_REF_DEP) +@COND_USE_GUI_1@bench_graphics$(EXEEXT): $(BENCH_GRAPHICS_OBJECTS) $(__bench_graphics___win32rc) +@COND_USE_GUI_1@ $(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ +@COND_USE_GUI_1@ $(__bench_graphics___mac_setfilecmd) + +@COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_graphics.app/Contents/PkgInfo: $(__bench_graphics___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p bench_graphics.app/Contents +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p bench_graphics.app/Contents/MacOS +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p bench_graphics.app/Contents/Resources +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/EXECUTABLE/bench_graphics/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/VERSION/$(WX_VERSION)/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >bench_graphics.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ /bin/echo "APPL????" >bench_graphics.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ ln -f bench_graphics$(EXEEXT) bench_graphics.app/Contents/MacOS/bench_graphics +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bench_graphics.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_graphics_bundle: $(____bench_graphics_BUNDLE_TGT_REF_DEP) + data-image: @mkdir -p . @for f in ../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif; do \ @@ -257,7 +317,7 @@ bench_printfbench.o: $(srcdir)/printfbench.cpp $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/printfbench.cpp bench_gui_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) $(__DEBUG_DEFINE_p_5) $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5) --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include bench_gui_bench.o: $(srcdir)/bench.cpp $(CXXC) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(srcdir)/bench.cpp @@ -265,8 +325,15 @@ bench_gui_bench.o: $(srcdir)/bench.cpp bench_gui_image.o: $(srcdir)/image.cpp $(CXXC) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(srcdir)/image.cpp +bench_graphics_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include + +bench_graphics_graphics.o: $(srcdir)/graphics.cpp + $(CXXC) -c -o $@ $(BENCH_GRAPHICS_CXXFLAGS) $(srcdir)/graphics.cpp + # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean data bench_gui_bundle data-image +.PHONY: all install uninstall clean distclean data bench_gui_bundle \ + bench_graphics_bundle data-image diff --git a/tests/benchmarks/bench.bkl b/tests/benchmarks/bench.bkl index db4c5553b1..acf774a861 100644 --- a/tests/benchmarks/bench.bkl +++ b/tests/benchmarks/bench.bkl @@ -42,6 +42,20 @@ base + + + console + + + graphics.cpp + + core + base + gl + + ../../samples/image/horse.bmp diff --git a/tests/benchmarks/bench_vc7.sln b/tests/benchmarks/bench_vc7.sln index b4e22d0e69..01e7f8a42b 100644 --- a/tests/benchmarks/bench_vc7.sln +++ b/tests/benchmarks/bench_vc7.sln @@ -3,6 +3,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc7_bench.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc7_bench_gui.vcproj", "{B5CBA605-D60A-5254-8137-1BBF4F5D9538}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_graphics", "bench_vc7_bench_graphics.vcproj", "{9831CC11-A563-52BA-82BC-05408C2D095F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -27,6 +29,14 @@ Global {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.Debug|Win32.ActiveCfg = Debug|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.Debug|Win32.Build.0 = Debug|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.Release|Win32.ActiveCfg = Release|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.Release|Win32.Build.0 = Release|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {9831CC11-A563-52BA-82BC-05408C2D095F}.DLL Release|Win32.Build.0 = DLL Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/benchmarks/bench_vc7_bench_graphics.vcproj b/tests/benchmarks/bench_vc7_bench_graphics.vcproj new file mode 100644 index 0000000000..881aeeebba --- /dev/null +++ b/tests/benchmarks/bench_vc7_bench_graphics.vcproj @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/benchmarks/bench_vc8.sln b/tests/benchmarks/bench_vc8.sln index 4ab26b0b52..226cc6641d 100644 --- a/tests/benchmarks/bench_vc8.sln +++ b/tests/benchmarks/bench_vc8.sln @@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc8_bench.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc8_bench_gui.vcproj", "{4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_graphics", "bench_vc8_bench_graphics.vcproj", "{5C523323-FE8A-5685-AAC1-B58B2AD932B2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -48,6 +50,22 @@ Global {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|Win32.Build.0 = DLL Release|Win32 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.ActiveCfg = DLL Release|x64 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.Build.0 = DLL Release|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Debug|Win32.Build.0 = Debug|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Debug|x64.ActiveCfg = Debug|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Debug|x64.Build.0 = Debug|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Release|Win32.ActiveCfg = Release|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Release|Win32.Build.0 = Release|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Release|x64.ActiveCfg = Release|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.Release|x64.Build.0 = Release|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {5C523323-FE8A-5685-AAC1-B58B2AD932B2}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/benchmarks/bench_vc8_bench_graphics.vcproj b/tests/benchmarks/bench_vc8_bench_graphics.vcproj new file mode 100644 index 0000000000..e4921e1c4b --- /dev/null +++ b/tests/benchmarks/bench_vc8_bench_graphics.vcproj @@ -0,0 +1,829 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/benchmarks/bench_vc9.sln b/tests/benchmarks/bench_vc9.sln index 62af33024b..0ffd485b69 100644 --- a/tests/benchmarks/bench_vc9.sln +++ b/tests/benchmarks/bench_vc9.sln @@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc9_bench.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc9_bench_gui.vcproj", "{9B5F97AF-C174-572F-9134-D2E56F7810BE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_graphics", "bench_vc9_bench_graphics.vcproj", "{C6A15608-45B2-5C76-8E1B-66D5F761D785}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -48,6 +50,22 @@ Global {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|Win32.Build.0 = DLL Release|Win32 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.ActiveCfg = DLL Release|x64 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.Build.0 = DLL Release|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Debug|Win32.Build.0 = Debug|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Debug|x64.ActiveCfg = Debug|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Debug|x64.Build.0 = Debug|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Release|Win32.ActiveCfg = Release|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Release|Win32.Build.0 = Release|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Release|x64.ActiveCfg = Release|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.Release|x64.Build.0 = Release|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {C6A15608-45B2-5C76-8E1B-66D5F761D785}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/benchmarks/bench_vc9_bench_graphics.vcproj b/tests/benchmarks/bench_vc9_bench_graphics.vcproj new file mode 100644 index 0000000000..098d1b00b7 --- /dev/null +++ b/tests/benchmarks/bench_vc9_bench_graphics.vcproj @@ -0,0 +1,801 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc index 632e8c76c1..d001095479 100644 --- a/tests/benchmarks/makefile.bcc +++ b/tests/benchmarks/makefile.bcc @@ -30,7 +30,7 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) BENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \ @@ -47,7 +47,7 @@ BENCH_OBJECTS = \ $(OBJS)\bench_tls.obj \ $(OBJS)\bench_printfbench.obj BENCH_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \ @@ -55,6 +55,14 @@ BENCH_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ BENCH_GUI_OBJECTS = \ $(OBJS)\bench_gui_bench.obj \ $(OBJS)\bench_gui_image.obj +BENCH_GRAPHICS_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \ + $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) +BENCH_GRAPHICS_OBJECTS = \ + $(OBJS)\bench_graphics_graphics.obj ### Conditionally set variables: ### @@ -101,48 +109,8 @@ __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) !if "$(USE_GUI)" == "1" __bench_gui___depname = $(OBJS)\bench_gui.exe !endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_3 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" -__NDEBUG_DEFINE_p_3 = -dNDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_3 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_3 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_3 = -d_UNICODE -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_3 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib -!endif !if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +__bench_graphics___depname = $(OBJS)\bench_graphics.exe !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od @@ -157,10 +125,10 @@ __THREADSFLAG = __THREADSFLAG = mt !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_0 = +__THREADSFLAG_1 = !endif !if "$(USE_THREADS)" == "1" -__THREADSFLAG_0 = -tWM +__THREADSFLAG_1 = -tWM !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS = -tWR @@ -169,41 +137,75 @@ __RUNTIME_LIBS = -tWR __RUNTIME_LIBS = !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_0 = i +__RUNTIME_LIBS_1 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_0 = +__RUNTIME_LIBS_1 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_0 = -d__WXUNIVERSAL__ +!endif !if "$(DEBUG_FLAG)" == "0" __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 !endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_0 = -dwxDEBUG_LEVEL=0 +!endif !if "$(BUILD)" == "release" __NDEBUG_DEFINE_p = -DNDEBUG !endif +!if "$(BUILD)" == "release" +__NDEBUG_DEFINE_p_0 = -dNDEBUG +!endif !if "$(USE_EXCEPTIONS)" == "0" __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS !endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_0 = -dwxNO_EXCEPTIONS +!endif !if "$(USE_RTTI)" == "0" __RTTI_DEFINE_p = -DwxNO_RTTI !endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_0 = -dwxNO_RTTI +!endif !if "$(USE_THREADS)" == "0" __THREAD_DEFINE_p = -DwxNO_THREADS !endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_0 = -dwxNO_THREADS +!endif !if "$(UNICODE)" == "0" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 !endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -D_UNICODE !endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_0 = -dwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_0 = -d_UNICODE +!endif !if "$(USE_CAIRO)" == "1" ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo !endif +!if "$(USE_CAIRO)" == "1" +____CAIRO_INCLUDEDIR_FILENAMES_0 = -i$(CAIRO_ROOT)\include\cairo +!endif !if "$(SHARED)" == "1" __DLLFLAG_p = -DWXUSINGDLL !endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_0 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = \ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -212,6 +214,15 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" +__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif !if "$(USE_GUI)" == "1" __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif @@ -241,7 +252,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image +all: $(OBJS)\bench.exe data $(__bench_gui___depname) $(__bench_graphics___depname) data-image clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -259,10 +270,16 @@ clean: -if exist $(OBJS)\bench_gui.ild del $(OBJS)\bench_gui.ild -if exist $(OBJS)\bench_gui.ilf del $(OBJS)\bench_gui.ilf -if exist $(OBJS)\bench_gui.ils del $(OBJS)\bench_gui.ils + -if exist $(OBJS)\bench_graphics.exe del $(OBJS)\bench_graphics.exe + -if exist $(OBJS)\bench_graphics.tds del $(OBJS)\bench_graphics.tds + -if exist $(OBJS)\bench_graphics.ilc del $(OBJS)\bench_graphics.ilc + -if exist $(OBJS)\bench_graphics.ild del $(OBJS)\bench_graphics.ild + -if exist $(OBJS)\bench_graphics.ilf del $(OBJS)\bench_graphics.ilf + -if exist $(OBJS)\bench_graphics.ils del $(OBJS)\bench_graphics.ils $(OBJS)\bench.exe: $(BENCH_OBJECTS) ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0x32.obj $(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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, + c0x32.obj $(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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, | data: @@ -272,7 +289,14 @@ data: !if "$(USE_GUI)" == "1" $(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\bench_gui_sample.res + c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_gui_sample.res +| +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample.res + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| + c0x32.obj $(BENCH_GRAPHICS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_graphics_sample.res | !endif @@ -311,7 +335,7 @@ $(OBJS)\bench_printfbench.obj: .\printfbench.cpp $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\printfbench.cpp $(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) -i. $(__DLLFLAG_p_0) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\samples\sample.rc $(OBJS)\bench_gui_bench.obj: .\bench.cpp $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp @@ -319,3 +343,9 @@ $(OBJS)\bench_gui_bench.obj: .\bench.cpp $(OBJS)\bench_gui_image.obj: .\image.cpp $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp +$(OBJS)\bench_graphics_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) -i. $(__DLLFLAG_p_0) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\samples\sample.rc + +$(OBJS)\bench_graphics_graphics.obj: .\graphics.cpp + $(CXX) -q -c -P -o$@ $(BENCH_GRAPHICS_CXXFLAGS) .\graphics.cpp + diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc index 18142fb590..bef740ece3 100644 --- a/tests/benchmarks/makefile.gcc +++ b/tests/benchmarks/makefile.gcc @@ -50,6 +50,16 @@ BENCH_GUI_OBJECTS = \ $(OBJS)\bench_gui_sample_rc.o \ $(OBJS)\bench_gui_bench.o \ $(OBJS)\bench_gui_image.o +BENCH_GRAPHICS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ + -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +BENCH_GRAPHICS_OBJECTS = \ + $(OBJS)\bench_graphics_sample_rc.o \ + $(OBJS)\bench_graphics_graphics.o ### Conditionally set variables: ### @@ -99,50 +109,8 @@ endif ifeq ($(USE_GUI),1) __bench_gui___depname = $(OBJS)\bench_gui.exe endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p_3 = --define NDEBUG -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_3 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_3 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_3 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_3 = --define _UNICODE -endif -ifeq ($(USE_CAIRO),1) -__CAIRO_INCLUDEDIR_p_1 = --include-dir $(CAIRO_ROOT)/include/cairo -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_3 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),1) -ifeq ($(USE_STC),1) -__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) -endif -endif ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +__bench_graphics___depname = $(OBJS)\bench_graphics.exe endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 @@ -165,33 +133,67 @@ endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ +endif ifeq ($(DEBUG_FLAG),0) __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0 +endif ifeq ($(BUILD),release) __NDEBUG_DEFINE_p = -DNDEBUG endif +ifeq ($(BUILD),release) +__NDEBUG_DEFINE_p_0 = --define NDEBUG +endif ifeq ($(USE_EXCEPTIONS),0) __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS +endif ifeq ($(USE_RTTI),0) __RTTI_DEFINE_p = -DwxNO_RTTI endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p_0 = --define wxNO_RTTI +endif ifeq ($(USE_THREADS),0) __THREAD_DEFINE_p = -DwxNO_THREADS endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p_0 = --define wxNO_THREADS +endif ifeq ($(UNICODE),0) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -D_UNICODE endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p_0 = --define wxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_0 = --define _UNICODE +endif ifeq ($(USE_CAIRO),1) ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo endif +ifeq ($(USE_CAIRO),1) +__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo +endif ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif +ifeq ($(SHARED),1) +__DLLFLAG_p_0 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core +endif ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = \ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) @@ -200,6 +202,17 @@ ifeq ($(MONOLITHIC),1) __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif +ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) +__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) +endif +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif ifeq ($(USE_GUI),1) __LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) endif @@ -239,13 +252,14 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image +all: $(OBJS)\bench.exe data $(__bench_gui___depname) $(__bench_graphics___depname) data-image clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe + -if exist $(OBJS)\bench_graphics.exe del $(OBJS)\bench_graphics.exe $(OBJS)\bench.exe: $(BENCH_OBJECTS) $(CXX) -o $@ $(BENCH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet @@ -259,6 +273,11 @@ $(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample_rc.o $(CXX) -o $@ $(BENCH_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet endif +ifeq ($(USE_GUI),1) +$(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample_rc.o + $(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet +endif + data-image: if not exist $(OBJS) mkdir $(OBJS) 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) @@ -294,7 +313,7 @@ $(OBJS)\bench_printfbench.o: ./printfbench.cpp $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\bench_gui_sample_rc.o: ./../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __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) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../samples --define NOPCH + $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH $(OBJS)\bench_gui_bench.o: ./bench.cpp $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $< @@ -302,6 +321,12 @@ $(OBJS)\bench_gui_bench.o: ./bench.cpp $(OBJS)\bench_gui_image.o: ./image.cpp $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\bench_graphics_sample_rc.o: ./../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH + +$(OBJS)\bench_graphics_graphics.o: ./graphics.cpp + $(CXX) -c -o $@ $(BENCH_GRAPHICS_CXXFLAGS) $(CPPDEPS) $< + .PHONY: all clean data data-image diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index 0686ec2697..432e4d6125 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -54,6 +54,19 @@ BENCH_GUI_OBJECTS = \ $(OBJS)\bench_gui_image.obj BENCH_GUI_RESOURCES = \ $(OBJS)\bench_gui_sample.res +BENCH_GRAPHICS_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\bench_graphics.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ + /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ + $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /I.\..\..\samples \ + /DNOPCH /D_CONSOLE $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +BENCH_GRAPHICS_OBJECTS = \ + $(OBJS)\bench_graphics_graphics.obj +BENCH_GRAPHICS_RESOURCES = \ + $(OBJS)\bench_graphics_sample.res ### Conditionally set variables: ### @@ -130,7 +143,7 @@ EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) +__DEBUGINFO_2 = $(__DEBUGRUNTIME_1) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_2 = @@ -139,7 +152,7 @@ __DEBUGINFO_2 = __DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) +__DEBUGINFO_2 = $(__DEBUGRUNTIME_1) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_10 = D @@ -158,7 +171,7 @@ __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) __bench_gui___depname = $(OBJS)\bench_gui.exe !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_18 = $(__DEBUGRUNTIME_0) +__DEBUGINFO_18 = $(__DEBUGRUNTIME_1) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_18 = @@ -167,19 +180,7 @@ __DEBUGINFO_18 = __DEBUGINFO_18 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_18 = $(__DEBUGRUNTIME_0) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_19_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_19_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_19_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_19_p_1 = /d _DEBUG +__DEBUGINFO_18 = $(__DEBUGRUNTIME_1) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_26 = D @@ -187,57 +188,26 @@ __RUNTIME_LIBS_26 = D !if "$(RUNTIME_LIBS)" == "static" __RUNTIME_LIBS_26 = $(__THREADSFLAG) !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_3 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p_3 = /d NDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p_3 = /d NDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_3 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_3 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_3 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_3 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_3 = /d _UNICODE -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_3 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib -!endif !if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +__bench_graphics___depname = $(OBJS)\bench_graphics.exe !endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_34 = $(__DEBUGRUNTIME_1) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_34 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_34 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_34 = $(__DEBUGRUNTIME_1) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_42 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_42 = $(__THREADSFLAG) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO = /Zi @@ -252,16 +222,16 @@ __DEBUGINFO = __DEBUGINFO = /Zi !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG +__DEBUGINFO_3 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = +__DEBUGINFO_3 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +__DEBUGINFO_3 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG +__DEBUGINFO_3 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" ____DEBUGRUNTIME = /D_DEBUG @@ -276,6 +246,18 @@ ____DEBUGRUNTIME = ____DEBUGRUNTIME = /D_DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_0 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_0 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_0 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_0 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" __DEBUGRUNTIME = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" @@ -288,16 +270,16 @@ __DEBUGRUNTIME = __DEBUGRUNTIME = d !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_0 = +__DEBUGRUNTIME_1 = !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_0 = /opt:ref /opt:icf +__DEBUGRUNTIME_1 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_0 = /opt:ref /opt:icf +__DEBUGRUNTIME_1 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_0 = +__DEBUGRUNTIME_1 = !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od @@ -329,39 +311,82 @@ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ +!endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__ +!endif !if "$(DEBUG_FLAG)" == "0" __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 !endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0 +!endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" __NDEBUG_DEFINE_p = /DNDEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" __NDEBUG_DEFINE_p = /DNDEBUG !endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__NDEBUG_DEFINE_p_0 = /d NDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__NDEBUG_DEFINE_p_0 = /d NDEBUG +!endif !if "$(USE_EXCEPTIONS)" == "0" __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS !endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS +!endif !if "$(USE_RTTI)" == "0" __RTTI_DEFINE_p = /DwxNO_RTTI !endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_0 = /d wxNO_RTTI +!endif !if "$(USE_THREADS)" == "0" __THREAD_DEFINE_p = /DwxNO_THREADS !endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_0 = /d wxNO_THREADS +!endif !if "$(UNICODE)" == "0" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 !endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /D_UNICODE !endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_0 = /d _UNICODE +!endif !if "$(USE_CAIRO)" == "1" ____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo !endif +!if "$(USE_CAIRO)" == "1" +____CAIRO_INCLUDEDIR_FILENAMES_0 = /i $(CAIRO_ROOT)\include\cairo +!endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_0 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = \ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -370,6 +395,15 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" +__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif !if "$(USE_GUI)" == "1" __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif @@ -387,7 +421,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image +all: $(OBJS)\bench.exe data $(__bench_gui___depname) $(__bench_graphics___depname) data-image clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -399,9 +433,12 @@ clean: -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe -if exist $(OBJS)\bench_gui.ilk del $(OBJS)\bench_gui.ilk -if exist $(OBJS)\bench_gui.pdb del $(OBJS)\bench_gui.pdb + -if exist $(OBJS)\bench_graphics.exe del $(OBJS)\bench_graphics.exe + -if exist $(OBJS)\bench_graphics.ilk del $(OBJS)\bench_graphics.ilk + -if exist $(OBJS)\bench_graphics.pdb del $(OBJS)\bench_graphics.pdb $(OBJS)\bench.exe: $(BENCH_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(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) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib << @@ -411,11 +448,18 @@ data: !if "$(USE_GUI)" == "1" $(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench_gui.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench_gui.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(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) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib << !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench_graphics.pdb" $(__DEBUGINFO_34) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + $(BENCH_GRAPHICS_OBJECTS) $(BENCH_GRAPHICS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib +<< +!endif + data-image: if not exist $(OBJS) mkdir $(OBJS) 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) @@ -451,7 +495,7 @@ $(OBJS)\bench_printfbench.obj: .\printfbench.cpp $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp $(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc - 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) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\..\samples /d NOPCH /d _CONSOLE .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) /i . $(__DLLFLAG_p_0) /i .\..\..\samples /d NOPCH /d _CONSOLE .\..\..\samples\sample.rc $(OBJS)\bench_gui_bench.obj: .\bench.cpp $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp @@ -459,3 +503,9 @@ $(OBJS)\bench_gui_bench.obj: .\bench.cpp $(OBJS)\bench_gui_image.obj: .\image.cpp $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp +$(OBJS)\bench_graphics_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) /i . $(__DLLFLAG_p_0) /i .\..\..\samples /d NOPCH /d _CONSOLE .\..\..\samples\sample.rc + +$(OBJS)\bench_graphics_graphics.obj: .\graphics.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GRAPHICS_CXXFLAGS) .\graphics.cpp +