diff --git a/build.sh b/build.sh index a8df67a..a406ee7 100755 --- a/build.sh +++ b/build.sh @@ -2,5 +2,5 @@ set -e echo build files will be placed in ./build -./vendor/premake5/premake5 gmake +./third-party/premake5/premake5 gmake2 make -C build config=$1 diff --git a/premake5.lua b/premake5.lua index abfff3c..458bd78 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,13 +1,15 @@ require "ecc/ecc" require "ninja/ninja" -local ogg = require("third-party/build-ogg") -local sfml = require("third-party/build-sfml") -local flac = require("third-party/build-flac") -local imgui = require("third-party/build-imgui") -local vorbis = require("third-party/build-vorbis") -local freetype = require("third-party/build-freetype") -local imguisfml = require("third-party/build-imgui-sfml") +package.path = package.path .. ";third-party/premake-scripts/?.lua" + +local ogg = require("build-ogg") +local sfml = require("build-sfml") +local flac = require("build-flac") +local imgui = require("build-imgui") +local vorbis = require("build-vorbis") +local freetype = require("build-freetype") +local imguisfml = require("build-imgui-sfml") local snake = require("project") diff --git a/project.lua b/project.lua index 99dd9dd..f5051e5 100644 --- a/project.lua +++ b/project.lua @@ -2,9 +2,11 @@ local m = {} local scriptdir = path.getabsolute(path.getdirectory(_SCRIPT)) -local sfml = require("third-party/build-sfml") -local imgui = require("third-party/build-imgui") -local imguisfml = require("third-party/build-imgui-sfml") +package.path = package.path .. ";third-party/premake-scripts/?.lua" + +local sfml = require("build-sfml") +local imgui = require("build-imgui") +local imguisfml = require("build-imgui-sfml") function m.generateproject(bindir, intdir)