|
 |
3f109a1 |
--- 0ad-0.0.16-alpha/build/premake/premake4.lua.orig 2014-05-17 22:21:52.787713008 +0200
|
|
|
3f109a1 |
+++ 0ad-0.0.16-alpha/build/premake/premake4.lua 2014-05-17 22:22:39.659845979 +0200
|
|
|
3f109a1 |
@@ -356,26 +356,6 @@
|
|
 |
b8284a1 |
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
|
|
|
b8284a1 |
end
|
|
|
b8284a1 |
|
|
|
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
|
|
|
b8284a1 |
- 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 |
|