summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-25 18:56:05 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-25 18:56:05 (GMT)
commit0d10e2553111a6c4786c9c2d1cebe405b1dfbbaa (patch)
treedf34176dd6a4cf86333964eb9a4063899e022070
parent7c22c10412c9231f76cf71e0f1fb61788115f0b9 (diff)
downloadswift-contrib-0d10e2553111a6c4786c9c2d1cebe405b1dfbbaa.zip
swift-contrib-0d10e2553111a6c4786c9c2d1cebe405b1dfbbaa.tar.bz2
Temporarily don't build Sluift plugin on amd64.
-rw-r--r--3rdParty/Lua/SConscript3
-rw-r--r--Sluift/SConscript16
2 files changed, 10 insertions, 9 deletions
diff --git a/3rdParty/Lua/SConscript b/3rdParty/Lua/SConscript
index 9063f97..cd65061 100644
--- a/3rdParty/Lua/SConscript
+++ b/3rdParty/Lua/SConscript
@@ -33,9 +33,6 @@ if env.get("LUA_BUNDLED", False) :
# Remove warn flags
myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
- if myenv["PLATFORM"] == "posix" :
- myenv.Append(CCFLAGS = ["-fPIC"])
-
myenv.MergeFlags(myenv["LUA_FLAGS"])
myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
myenv.StaticLibrary("Swiften_Lua", [
diff --git a/Sluift/SConscript b/Sluift/SConscript
index 74b266c..ae51f57 100644
--- a/Sluift/SConscript
+++ b/Sluift/SConscript
@@ -1,3 +1,5 @@
+import platform
+
Import("env")
if env["SCONS_STAGE"] == "build" :
@@ -5,14 +7,16 @@ if env["SCONS_STAGE"] == "build" :
myenv.UseFlags(env["LUA_FLAGS"])
myenv.UseFlags(env["SWIFTEN_FLAGS"])
myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
-
myenv["SHLIBPREFIX"] = ""
+
if myenv["PLATFORM"] == "win32" :
myenv.Append(CPPDEFINES = ["SLUIFT_BUILD_DLL"])
elif myenv["PLATFORM"] == "darwin" :
myenv["SHLIBSUFFIX"] = ".so"
- elif myenv["PLATFORM"] == "posix" :
- myenv.Append(CCFLAGS = ["-fPIC"])
- myenv.SharedLibrary("sluift", [
- "sluift.cpp",
- ])
+
+ # Temporarily not building plugin on amd64, because it
+ # requires the whole build to be done with -fPIC
+ if myenv["PLATFORM"] != "posix" or platform.machine() != "amd64" :
+ myenv.SharedLibrary("sluift", [
+ "sluift.cpp",
+ ])