From 9f5aaf841334225de320d49dadecc4ab25e0e135 Mon Sep 17 00:00:00 2001 From: bushing Date: Fri, 9 Jan 2009 12:11:48 +0000 Subject: [PATCH] place plugins inside app bundle on osx (also btw, all Macs have Cocoa...) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1839 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 6a832e00b3..1ad0fab7b7 100644 --- a/SConstruct +++ b/SConstruct @@ -216,7 +216,7 @@ if sys.platform == 'darwin': if not env['osx'] == '32x11': env['HAVE_X11'] = 0 - env['HAVE_COCOA'] = conf.CheckPKG('cocoa') + env['HAVE_COCOA'] = 1 else: env['HAVE_X11'] = conf.CheckPKG('x11') env['HAVE_COCOA'] = 0 @@ -305,7 +305,10 @@ elif flavour == 'prof': # TODO: support global install env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + extra +os.sep) #TODO add lib -env['plugin_dir'] = env['prefix'] + 'Plugins/' +if sys.platform == 'darwin': + env['plugin_dir'] = env['prefix'] + 'Dolphin.app/Contents/PlugIns/' +else: + env['plugin_dir'] = env['prefix'] + 'Plugins/' #TODO add bin env['binary_dir'] = env['prefix'] #TODO add bin