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

wxBase compilation fix for Mac, with help from Ryan

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-05-27 13:18:50 +00:00
parent ce08fb6f7c
commit 19b27e78cf
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@@ -40562,8 +40562,6 @@ if test "$wxUSE_MAC" = 1 ; then
else else
LDFLAGS="$LDFLAGS -lCarbonLib" LDFLAGS="$LDFLAGS -lCarbonLib"
fi fi
elif test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System"
fi fi
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_COCOA" = 1 ; then
LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa" LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
@@ -40571,6 +40569,9 @@ if test "$wxUSE_COCOA" = 1 ; then
LDFLAGS="$LDFLAGS -framework QuickTime" LDFLAGS="$LDFLAGS -framework QuickTime"
fi fi
fi fi
if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
fi
LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS" LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"

5
configure.in
View File

@@ -6389,8 +6389,6 @@ if test "$wxUSE_MAC" = 1 ; then
else else
LDFLAGS="$LDFLAGS -lCarbonLib" LDFLAGS="$LDFLAGS -lCarbonLib"
fi fi
elif test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System"
fi fi
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_COCOA" = 1 ; then
LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa" LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
@@ -6398,6 +6396,9 @@ if test "$wxUSE_COCOA" = 1 ; then
LDFLAGS="$LDFLAGS -framework QuickTime" LDFLAGS="$LDFLAGS -framework QuickTime"
fi fi
fi fi
if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
fi
dnl FIXME: should this be covered by the conditional above dnl FIXME: should this be covered by the conditional above
dnl given the -lm comment there? Or should that comment (and dnl given the -lm comment there? Or should that comment (and

5
src/mac/corefoundation/hid.cpp
View File

@@ -573,13 +573,8 @@ bool wxGetKeyState (wxKeyCode key)
// //
#include "wx/intl.h" #include "wx/intl.h"
#ifdef __WXCOCOA__
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#else
#include "wx/mac/private.h"
#include "LaunchServices.h"
#endif
#include "wx/uri.h" #include "wx/uri.h"
#include "wx/mac/corefoundation/cfstring.h" #include "wx/mac/corefoundation/cfstring.h"