X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14b682f7c36ecf660c2f0bd5c791b8d36d9775f8..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/tests/benchmarks/makefile.gcc

diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 96957c480f..8877100e38 100644
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -22,13 +22,13 @@ LIBDIRNAME = \
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(GCCFLAGS) -DHAVE_W32API_H -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) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
-	$(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
+	$(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+	$(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS)
 BENCH_OBJECTS =  \
 	$(OBJS)\bench_bench.o \
 	$(OBJS)\bench_datetime.o \
@@ -43,6 +43,12 @@ BENCH_OBJECTS =  \
 
 ### Conditionally set variables: ###
 
+ifeq ($(TOOLKIT),GTK)
+WIN32_TOOLKIT_LOWERCASE = gtk
+endif
+ifeq ($(TOOLKIT),MSW)
+WIN32_TOOLKIT_LOWERCASE = msw
+endif
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
@@ -50,11 +56,14 @@ ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+endif
+ifeq ($(TOOLKIT),MAC)
+WXBASEPORT = _carbon
+endif
 ifeq ($(OFFICIAL_BUILD),1)
 COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
+endif
 ifeq ($(BUILD),debug)
 WXDEBUGFLAG = d
 endif
@@ -79,6 +88,9 @@ endif
 ifeq ($(MONOLITHIC),1)
 EXTRALIBS_FOR_BASE =   
 endif
+ifeq ($(TOOLKIT),GTK)
+CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
+endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG_2 = -O0
 endif
@@ -132,11 +144,11 @@ __DLLFLAG_p = -DWXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_NET_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+	-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+	-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \