diff options
author | 2016-06-29 20:24:44 +1000 | |
---|---|---|
committer | 2016-06-29 20:24:44 +1000 | |
commit | d464963202d6fac34b687f232a42a1d3353630c2 (patch) | |
tree | e4281c2e2b2832b005ca866db5f901f28e507139 /docs/release/scripts/src/osd/sdl.lua | |
parent | afef8430619718d39dd7906a9342fe3bd06b6225 (diff) |
0.175 Release fileshbmame175
Diffstat (limited to 'docs/release/scripts/src/osd/sdl.lua')
-rw-r--r-- | docs/release/scripts/src/osd/sdl.lua | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index d1a83229698..4094e48c6be 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -239,7 +239,7 @@ elseif _OPTIONS["targetos"]=="macosx" then SDL_NETWORK = "pcap" end -if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then +if _OPTIONS["with-bundled-sdl2"]~=nil then includedirs { GEN_DIR .. "includes", } @@ -295,10 +295,12 @@ if BASE_TARGETOS=="unix" then "/usr/openwin/lib", } end - if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then - links { - "SDL2", - } + if _OPTIONS["with-bundled-sdl2"]~=nil then + if _OPTIONS["targetos"]~="android" then + links { + "SDL2", + } + end else local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) @@ -459,7 +461,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", - MAME_DIR .. "src/osd/sdl/sdldir.cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp", @@ -468,6 +469,7 @@ project ("ocore_" .. _OPTIONS["osd"]) if BASE_TARGETOS=="unix" then files { + MAME_DIR .. "src/osd/modules/file/posixdir.cpp", MAME_DIR .. "src/osd/modules/file/posixfile.cpp", MAME_DIR .. "src/osd/modules/file/posixfile.h", MAME_DIR .. "src/osd/modules/file/posixptty.cpp", @@ -478,6 +480,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows", } files { + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", |