diff options
-rw-r--r-- | CHANGES.txt | 7 | ||||
-rw-r--r-- | premake4.lua | 2 | ||||
-rw-r--r-- | src/host/os_getcwd.c | 8 | ||||
-rw-r--r-- | src/premake.lua | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 1f3250a..a461dd4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,11 +4,12 @@ This version is a complete rewrite of Premake. -- New, more readable and extensible syntax for projects +- A new, more readable and extensible syntax for projects - More robust syntax validation -- Better validation of command-line arguments +- A new command-line format, with better argument validation - Improved path handling across all project settings -- Upgraded to Lua 5.1.2 +- Upgraded to Lua 5.1.4 +- Many, many bug fixes ----- diff --git a/premake4.lua b/premake4.lua index 1c922d5..71851e9 100644 --- a/premake4.lua +++ b/premake4.lua @@ -38,7 +38,7 @@ end targetname "premake4" language "C" kind "ConsoleApp" - flags { "No64BitChecks", "ExtraWarnings", "FatalWarnings" } + flags { "No64BitChecks", "ExtraWarnings" } includedirs { "src/host/lua-5.1.4/src" } location ( _OPTIONS["to"] ) diff --git a/src/host/os_getcwd.c b/src/host/os_getcwd.c index 0dc5538..06c91a2 100644 --- a/src/host/os_getcwd.c +++ b/src/host/os_getcwd.c @@ -10,13 +10,17 @@ int os_getcwd(lua_State* L) { char buffer[0x4000]; char* ch; + int result; #if PLATFORM_WINDOWS - GetCurrentDirectory(0x4000, buffer); + result = (GetCurrentDirectory(0x4000, buffer) != 0); #else - getcwd(buffer, 0x4000); + result = (getcwd(buffer, 0x4000) != 0); #endif + if (!result) + return 0; + /* convert to platform-neutral directory separators */ for (ch = buffer; *ch != '\0'; ++ch) { diff --git a/src/premake.lua b/src/premake.lua index 4f8ec97..34b4647 100644 --- a/src/premake.lua +++ b/src/premake.lua @@ -8,8 +8,7 @@ package.kind = "exe" package.buildflags = { "no-64bit-checks", - "extra-warnings", - "fatal-warnings" + "extra-warnings" } package.config["Debug"].defines = |