piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restructured main SCons file in the same way as the one for the GL plugin.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@328 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-08-26 21:02:23 +00:00
parent 93f45b773c
commit 0ebba1bde0
2 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
SConstruct
View File

@ -5,29 +5,41 @@ import sys
dolphin_version = '1.04'
Export('dolphin_version')
warnings = ' -Wall -Wwrite-strings -Wfloat-equal -Wshadow -Wpointer-arith -Wpacked -Wno-conversion'
warnings = [
'all',
'write-strings',
'float-equal',
'shadow',
'pointer-arith',
'packed',
'no-conversion',
#'unreachable-code',
]
compileFlags = [
'-g',
'-O3',
'-fno-strict-aliasing',
'-fPIC',
'-msse2',
'-D_FILE_OFFSET_BITS=64',
'-D_LARGEFILE_SOURCE',
]
compileFlags += [ '-W' + warning for warning in warnings ]
#compileFlags += [ '-DLOGGING' ]
#compileFlags += [ '-fomit-frame-pointer' ]
if sys.platform == 'darwin':
compileFlags += [ '-I/opt/local/include' ]
nonactive_warnings = '-Wunreachable-code'
ccflags = '-g -O3 -fno-strict-aliasing -fPIC -msse2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE' + warnings
#ccflags += ' -DLOGGING'
if sys.platform == 'darwin':
ccflags += ' -I/opt/local/include'
if False:
ccflags += ' -fomit-frame-pointer'
include_paths = ["../../../Core/Common/Src",
"../../../Core/DiscIO/Src",
"../../../PluginSpecs",
"../../../",
"../../../Core/Core/Src",
"../../../Core/DebuggerWX/src",
"../../../../Externals/Bochs_disasm",
"../../../Core/VideoCommon/Src",
# "../../../Plugins/Plugin_VideoOGL/Src/Windows",
]
include_paths = [
'../../../Core/Common/Src',
'../../../Core/DiscIO/Src',
'../../../PluginSpecs',
'../../../',
'../../../Core/Core/Src',
'../../../Core/DebuggerWX/src',
'../../../../Externals/Bochs_disasm',
'../../../Core/VideoCommon/Src',
]
dirs = [
"Source/Core/Common/Src",
@ -38,44 +50,43 @@ dirs = [
"Source/Core/VideoCommon/Src",
"Source/Plugins/Plugin_VideoOGL/Src",
"Source/Plugins/Plugin_DSP_HLE/Src",
# "Source/Plugins/Plugin_DSP_LLE/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':
if sys.platform == 'darwin':
from plistlib import writePlist
def create_plist(target, source, env):
def createPlist(target, source, env):
properties = {}
for src_node in source:
properties.update(src_node.value)
for dst_node in target:
writePlist(properties, str(dst_node))
builders['Plist'] = Builder(action = create_plist)
for srcNode in source:
properties.update(srcNode.value)
for dstNode in target:
writePlist(properties, str(dstNode))
builders['Plist'] = Builder(action = createPlist)
lib_paths = include_paths
env = Environment(CC="gcc",
CXX="g++",
CCFLAGS=ccflags,
CXXFLAGS=ccflags,
CPPPATH=include_paths,
LIBPATH=lib_paths,
ENV={'PATH' : os.environ['PATH'],
'HOME' : os.environ['HOME']},
BUILDERS = builders,
)
env = Environment(
CC = "gcc",
CXX = "g++",
CCFLAGS = compileFlags,
CXXFLAGS = compileFlags,
CPPPATH = include_paths,
LIBPATH = lib_paths,
ENV = {
'PATH' : os.environ['PATH'],
'HOME' : os.environ['HOME']
},
BUILDERS = builders,
)
Export('env')
builddir = "build"
for dir in dirs:
for subdir in dirs:
SConscript(
dir + os.sep + "SConscript",
# build_dir = builddir + os.sep + dir,
subdir + os.sep + 'SConscript',
duplicate = 0
)

2
Source/Core/Common/Src/SConscript
View File

@ -26,5 +26,5 @@ files = ["ABI.cpp",
]
env_common = env.Copy()
env_common.Append(CXXFLAGS = " -fPIC ")
env_common.Append(CXXFLAGS = [ '-fPIC' ])
env_common.StaticLibrary("common", files)