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

Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

Browse Source 
TOOLKIT is never set to "MAC" at all (it is one of OSX_{CARBON,COCOA,IPHONE})
so it is not necessary to test for it. And for the other cases the special
logic for OS X ports was the same as the general case so it seems to be
unnecessary as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-12-13 12:52:59 +00:00
parent 80aa2a2f06
commit 03773e400b
2 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@@ -28514,7 +28514,7 @@ fi
case "${host}" in
x86_64-*-mingw32* )
x86_64-*-mingw32* )
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
@@ -48024,19 +48024,7 @@ fi
TOOLKIT_LOWERCASE=xxx
if test "$TOOLKIT" = "MAC"; then
TOOLKIT_LOWERCASE=osx_carbon
fi
if test "$TOOLKIT" = "OSX_CARBON"; then
TOOLKIT_LOWERCASE=osx_carbon
fi
if test "$TOOLKIT" = "OSX_COCOA"; then
TOOLKIT_LOWERCASE=osx_cocoa
fi
if test "$TOOLKIT_LOWERCASE" = "xxx"; then
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
fi
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`

16
configure.in
View File

@@ -2765,7 +2765,7 @@ if test "$USE_WIN32" = 1 ; then
dnl --- FIXME: This is still a somewhat random list of libs,
dnl --- some of them should probably be included conditionally.
case "${host}" in
x86_64-*-mingw32* )
x86_64-*-mingw32* )
dnl --- For mingw-w64 lctl3d32's name has changed
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
@@ -7819,19 +7819,7 @@ AC_SUBST(EXTRALIBS_HILDON)
AC_SUBST(UNICODE)
AC_SUBST(DEBUG_INFO)
AC_SUBST(DEBUG_FLAG)
TOOLKIT_LOWERCASE=xxx
if test "$TOOLKIT" = "MAC"; then
TOOLKIT_LOWERCASE=osx_carbon
fi
if test "$TOOLKIT" = "OSX_CARBON"; then
TOOLKIT_LOWERCASE=osx_carbon
fi
if test "$TOOLKIT" = "OSX_COCOA"; then
TOOLKIT_LOWERCASE=osx_cocoa
fi
if test "$TOOLKIT_LOWERCASE" = "xxx"; then
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
fi
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
AC_SUBST(TOOLKIT_LOWERCASE)
AC_SUBST(TOOLKIT_VERSION)
AC_SUBST(DYLIB_RPATH_INSTALL)