2013-12-27 21:02:59 +00:00
|
|
|
diff -up 0ad-0.0.15-alpha/build/premake/premake4.lua.orig 0ad-0.0.15-alpha/build/premake/premake4.lua
|
|
|
|
|
--- 0ad-0.0.15-alpha/build/premake/premake4.lua.orig 2013-12-27 17:26:42.924652871 -0200
|
|
|
|
|
+++ 0ad-0.0.15-alpha/build/premake/premake4.lua 2013-12-27 17:26:54.611653319 -0200
|
|
|
|
|
@@ -355,26 +355,6 @@ function project_set_build_flags()
|
2012-09-25 23:44:59 +00:00
|
|
|
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
- if os.is("linux") or os.is("bsd") then
|
|
|
|
|
- -- To use our local shared libraries, they need to be found in the
|
|
|
|
|
- -- runtime dynamic linker path. Add their path to -rpath.
|
|
|
|
|
- if _OPTIONS["libdir"] then
|
|
|
|
|
- linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
|
|
|
|
|
- else
|
|
|
|
|
- -- On FreeBSD we need to allow use of $ORIGIN
|
|
|
|
|
- if os.is("bsd") then
|
|
|
|
|
- linkoptions { "-Wl,-z,origin" }
|
|
|
|
|
- end
|
|
|
|
|
-
|
|
|
|
|
- -- Adding the executable path and taking care of correct escaping
|
|
|
|
|
- if _ACTION == "gmake" then
|
|
|
|
|
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
|
|
|
|
|
- elseif _ACTION == "codeblocks" then
|
|
|
|
|
- linkoptions { "-Wl,-R\\\\$$ORIGIN" }
|
|
|
|
|
- end
|
|
|
|
|
- end
|
|
|
|
|
- end
|
|
|
|
|
-
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
