mirror of
https://abf.rosa.ru/djam/0ad.git
synced 2025-02-23 15:02:47 +00:00
30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
diff -urN 0ad-0.0.21-alpha/build/premake/premake4.lua 0ad-0.0.21-alpha-patched/build/premake/premake4.lua
|
|
--- 0ad-0.0.21-alpha/build/premake/premake4.lua 2016-09-18 18:54:27.000000000 +1000
|
|
+++ 0ad-0.0.21-alpha-patched/build/premake/premake4.lua 2016-12-05 13:42:29.678426569 +1000
|
|
@@ -368,26 +368,6 @@
|
|
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
|
|
|