From 170007e7515aa19afd6eebe358644c2ba05f1fe5 Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Tue, 22 May 2018 13:00:04 -0500 Subject: [PATCH] [Qt] Handle nil qt.defaultpath --- src/xenia/app/premake5.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index 490e7efd2..ff44ccb5f 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -43,11 +43,13 @@ project("xenia-app") -- Setup Qt libraries qt.enable() qtmodules{"core", "gui", "widgets"} - qtpath(qt.defaultpath) qtprefix "Qt5" configuration {"Checked"} - qtsuffix "d" + qtsuffix "d" configuration {} + if qt.defaultpath ~= nil then + qtpath(qt.defaultpath) + end -- Qt static configuration (if necessary). Used by AppVeyor. if os.getenv("QT_STATIC") then @@ -160,6 +162,6 @@ project("xenia-app") "1>scratch/stdout.txt", }) debugenvs({ - "PATH=" .. qt.defaultpath .. "/bin", + "PATH=%{cfg.qtpath}/bin", }) end