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

Only use "-fPIC" for compiling objects that will be part of dynamic libs. Make SConscripts inherit the compile flags from the top level instead of overriding them.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne
2008-08-26 22:28:42 +00:00
parent 0ebba1bde0
commit 59974dfb5b
11 changed files with 154 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,30 +1,31 @@
Import('env')
files = ["ABI.cpp",
"Common.cpp",
"ChunkFile.cpp",
"CPUDetect.cpp",
"DynamicLibrary.cpp",
"Hash.cpp",
"HTTP.cpp",
"IniFile.cpp",
"Logging.cpp",
"FileUtil.cpp",
"MappedFile.cpp",
"MathUtil.cpp",
"MemArena.cpp",
"MemoryUtil.cpp",
"Plugin.cpp",
"PortableSockets.cpp",
"StringUtil.cpp",
"TestFramework.cpp",
"Thunk.cpp",
"Timer.cpp",
"Thread.cpp",
"x64Emitter.cpp",
"x64Analyzer.cpp",
]
files = [
"ABI.cpp",
"Common.cpp",
"ChunkFile.cpp",
"CPUDetect.cpp",
"DynamicLibrary.cpp",
"Hash.cpp",
"HTTP.cpp",
"IniFile.cpp",
"Logging.cpp",
"FileUtil.cpp",
"MappedFile.cpp",
"MathUtil.cpp",
"MemArena.cpp",
"MemoryUtil.cpp",
"Plugin.cpp",
"PortableSockets.cpp",
"StringUtil.cpp",
"TestFramework.cpp",
"Thunk.cpp",
"Timer.cpp",
"Thread.cpp",
"x64Emitter.cpp",
"x64Analyzer.cpp",
]
env_common = env.Copy()
env_common.Append(CXXFLAGS = [ '-fPIC' ])
env_common.Append(CXXFLAGS = ' ' + ' '.join([ '-fPIC' ]))
env_common.StaticLibrary("common", files)

18
Source/Core/DebuggerWX/src/SConscript
View File

@ -15,7 +15,17 @@ files = ["LogWindow.cpp",
"RegisterView.cpp",
"JitWindow.cpp",
]
wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP",
LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs --debug`")
wxenv.StaticLibrary("debwx", files, LIBS = ["common"])
wxenv = env.Copy()
wxenv.Append(
CXXFLAGS = ' ' + ' '.join([
'`wx-config --cppflags`',
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP'
]),
LINKFLAGS = ' ' + ' '.join([
'-L/usr/local/lib',
'-pthread',
'`wx-config --libs --debug`'
])
)
wxenv.StaticLibrary("debwx", files, LIBS = [ "common" ])

22
Source/Core/DolphinWX/src/SConscript
View File

@ -17,14 +17,26 @@ files = ["BootManager.cpp",
"stdafx.cpp",
]
wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP `sdl-config --cflags`",
LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs` `sdl-config --libs`")
wxenv = env.Copy()
wxenv.Append(
CXXFLAGS = ' ' + ' '.join([
'`wx-config --cppflags`',
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP',
'`sdl-config --cflags`',
]),
LINKFLAGS = ' ' + ' '.join([
'-L/usr/local/lib',
'-pthread',
'`wx-config --libs`',
'`sdl-config --libs`'
])
)
if sys.platform == 'darwin':
icon = 'Dolphin'
version = "svn"
wxenv.Program("../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin", files, LIBS = ["debwx", "discio", "core", "bdisasm", "videocommon", "common" , "z"])
version = 'svn'
wxenv.Program('../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin', files, LIBS = ["debwx", "discio", "core", "bdisasm", "videocommon", "common" , "z"])
wxenv.Plist("../../../../Binary/mac/Dolphin.app/Contents/Info.plist", Value(dict(
CFAppleHelpAnchor = 'index',
CFBundleExecutable = 'Dolphin',

20
Source/Core/VideoCommon/Src/SConscript
View File

@ -1,13 +1,15 @@
Import('env')
files = ["BPMemory.cpp",
"CPMemory.cpp",
"LookUpTables.cpp",
"TextureDecoder.cpp",
"XFMemory.cpp",
"XFBConvert.cpp",
"Fifo.cpp",
]
files = [
"BPMemory.cpp",
"CPMemory.cpp",
"LookUpTables.cpp",
"TextureDecoder.cpp",
"XFMemory.cpp",
"XFBConvert.cpp",
"Fifo.cpp",
]
env_common = env.Copy(CXXFLAGS = " -fPIC ")
env_common = env.Copy()
env_common.Append(CXXFLAGS = ' ' + ' '.join([ '-fPIC' ]))
env_common.StaticLibrary("videocommon", files)