ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
tmator 2009-10-07 10:13:20 +00:00
parent b920ade474
commit f768ae5586
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@ -275,7 +275,6 @@ if conf.CheckPKG('sfml-network') and conf.CheckCXXHeader("SFML/Network/Ftp.hpp")
#osx 64 specifics #osx 64 specifics
if sys.platform == 'darwin': if sys.platform == 'darwin':
if env['osx'] == '64cocoa': if env['osx'] == '64cocoa':
env['nowx'] = True
compileFlags += ['-arch' , 'x86_64', '-m64' ] compileFlags += ['-arch' , 'x86_64', '-m64' ]
conf.Define('MAP_32BIT', 0) conf.Define('MAP_32BIT', 0)
if env['osx'] == '32cocoa': if env['osx'] == '32cocoa':

4
Source/Core/DolphinWX/Src/Frame.h
View File

@ -24,6 +24,10 @@
#include <wx/mstream.h> #include <wx/mstream.h>
#include <wx/listctrl.h> #include <wx/listctrl.h>
#include <wx/artprov.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 <wx/aui/aui.h>
#include "CDUtils.h" #include "CDUtils.h"

2
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -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 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 //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 // HACK: Get rid of bogus osx param
if (argc > 1 && wxString(argv[argc - 1]).StartsWith(_("-psn_"))) { if (argc > 1 && wxString(argv[argc - 1]).StartsWith(_("-psn_"))) {
delete argv[argc-1]; delete argv[argc-1];
argv[argc-1] = NULL; argv[argc-1] = NULL;
argc--; argc--;
} }
#endif
#endif #endif
// Gets the passed media files from command line // Gets the passed media files from command line

5
Source/Core/DolphinWX/Src/SConscript
View File

@ -67,13 +67,10 @@ if wxenv['HAVE_COCOA']:
wxenv.Append( wxenv.Append(
CXXFLAGS = compileFlags, CXXFLAGS = compileFlags,
LINKFLAGS = [ LINKFLAGS = [
'-pthread', '-pthread', '-framework', 'IOKit'
], ],
LIBS = libs LIBS = libs
) )
if not wxenv['HAVE_WX']:
wxenv.Append(
LINKFLAGS = ['-framework', 'IOKit'])
else: else:
wxenv.Append( wxenv.Append(
LINKFLAGS = [ LINKFLAGS = [