cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update wxpresets for new osx_carbon and osx_cocoa names provided by the wx-config --selected_config command

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2009-10-22 15:44:30 +00:00
parent 1f12921dc9
commit 124a5e3e6a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/wxpresets/presets/wx_unix.bkl
View File

@ -80,7 +80,7 @@ Format-specific notes:
$(DOLLAR)(shell $(WX_CONFIG) --query-toolkit) $(DOLLAR)(shell $(WX_CONFIG) --query-toolkit)
</set> </set>
<option name="WX_PORT"> <option name="WX_PORT">
<values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values> <values>gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value> <default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description> <description>
Port of the wx library to build against Port of the wx library to build against

11
wxwin.m4
View File

@ -869,7 +869,8 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*") WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*") WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*") WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
@ -879,11 +880,17 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac
dnl ports are called 'osx_cocoa' and 'osx_carbon' (see above)
WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*")
if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi
dnl check at least one of the WX_*PORT has been set ! dnl check at least one of the WX_*PORT has been set !
if test "$WX_PORT" = "unknown" ; then if test "$WX_PORT" = "unknown" ; then