Browse Source

Minor build refactor and preparation for gmake2.

pull/1489/head
Joao Matos 5 years ago
parent
commit
7585d858f3
  1. 2
      build/Compile.sh
  2. 11
      build/Helpers.lua

2
build/Compile.sh

@ -31,7 +31,7 @@ fi @@ -31,7 +31,7 @@ fi
export PATH=$PATH:$MONO_PATH
./premake.sh --file=$CUR_DIR/premake5.lua gmake "$@"
$CUR_DIR/premake.sh --file=$CUR_DIR/premake5.lua gmake2 "$@"
if $DEBUG; then
BUILD_CONF=debug_x64;

11
build/Helpers.lua

@ -89,11 +89,16 @@ bindir = path.getabsolute("../bin"); @@ -89,11 +89,16 @@ bindir = path.getabsolute("../bin");
examplesdir = path.getabsolute("../examples");
testsdir = path.getabsolute("../tests");
builddir = path.getabsolute("./" .. _ACTION);
if _ARGS[1] then
builddir = path.getabsolute("./" .. _ARGS[1]);
local function get_build_dir()
if _ARGS[1] then
return _ARGS[1]
end
return _ACTION == "gmake2" and "gmake" or _ACTION
end
builddir = path.getabsolute("./" .. get_build_dir());
if _ACTION ~= "netcore" then
objsdir = path.join(builddir, "obj", "%{cfg.buildcfg}_%{cfg.platform}");
libdir = path.join(builddir, "lib", "%{cfg.buildcfg}_%{cfg.platform}");

Loading…
Cancel
Save