From c6580d17120390124b0359dbaf7a9ecd4287e565 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 20 Aug 2008 11:01:29 +0000 Subject: [PATCH] Use the same subdirectory list for all platforms: the only place where the list was different for OS X was wrong. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@245 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/SConstruct b/SConstruct index 0606ab86ed..4089322d7e 100644 --- a/SConstruct +++ b/SConstruct @@ -29,6 +29,21 @@ include_paths = ["../../../Core/Common/Src", # "../../../Plugins/Plugin_VideoOGL/Src/Windows", ] +dirs = [ + "Source/Core/Common/Src", + "Externals/Bochs_disasm", + "Source/Core/Core/Src", + "Source/Core/DiscIO/Src", + "Source/Core/DebuggerWX/src", + "Source/Core/VideoCommon/Src", + "Source/Plugins/Plugin_VideoOGL/Src", + "Source/Plugins/Plugin_DSP_HLE/Src", +# "Source/Plugins/Plugin_DSP_LLE/Src", + "Source/Plugins/Plugin_PadSimple/Src", + "Source/Plugins/Plugin_nJoy_SDL/Src", + "Source/Core/DolphinWX/src", + ] + builders = {} if sys.platform == 'darwin': from plistlib import writePlist @@ -40,34 +55,6 @@ if sys.platform == 'darwin': writePlist(properties, str(dst_node)) builders['Plist'] = Builder(action = create_plist) - dirs = ["Source/Core/Common/Src", - "Externals/Bochs_disasm", - "Source/Core/Core/Src", - "Source/Core/DiscIO/Src", - "Source/Core/DebuggerWX/src", - "Source/Core/VideoCommon/Src", - "Source/Plugins/Plugin_VideoOGL/Src", -# "Source/Plugins/Plugin_DSP_LLE/Src", - "Source/Plugins/Plugin_PadSimple/Src", - "Source/Plugins/Plugin_nJoy_SDL/Src", - "Source/Core/DolphinWX/src", - ] -else: - dirs = ["Source/Core/Common/Src", - "Externals/Bochs_disasm", - "Source/Core/Core/Src", - "Source/Core/DiscIO/Src", - "Source/Core/DebuggerWX/src", - "Source/Core/VideoCommon/Src", - "Source/Plugins/Plugin_VideoOGL/Src", - "Source/Plugins/Plugin_DSP_HLE/Src", -# "Source/Plugins/Plugin_DSP_LLE/Src", - "Source/Plugins/Plugin_PadSimple/Src", - "Source/Plugins/Plugin_nJoy_SDL/Src", - "Source/Core/DolphinWX/src", - ] - - lib_paths = include_paths env = Environment(CC="gcc",