summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2015-12-27 12:58:00 +0100
committer Olivier Galibert <galibert@pobox.com>2015-12-27 12:58:00 +0100
commit9d231a83ad8c2d76145ad3bfadd2eb5fa949d769 (patch)
treeced8f24d8cc9742115409cfbee5b8a7f92335a94 /scripts
parent2a2cd129f26167fa816ed802f30b032e3a829411 (diff)
qt5 debugger port [O. Galibert]
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/osd/modules.lua21
-rw-r--r--scripts/src/osd/sdl_cfg.lua7
2 files changed, 13 insertions, 15 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 6aa1af33234..3fc89424e6d 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -188,7 +188,7 @@ function qtdebuggerbuild()
end
MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
else
- MOCTST = backtick("which moc-qt4 2>/dev/null")
+ MOCTST = backtick("which moc-qt5 2>/dev/null")
if (MOCTST=='') then
MOCTST = backtick("which moc 2>/dev/null")
end
@@ -231,7 +231,7 @@ function qtdebuggerbuild()
}
else
buildoptions {
- backtick("pkg-config --cflags QtGui"),
+ backtick("pkg-config --cflags Qt5Widgets"),
}
end
end
@@ -283,16 +283,18 @@ function osdmodulestargetconf()
}
links {
"qtmain",
- "QtGui4",
- "QtCore4",
+ "Qt5Core",
+ "Qt5Gui",
+ "Qt5Widgets",
}
elseif _OPTIONS["targetos"]=="macosx" then
linkoptions {
"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
}
links {
- "QtCore.framework",
- "QtGui.framework",
+ "Qt5Core.framework",
+ "Qt5Gui.framework",
+ "Qt5Widgets.framework",
}
else
if _OPTIONS["QT_HOME"]~=nil then
@@ -300,11 +302,12 @@ function osdmodulestargetconf()
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
}
links {
- "QtGui",
- "QtCore",
+ "Qt5Core",
+ "Qt5Gui",
+ "Qt5Widgets",
}
else
- local str = backtick("pkg-config --libs QtGui")
+ local str = backtick("pkg-config --libs Qt5Widgets")
addlibfromstring(str)
addoptionsfromstring(str)
end
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 878a5a2f945..adcc67dccde 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -18,11 +18,6 @@ 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 {
@@ -130,7 +125,7 @@ elseif _OPTIONS["targetos"]=="linux" then
}
else
buildoptions {
- backtick("pkg-config --cflags QtGui"),
+ backtick("pkg-config --cflags Qt5Widgets"),
}
end
elseif _OPTIONS["targetos"]=="macosx" then