AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore WXBASEPORT for carbon. This is more than just a flavour

Browse Source 
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
This commit is contained in:
Ron Lee 2004-09-26 06:39:37 +00:00
parent 01703fba23
commit dd21ced8dc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -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}"

6
configure.in
View File

@ -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}"