X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51ec29ea5d1d1093bafbae27a8483211a90d9659..d9307d006e88025e28457290c9997f7c0f7c4fdc:/tests/benchmarks/makefile.bcc

diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index 178196ffde..3f056b06ac 100644
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -24,15 +24,16 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = bcc
 OBJS = \
-	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__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 \
+	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -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) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
 	$(CPPFLAGS) $(CXXFLAGS)
 BENCH_OBJECTS =  \
@@ -41,6 +42,7 @@ BENCH_OBJECTS =  \
 	$(OBJS)\bench_htmlpars.obj \
 	$(OBJS)\bench_htmltag.obj \
 	$(OBJS)\bench_ipcclient.obj \
+	$(OBJS)\bench_log.obj \
 	$(OBJS)\bench_mbconv.obj \
 	$(OBJS)\bench_strings.obj \
 	$(OBJS)\bench_tls.obj \
@@ -48,11 +50,23 @@ BENCH_OBJECTS =  \
 
 ### Conditionally set variables: ###
 
+!if "$(TOOLKIT)" == "GTK"
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!if "$(TOOLKIT)" == "MSW"
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "1"
-PORTNAME = msw
+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
 !if "$(BUILD)" == "debug"
 WXDEBUGFLAG = d
@@ -143,11 +157,11 @@ __DLLFLAG_p = -DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_NET_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+	wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+	wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
@@ -225,6 +239,9 @@ $(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
 $(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
 	$(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
 
+$(OBJS)\bench_log.obj: .\log.cpp
+	$(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\log.cpp
+
 $(OBJS)\bench_mbconv.obj: .\mbconv.cpp
 	$(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp