diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/osd/sdl.lua | 40 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 4 |
2 files changed, 24 insertions, 20 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index e3ccd96d7b7..1942f70bc73 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -2,27 +2,31 @@ function maintargetosdoptions(_target) if _OPTIONS["targetos"]=="windows" then linkoptions{ "-municode", - "-L$(shell qmake -query QT_INSTALL_LIBS)", - } - - links { - "qtmain", - "QtGui4", - "QtCore4", } + if (USE_QT == 1) then + linkoptions{ + "-L$(shell qmake -query QT_INSTALL_LIBS)", + } + links { + "qtmain", + "QtGui4", + "QtCore4", + } + end end - if _OPTIONS["targetos"]=="linux" then - links { - 'QtGui', - 'QtCore', - } - - linkoptions { - '$(shell pkg-config --libs QtGui)', - } + if (USE_QT == 1) then + links { + "QtGui", + "QtCore", + } + + linkoptions { + "$(shell pkg-config --libs QtGui)", + } + end end - + configuration { "mingw*" or "vs*" } targetprefix "sdl" @@ -116,7 +120,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c", } - if not (_OPTIONS["targetos"]=="macosx") then + if (USE_QT == 1) then files { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.c", MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.c", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 600e19035b6..a405ee2131e 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -11,7 +11,7 @@ if _OPTIONS["targetos"]=="windows" then "SDLMAME_SDL2=1", "USE_XINPUT=0", "USE_OPENGL=1", - "USE_QTDEBUG=1", + "USE_QTDEBUG=" .. USE_QT, "SDLMAME_NET_PCAP", "main=utf8_main", } @@ -31,7 +31,7 @@ if _OPTIONS["targetos"]=="linux" then "SDLMAME_SDL2=1", "USE_XINPUT=0", "USE_OPENGL=1", - "USE_QTDEBUG=1", + "USE_QTDEBUG=" .. USE_QT, "SDLMAME_NET_TAPTUN", } |