diff options
author | 2015-08-01 20:41:27 +0200 | |
---|---|---|
committer | 2015-08-01 20:43:47 +0200 | |
commit | 9485ca9d43dcab732325e4ba16194153ea293d4b (patch) | |
tree | 5fb55315d4a4f3c001ecbdcf3b877d20ad60f2a6 /scripts/src | |
parent | c9174e36897ccb723de18cb0361557629caba912 (diff) |
Revert "debugqt: Port to Qt5 [O. Galibert]"
Experience shows it's too early for that. I'll keep that in a corner
and we'll see again later.
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/osd/modules.lua | 21 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 7 |
2 files changed, 15 insertions, 13 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index a356986bbab..bf6897a2585 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -142,7 +142,7 @@ function osdmodulesbuild() end MOC = _OPTIONS["QT_HOME"] .. "/bin/moc" else - MOCTST = backtick("which moc-qt5 2>/dev/null") + MOCTST = backtick("which moc-qt4 2>/dev/null") if (MOCTST=='') then MOCTST = backtick("which moc 2>/dev/null") end @@ -185,7 +185,7 @@ function osdmodulesbuild() } else buildoptions { - backtick("pkg-config --cflags Qt5Widgets"), + backtick("pkg-config --cflags QtGui"), } end end @@ -237,18 +237,16 @@ function osdmodulestargetconf() } links { "qtmain", - "Qt5Core", - "Qt5Gui", - "Qt5Widgets", + "QtGui4", + "QtCore4", } elseif _OPTIONS["targetos"]=="macosx" then linkoptions { "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), } links { - "Qt5Core.framework", - "Qt5Gui.framework", - "Qt5Widgets.framework", + "QtCore.framework", + "QtGui.framework", } else if _OPTIONS["QT_HOME"]~=nil then @@ -256,12 +254,11 @@ function osdmodulestargetconf() "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), } links { - "Qt5Core", - "Qt5Gui", - "Qt5Widgets", + "QtGui", + "QtCore", } else - local str = backtick("pkg-config --libs Qt5Widgets") + local str = backtick("pkg-config --libs QtGui") addlibfromstring(str) addoptionsfromstring(str) end diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index f97548d06c2..a204201d6f5 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -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 { @@ -125,7 +130,7 @@ elseif _OPTIONS["targetos"]=="linux" then } else buildoptions { - backtick("pkg-config --cflags Qt5Widgets"), + backtick("pkg-config --cflags QtGui"), } end elseif _OPTIONS["targetos"]=="macosx" then |