mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-21 20:01:40 +02:00
c05c9fa1f4
Patch from user gamepromcompany on the MacOSX_Build wiki page. Add support for the Mac command key as a hotkey modifier in WXKeyToString but present it as Control. WXKeyToString is used for both hotkeys and menu accelerators, the latter only supporting Shift/Alt/Control with wxWidgets. wxSpinCtrl on wx 2.9 has a very small default size, so give the window size ones a reasonable size. Use wxFULLSCREEN_ALL when switching to fullscreen, which gets rid of window decorations like the title bar. Note that to actually be rid of it with wx 2.9 on OS X, you'll need this patch: http://trac.wxwidgets.org/ticket/11701 Also remove a couple of files I had accidentally duplicated. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5642 8ced0084-cf51-0410-be5f-012b33b47a6e
111 lines
2.3 KiB
Python
111 lines
2.3 KiB
Python
# -*- python -*-
|
|
|
|
Import('env')
|
|
import os
|
|
import sys
|
|
|
|
wxenv = env.Clone()
|
|
|
|
files = [
|
|
'BootManager.cpp',
|
|
]
|
|
|
|
libs = [
|
|
'core', 'lzo2', 'discio', 'bdisasm', 'videocommon',
|
|
'inputcommon', 'common', 'lua', 'z', 'sfml-network'
|
|
]
|
|
|
|
if wxenv['HAVE_WX']:
|
|
files += [
|
|
'AboutDolphin.cpp',
|
|
'ARCodeAddEdit.cpp',
|
|
'ConfigMain.cpp',
|
|
'Frame.cpp',
|
|
'FrameAui.cpp',
|
|
'FrameTools.cpp',
|
|
'LuaWindow.cpp',
|
|
'LogWindow.cpp',
|
|
'GameListCtrl.cpp',
|
|
'Globals.cpp',
|
|
'HotkeyDlg.cpp',
|
|
'ISOFile.cpp',
|
|
'ISOProperties.cpp',
|
|
'MemcardManager.cpp',
|
|
'MemoryCards/GCMemcard.cpp',
|
|
'PatchAddEdit.cpp',
|
|
'CheatsWindow.cpp',
|
|
'stdafx.cpp',
|
|
'WxUtils.cpp',
|
|
'MemoryCards/WiiSaveCrypted.cpp',
|
|
'NetPlay.cpp',
|
|
'NetPlayClient.cpp',
|
|
'NetPlayServer.cpp',
|
|
'NetWindow.cpp',
|
|
]
|
|
|
|
CPPDEFINES = [
|
|
'wxNEEDS_CHARPP',
|
|
],
|
|
|
|
libs = [ 'debwx', 'debugger_ui_util'] + libs
|
|
else:
|
|
files+= [
|
|
'cmdline.c',
|
|
]
|
|
|
|
if sys.platform == 'darwin':
|
|
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':
|
|
exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
|
|
exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
|
|
|
|
wxenv['FRAMEWORKS'] = ['Cocoa', 'CoreFoundation', 'System']
|
|
wxenv.Plist(
|
|
env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
|
|
Value(dict(
|
|
CFBundleExecutable = 'Dolphin',
|
|
CFBundleIconFile = 'Dolphin.icns',
|
|
CFBundleIdentifier = 'com.dolphin-emu.dolphin',
|
|
CFBundleName = 'Dolphin',
|
|
CFBundlePackageType = 'APPL',
|
|
CFBundleShortVersionString =
|
|
os.popen('svnversion -n ' + Dir('#').abspath).read(),
|
|
CFBundleVersion = '2.0',
|
|
LSRequiresCarbon = True,
|
|
))
|
|
)
|
|
else:
|
|
exeGUI = env['binary_dir'] + 'dolphin-emu'
|
|
exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
|
|
|
|
if wxenv['HAVE_X11']:
|
|
files += [ 'X11Utils.cpp' ]
|
|
|
|
#objects = [ wxenv.Object(srcFile) for srcFile in files ]
|
|
|
|
if wxenv['HAVE_WX']:
|
|
wxenv.Program(exeGUI, files + [ 'Main.cpp' ])
|
|
else:
|
|
wxenv.Program(exeNoGUI, files + [ 'MainNoGUI.cpp' ])
|