piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make wxgl mandatory on OS X.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5576 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-03 01:24:26 +00:00
parent 3a7b8c51c6
commit 52c912a59e
17 changed files with 699 additions and 1157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -30,7 +30,7 @@
#include "Frame.h"
#include "HotkeyDlg.h"
#if defined(HAVE_COCOA) && HAVE_COCOA
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
@ -1188,7 +1188,7 @@ void CConfigMain::AddResolutions()
main_frame->m_XRRConfig->AddResolutions(arrayStringFor_FullscreenResolution);
#elif defined(HAVE_COCOA) && HAVE_COCOA
#elif defined(__APPLE__)
CGDisplayModeRef mode;
CFArrayRef array;

4
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -32,7 +32,7 @@
#include "X11Utils.h"
#endif
#if defined(HAVE_COCOA) && HAVE_COCOA
#ifdef __APPLE__
#import "cocoaApp.h"
#endif
@ -260,7 +260,7 @@ void X11_MainLoop()
#endif
//for cocoa we need to hijack the main to get event
#if defined(HAVE_COCOA) && HAVE_COCOA
#ifdef __APPLE__
@interface CocoaThread : NSObject
{

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

@ -44,37 +44,29 @@ if wxenv['HAVE_WX']:
'NetWindow.cpp',
]
CPPDEFINES = [
CPPDEFINE = [
'wxNEEDS_CHARPP',
],
compileFlags = [
],
libs = [ 'debwx', 'debugger_ui_util'] + libs
if wxenv['HAVE_COCOA']:
files += [ 'cocoaApp.m', ]
compileFlags = [
'-x',
'objective-c++',
]
wxenv.Append(
CXXFLAGS = compileFlags,
LINKFLAGS = [
'-pthread', '-framework', 'IOKit'
],
LIBS = libs
)
else:
wxenv.Append(
LINKFLAGS = [
'-pthread',
],
LIBS = libs
)
if sys.platform == 'darwin':
files += [ 'cocoaApp.m', ]
compileFlags = [
'-x',
'objective-c++',
]
linkflags = [
'-pthread', '-framework', 'IOKit'
]
exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
@ -96,11 +88,17 @@ if sys.platform == 'darwin':
else:
exeGUI = env['binary_dir'] + 'dolphin-emu'
exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
linkflags = [ '-pthread' ]
if wxenv['HAVE_X11']:
files += [ 'X11Utils.cpp' ]
#objects = [ wxenv.Object(srcFile) for srcFile in files ]
wxenv.Append(
CXXFLAGS = compileFlags,
LINKFLAGS = linkflags,
LIBS = libs,
)
if wxenv['HAVE_WX']:
wxenv.Program(exeGUI, files + [ 'Main.cpp' ])