diff options
Diffstat (limited to '3rdparty/genie/scripts')
-rw-r--r-- | 3rdparty/genie/scripts/embed.lua | 8 | ||||
-rw-r--r-- | 3rdparty/genie/scripts/genie.lua | 29 | ||||
-rw-r--r-- | 3rdparty/genie/scripts/release.lua | 2 |
3 files changed, 23 insertions, 16 deletions
diff --git a/3rdparty/genie/scripts/embed.lua b/3rdparty/genie/scripts/embed.lua index 05165923c16..39703b1dd4a 100644 --- a/3rdparty/genie/scripts/embed.lua +++ b/3rdparty/genie/scripts/embed.lua @@ -5,6 +5,8 @@ -- issues in Mac OS X Universal builds. -- + local scriptdir = path.getdirectory(_SCRIPT) + local function stripfile(fname) local f = io.open(fname) local s = assert(f:read("*a")) @@ -73,13 +75,13 @@ function doembed() -- load the manifest of script files - scripts = dofile("../src/_manifest.lua") + scripts = dofile(path.join(scriptdir, "../src/_manifest.lua")) -- main script always goes at the end table.insert(scripts, "_premake_main.lua") -- open scripts.c and write the file header - local out = io.open("../src/host/scripts.c", "w+b") + local out = io.open(path.join(scriptdir, "../src/host/scripts.c"), "w+b") out:write("/* Premake's Lua scripts, as static data buffers for release mode builds */\n") out:write("/* DO NOT EDIT - this file is autogenerated - see BUILD.txt */\n") out:write("/* To regenerate this file, run: premake4 embed */ \n\n") @@ -87,7 +89,7 @@ for i,fn in ipairs(scripts) do print(fn) - local s = stripfile("../src/" .. fn) + local s = stripfile(path.join(scriptdir,"../src/" .. fn)) writefile(out, fn, s) end diff --git a/3rdparty/genie/scripts/genie.lua b/3rdparty/genie/scripts/genie.lua index 144b5cf3709..291dd526bac 100644 --- a/3rdparty/genie/scripts/genie.lua +++ b/3rdparty/genie/scripts/genie.lua @@ -21,10 +21,11 @@ language "C" kind "ConsoleApp" flags { - "No64BitChecks", "ExtraWarnings", + "No64BitChecks", "StaticRuntime" } + includedirs { "../src/host/lua-5.3.0/src" } @@ -44,6 +45,10 @@ "../src/host/lua-5.3.0/etc/*.c", } + buildoptions { + "-m64", + } + configuration "Debug" defines { "_DEBUG", "LUA_COMPAT_MODULE" } flags { "Symbols" } @@ -66,16 +71,14 @@ configuration "bsd" targetdir "../bin/bsd" - configuration "solaris" - targetdir "../bin/solaris" - defines { "_REENTRANT" } - buildoptions { "-std=gnu99" } - links { "dl" } + configuration "linux or bsd" + defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" } + buildoptions { "-Wno-implicit-fallthrough" } + links { "m" } + linkoptions { "-rdynamic" } - configuration "linux or bsd or solaris" - defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" } - links { "m" } - linkoptions { "-rdynamic" } + configuration "linux" + defines { "_FILE_OFFSET_BITS=64" } configuration "macosx" targetdir "../bin/darwin" @@ -83,8 +86,10 @@ links { "CoreServices.framework" } configuration { "macosx", "gmake" } - buildoptions { "-mmacosx-version-min=10.4" } - linkoptions { "-mmacosx-version-min=10.4" } + buildoptions { "-mmacosx-version-min=10.6" } + linkoptions { "-mmacosx-version-min=10.6" } + + configuration {} -- diff --git a/3rdparty/genie/scripts/release.lua b/3rdparty/genie/scripts/release.lua index f3200916b1e..d1173d5f9e8 100644 --- a/3rdparty/genie/scripts/release.lua +++ b/3rdparty/genie/scripts/release.lua @@ -21,7 +21,7 @@ function dorelease() f = io.popen("git log --format=format:%H -1") local sha1 = f:read("*a") f:close() - io.output("../src/host/version.h") + io.output("src/host/version.h") io.write("#define VERSION " ..rev .. "\n") io.write("#define VERSION_STR \"version " ..rev .. " (commit " .. sha1 .. ")\"\n") io.close() |