Merge pull request #369 from Blizzard/fix-scripts-c

Move scripts.c one up, so bootstrap.mak doesn't include it.
This commit is contained in:
Samuel Surtees 2015-12-18 15:16:26 +10:00
commit ae2e8e585e
3 changed files with 3 additions and 4 deletions

2
.gitignore vendored
View File

@ -12,7 +12,7 @@ modules
obj
release
ipch
src/host/scripts.c
src/scripts.c
**.lnt
**.vlstatus

View File

@ -117,7 +117,6 @@
{
"*.txt", "**.lua",
"src/**.h", "src/**.c",
"src/host/scripts.c"
}
excludes

View File

@ -99,7 +99,7 @@
buffered.writeln(result, "/* DO NOT EDIT - this file is autogenerated - see BUILD.txt */")
buffered.writeln(result, "/* To regenerate this file, run: premake5 embed */")
buffered.writeln(result, "")
buffered.writeln(result, '#include "premake.h"')
buffered.writeln(result, '#include "host/premake.h"')
buffered.writeln(result, "")
-- Find all of the _manifest.lua files within the project
@ -171,7 +171,7 @@
-- and only overwrite it if there are actual changes.
print("Writing...")
local scriptsFile = path.getabsolute(path.join(_SCRIPT_DIR, "../src/host/scripts.c"))
local scriptsFile = path.getabsolute(path.join(_SCRIPT_DIR, "../src/scripts.c"))
local output = buffered.tostring(result)
local f, err = os.writefile_ifnotequal(output, scriptsFile);