Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 12:53:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

set GIT_VERSION only where it is used (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-04-21 15:44:46 +02:00
parent f5aa86dfc6
commit 0d980951c9
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/genie.lua
View File

@ -520,17 +520,6 @@ if (_OPTIONS["SOURCES"] == nil) then
dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
end end
if _OPTIONS["IGNORE_GIT"]~="1" then
GIT_VERSION = backtick( "git describe" )
local p = string.find(GIT_VERSION, '-', 1)
if (p~=nil) then
defines {
"GIT_VERSION=" .. string.sub(GIT_VERSION,p+1)
}
end
end
configuration { "gmake" } configuration { "gmake" }
flags { flags {
"SingleOutputDir", "SingleOutputDir",

12
scripts/src/main.lua
View File

@ -136,7 +136,17 @@ end
end end
configuration { } configuration { }
if _OPTIONS["IGNORE_GIT"]~="1" then
GIT_VERSION = backtick( "git describe --dirty" )
local p = string.find(GIT_VERSION, '-', 1)
if (p~=nil) then
defines {
"GIT_VERSION=" .. string.sub(GIT_VERSION,p+1)
}
end
end
if _OPTIONS["targetos"]=="android" then if _OPTIONS["targetos"]=="android" then
includedirs { includedirs {
MAME_DIR .. "3rdparty/SDL2/include", MAME_DIR .. "3rdparty/SDL2/include",