|
 |
6f3eb4c |
diff -uNr 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 0ad-0.0.21-alpha/build/premake/premake4.lua
|
|
|
6f3eb4c |
--- 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 2016-09-18 10:54:27.000000000 +0200
|
|
|
6f3eb4c |
+++ 0ad-0.0.21-alpha/build/premake/premake4.lua 2016-11-09 06:47:02.330099676 +0100
|
|
|
6f3eb4c |
@@ -368,26 +368,6 @@
|
|
 |
b8284a1 |
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
|
|
|
b8284a1 |
end
|
|
|
6f3eb4c |
|
|
|
b8284a1 |
- if os.is("linux") or os.is("bsd") then
|
|
|
b8284a1 |
- -- To use our local shared libraries, they need to be found in the
|
|
|
b8284a1 |
- -- runtime dynamic linker path. Add their path to -rpath.
|
|
|
b8284a1 |
- if _OPTIONS["libdir"] then
|
|
|
b8284a1 |
- linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
|
|
|
b8284a1 |
- else
|
|
|
b8284a1 |
- -- On FreeBSD we need to allow use of $ORIGIN
|
|
|
b8284a1 |
- if os.is("bsd") then
|
|
|
b8284a1 |
- linkoptions { "-Wl,-z,origin" }
|
|
|
b8284a1 |
- end
|
|
|
b8284a1 |
-
|
|
|
b8284a1 |
- -- Adding the executable path and taking care of correct escaping
|
|
|
b8284a1 |
- if _ACTION == "gmake" then
|
|
|
6f3eb4c |
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
|
|
|
b8284a1 |
- elseif _ACTION == "codeblocks" then
|
|
 |
3f109a1 |
- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
|
|
|
b8284a1 |
- end
|
|
|
b8284a1 |
- end
|
|
|
b8284a1 |
- end
|
|
|
b8284a1 |
-
|
|
|
b8284a1 |
end
|
|
|
b8284a1 |
end
|
|
|
b8284a1 |
|