Ensure that detached menus don't keep focus grab in wxGTK.

[wxWidgets.git] / tests / benchmarks / makefile.vc

diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc
index 22049e49a92d29c813336eeacb6d4ddac158b08f..e833b103c3f0b97c21129451e98b84d8b4050da8 100644 (file)
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -24,12 +24,13 @@ BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
        $(__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
        $(__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__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_p) /W4 /I. \\r
-       $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \\r
-       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)\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
 BENCH_OBJECTS =  \\r
        $(OBJS)\bench_bench.obj \\r
        $(OBJS)\bench_datetime.obj \\r


@@ -44,6 +45,12 @@ BENCH_OBJECTS =  \
 \r
 ### Conditionally set variables: ###\r
 \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)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif


@@ -66,11 +73,14 @@ ARCH_SUFFIX = _x64
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

-PORTNAME = msw\r
-!endif\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
 !if "$(OFFICIAL_BUILD)" == "1"
 COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD

-!endif
+!endif\r

 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r
 !endif\r


@@ -262,11 +272,11 @@ __DLLFLAG_p = /DWXUSINGDLL
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_NET_p = \\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
 !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
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r