From dd21ced8dcec017acc9ff59a2635a8d48366b711 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sun, 26 Sep 2004 06:39:37 +0000 Subject: [PATCH] Restore WXBASEPORT for carbon. This is more than just a flavour in all the ways mac is typically more than, so it can stay a mac'ism until the easier platforms shake out. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 4 ++-- configure.in | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure b/configure index f066eab024..61b9f89df1 100755 --- a/configure +++ b/configure @@ -26251,7 +26251,7 @@ echo "${ECHO_T}none" >&6 TOOLKIT=MAC GUIDIST=MACX_DIST - WX_FLAVOUR="carbon${WX_FLAVOUR:+_$WX_FLAVOUR}" + WXBASEPORT="_carbon" fi if test "$wxUSE_COCOA" = 1; then @@ -27593,7 +27593,7 @@ if test "$cross_compiling" = "yes"; then TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME" fi -WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" diff --git a/configure.in b/configure.in index bda2ce3cfa..9927e582c5 100644 --- a/configure.in +++ b/configure.in @@ -2936,9 +2936,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUIDIST=MACX_DIST dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin dnl are different, so they need different names: - dnl FIXME: If we can do it like this, please do, and we can remove - dnl BASEPORT from bakefiles and elsewhere - WX_FLAVOUR="carbon${WX_FLAVOUR:+_$WX_FLAVOUR}" + WXBASEPORT="_carbon" fi if test "$wxUSE_COCOA" = 1; then @@ -3330,7 +3328,7 @@ fi dnl library link name dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix. dnl If we ever need to do that, we won't need to keep these. -WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" -- 2.47.2