summaryrefslogtreecommitdiffstats
path: root/Sluift
diff options
context:
space:
mode:
Diffstat (limited to 'Sluift')
-rw-r--r--Sluift/SConscript4
-rw-r--r--Sluift/SConscript.variant17
2 files changed, 14 insertions, 7 deletions
diff --git a/Sluift/SConscript b/Sluift/SConscript
index c4d3b28..5d2242e 100644
--- a/Sluift/SConscript
+++ b/Sluift/SConscript
@@ -41,11 +41,8 @@ elif env["SCONS_STAGE"] == "build" :
sluift_env.UseFlags(env.get("LUA_FLAGS", {}))
sluift_env.UseFlags(env["SWIFTEN_FLAGS"])
sluift_env.UseFlags(env["SWIFTEN_DEP_FLAGS"])
- sluift_env["SHLIBPREFIX"] = ""
if sluift_env["PLATFORM"] == "win32" :
sluift_env.Append(CPPDEFINES = ["SLUIFT_BUILD_DLL"])
- elif sluift_env["PLATFORM"] == "darwin" :
- sluift_env["SHLIBSUFFIX"] = ".so"
# Generate a customized lua.c
sluift_env["SLUIFT_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "sluift")
@@ -85,4 +82,3 @@ elif env["SCONS_STAGE"] == "build" :
SConscript(["SConscript.variant"], variant_dir = sluift_variant,
duplicate = 0,
exports = ['sluift_sources', 'sluift_variant', 'sluift_env'])
-
diff --git a/Sluift/SConscript.variant b/Sluift/SConscript.variant
index bf5d85e..92ee493 100644
--- a/Sluift/SConscript.variant
+++ b/Sluift/SConscript.variant
@@ -1,3 +1,5 @@
+import os
+
Import('env')
Import('sluift_env')
Import('sluift_variant')
@@ -8,7 +10,16 @@ if sluift_variant == 'exe' :
"#/Sluift/lua.c",
"#/Sluift/linit.c",
])
+ if sluift_env.get("SLUIFT_INSTALLDIR", "") :
+ sluift_env.Install(os.path.join(sluift_env["SLUIFT_INSTALLDIR"], "bin"), env["SLUIFT"])
else :
- sluift_env.SharedLibrary("sluift", sluift_sources + [
- "#/Sluift/dll.c"
- ])
+ sluift_env["SLUIFT_DLL_SUFFIX"] = "${SHLIBSUFFIX}"
+ if sluift_env["PLATFORM"] == "darwin" :
+ sluift_env["SLUIFT_DLL_SUFFIX"] = ".so"
+ sluift_dll = sluift_env.SharedLibrary(sluift_env.File("sluift${SLUIFT_DLL_SUFFIX}"),
+ sluift_sources + ["#/Sluift/dll.c"])
+ if sluift_env.get("SLUIFT_INSTALLDIR", False) and sluift_env.get("LUA_VERSION", False) :
+ sluift_env.Install(
+ os.path.join(sluift_env["SLUIFT_INSTALLDIR"], "lib", "lua", sluift_env["LUA_VERSION"]),
+ sluift_dll)
+