From 1ea04c4eb6a89be4f87e974665587c365e196e29 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 1 Apr 2015 12:07:12 +1100 Subject: [PATCH] Build Qt debugger on OSX if requested --- scripts/src/osd/modules.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 588af418b8e..41408e46156 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -101,16 +101,16 @@ function osdmodulesbuild() if _OPTIONS["targetos"]=="windows" then configuration { "mingw*" } buildoptions { - "-I$(shell qmake -query QT_INSTALL_HEADERS)/QtCore", - "-I$(shell qmake -query QT_INSTALL_HEADERS)/QtGui", "-I$(shell qmake -query QT_INSTALL_HEADERS)", } configuration { } elseif _OPTIONS["targetos"]=="macosx" then - -- TODO: search path for Qt on OSX platform + buildoptions { + "-F" .. string.gsub(os.outputof("qmake -query QT_INSTALL_LIBS"), '[\r\n]+', ''), + } else buildoptions { - string.gsub(os.outputof("pkg-config --cflags QtGui"), '[\r\n]+', ' '), + string.gsub(os.outputof("pkg-config --cflags Qt"), '[\r\n]+', ' '), } end else @@ -166,7 +166,13 @@ function osdmodulestargetconf() "QtCore4", } elseif _OPTIONS["targetos"]=="macosx" then - -- TODO: Qt libs for OSX platform + linkoptions { + "-F" .. string.gsub(os.outputof("qmake -query QT_INSTALL_LIBS"), '[\r\n]+', ''), + } + links { + "QtCore.framework", + "QtGui.framework", + } else linkoptions { string.gsub(os.outputof("pkg-config --libs QtGui"), '[\r\n]+', ' '),