Merge pull request #202 from wallyweek/sdlinipath

Added new SDL_INI_PATH flag [Cesare Falco]
This commit is contained in:
Miodrag Milanović 2015-06-07 06:22:12 +02:00
commit a208071e9d
3 changed files with 15 additions and 0 deletions

View File

@ -27,6 +27,7 @@
# USE_DISPATCH_GL = 0
# DIRECTINPUT = 7
# USE_SDL = 1
# SDL_INI_PATH = .;$HOME/.mame/;ini;
# SDL2_MULTIAPI = 1
# NO_USE_MIDI = 1
# DONT_USE_NETWORK = 1
@ -504,6 +505,10 @@ ifdef USE_SDL
PARAMS += --USE_SDL='$(USE_SDL)'
endif
ifdef SDL_INI_PATH
PARAMS += --SDL_INI_PATH='$(SDL_INI_PATH)'
endif
ifdef CYGWIN_BUILD
PARAMS += --CYGWIN_BUILD='$(CYGWIN_BUILD)'
endif

View File

@ -101,6 +101,11 @@ newoption {
description = "link against specific GL-Library - also adds rpath to executable (overridden by USE_DISPATCH_GL)",
}
newoption {
trigger = "SDL_INI_PATH",
description = "Default search path for .ini files",
}
newoption {
trigger = "NO_X11",
description = "Disable use of X11",

View File

@ -18,6 +18,11 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[
}
end
if _OPTIONS["SDL_INI_PATH"]~=nil then
defines {
"'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
}
end
if _OPTIONS["NO_X11"]=="1" then
defines {