2018-05-22 11:24:56 +00:00
|
|
|
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 0ad-0.0.23-alpha/build/premake/premake4.lua
|
|
|
|
|
--- 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 2018-04-29 17:44:48.000000000 +0200
|
|
|
|
|
+++ 0ad-0.0.23-alpha/build/premake/premake4.lua 2018-05-22 13:23:25.238894337 +0200
|
|
|
|
|
@@ -356,26 +356,6 @@
|
2012-09-25 23:44:59 +00:00
|
|
|
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
|
|
|
|
|
end
|
2016-11-09 05:50:08 +00:00
|
|
|
|
2012-09-25 23:44:59 +00:00
|
|
|
- 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
|
2016-11-09 05:50:08 +00:00
|
|
|
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
|
2012-09-25 23:44:59 +00:00
|
|
|
- elseif _ACTION == "codeblocks" then
|
2014-05-17 20:15:49 +00:00
|
|
|
- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
|
2012-09-25 23:44:59 +00:00
|
|
|
- end
|
|
|
|
|
- end
|
|
|
|
|
- end
|
|
|
|
|
-
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
2018-05-22 11:24:56 +00:00
|
|
|
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 0ad-0.0.23-alpha/build/premake/premake5.lua
|
|
|
|
|
--- 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 2018-04-22 20:14:45.000000000 +0200
|
|
|
|
|
+++ 0ad-0.0.23-alpha/build/premake/premake5.lua 2018-05-22 13:23:29.022903711 +0200
|
|
|
|
|
@@ -344,26 +344,6 @@
|
|
|
|
|
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
- if os.istarget("linux") or os.istarget("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.istarget("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
|
|
|
|
|
|
