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.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 27 insertions, 26 deletions

diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
index 29be81fbc9..c018d8bbcc 100644
--- a/Source/Core/Common/Src/SConscript
+++ b/Source/Core/Common/Src/SConscript
@@ -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)