Commit 2d6367a5 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 00b2037e c6b50141
Pipeline #14979 passed with stages
in 5 minutes and 35 seconds
...@@ -177,7 +177,7 @@ if USE_IRRKLANG then ...@@ -177,7 +177,7 @@ if USE_IRRKLANG then
IRRKLANG_LIB_DIR = "../irrklang/lib/Win32-visualStudio" IRRKLANG_LIB_DIR = "../irrklang/lib/Win32-visualStudio"
elseif os.istarget("linux") then elseif os.istarget("linux") then
IRRKLANG_LIB_DIR = "../irrklang/bin/linux-gcc-64" IRRKLANG_LIB_DIR = "../irrklang/bin/linux-gcc-64"
IRRKLANG_LINK_RPATH = "-Wl,-rpath=./" IRRKLANG_LINK_RPATH = "-Wl,-rpath=./lib/"
elseif os.istarget("macosx") then elseif os.istarget("macosx") then
IRRKLANG_LIB_DIR = "../irrklang/bin/macosx-gcc" IRRKLANG_LIB_DIR = "../irrklang/bin/macosx-gcc"
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment