diff options
| author | tmator <tmator@gmail.com> | 2009-10-07 10:13:20 +0000 |
|---|---|---|
| committer | tmator <tmator@gmail.com> | 2009-10-07 10:13:20 +0000 |
| commit | f768ae5586090f9e315c7e12746debd07ae1cb3b (patch) | |
| tree | d9c14c8c30ae73ce231db992b8e7a229b46bfd3f /Source/Core | |
| parent | b920ade474dfb1717ca5921fbf63b66d7f592089 (diff) | |
wx 2.9 works in 64bit with snow leopard
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4374 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.h | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 01487553b3..f94f5bf9d5 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -24,6 +24,10 @@ #include <wx/mstream.h> #include <wx/listctrl.h> #include <wx/artprov.h> +#if defined(__APPLE__) +//id is an objective-c++ type, wx team need to change this +#define id toolid +#endif #include <wx/aui/aui.h> #include "CDUtils.h" diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index e6dc6fe883..10a6d50bf3 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -311,12 +311,14 @@ bool DolphinApp::OnInit() //TODO : if not exist copy game config dir in user dir and detect the revision to upgrade if necessary //TODO : if not exist copy maps dir in user dir and detect revision to upgrade if necessary +#if !wxCHECK_VERSION(2, 9, 0) // HACK: Get rid of bogus osx param if (argc > 1 && wxString(argv[argc - 1]).StartsWith(_("-psn_"))) { delete argv[argc-1]; argv[argc-1] = NULL; argc--; } +#endif #endif // Gets the passed media files from command line diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 279565748f..40694264e8 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -67,13 +67,10 @@ if wxenv['HAVE_COCOA']: wxenv.Append( CXXFLAGS = compileFlags, LINKFLAGS = [ - '-pthread', + '-pthread', '-framework', 'IOKit' ], LIBS = libs ) - if not wxenv['HAVE_WX']: - wxenv.Append( - LINKFLAGS = ['-framework', 'IOKit']) else: wxenv.Append( LINKFLAGS = [ |