summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-26 10:23:42 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-26 10:23:42 (GMT)
commit8d14d9b2e0e459df6ca974dadee447abb3293a98 (patch)
tree278e002994e453f4cec9d500caa0ab824c530da4
parente67eb946a93f2217291e1dd27e287e1b1f2f030a (diff)
downloadswift-8d14d9b2e0e459df6ca974dadee447abb3293a98.zip
swift-8d14d9b2e0e459df6ca974dadee447abb3293a98.tar.bz2
Avoid scons warning on multiply defined targets.
-rw-r--r--Sluift/SConscript12
1 files changed, 8 insertions, 4 deletions
diff --git a/Sluift/SConscript b/Sluift/SConscript
index e00d32e..3a7d32f 100644
--- a/Sluift/SConscript
+++ b/Sluift/SConscript
@@ -12,10 +12,6 @@ if env["SCONS_STAGE"] == "build" :
elif myenv["PLATFORM"] == "darwin" :
myenv["SHLIBSUFFIX"] = ".so"
- myenv.SharedLibrary("sluift", [
- "sluift.cpp",
- ])
-
sluift_bin_env = myenv.Clone()
sluift_bin_env.Install(".", "#/3rdParty/Lua/src/lua.c")
if sluift_bin_env.get("HAVE_READLINE", False) :
@@ -26,3 +22,11 @@ if env["SCONS_STAGE"] == "build" :
"lua.c",
"linit.c",
])
+
+ # Create a copy of sluift.cpp to avoid conflicting targets
+ # Ideally, we would use variants for this
+ myenv.InstallAs("sluift_dll.cpp", "sluift.cpp")
+ myenv.SharedLibrary("sluift", [
+ "sluift_dll.cpp",
+ ])
+