diff options
| author | Dr. Chat <arkolbed@gmail.com> | 2018-05-15 16:52:13 -0500 |
|---|---|---|
| committer | Dr. Chat <arkolbed@gmail.com> | 2018-10-12 14:54:14 -0500 |
| commit | 7f9ed83844161c0ff0fb184dda34ead54dfd27f4 (patch) | |
| tree | 8b06b582677c848a8c34d0b8cf7264d6d8021e65 | |
| parent | ed5810e20531b859a09788af80a240d80387385e (diff) | |
[CI] Account for Qt binaries being placed in a different directory
| -rw-r--r-- | .appveyor.yml | 1 | ||||
| -rw-r--r-- | src/xenia/app/premake5.lua | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 239e12b1c..9f796bece 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -43,6 +43,7 @@ clone_folder: c:\dev\xenia # environment variables environment: + QT_BIN: C:\Qt\5.10.1\msvc2017_64\bin QT_DIR: C:\Qt\5.10.1-static\msvc2017_64 my_var2: value2 diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index a53f35172..30c3fbf21 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -44,6 +44,9 @@ project("xenia-app") qt.enable() qtmodules{"core", "gui", "widgets"} qtprefix "Qt5" + if os.getenv("QT_BIN") then + qtbinpath(os.getenv("QT_BIN")) + end configuration {"Debug"} qtsuffix "d" @@ -66,12 +69,9 @@ project("xenia-app") "*.qrc", }) filter("platforms:Windows") - files({ - "main_resources.rc", + resincludedirs({ + project_root, }) - resincludedirs({ - project_root, - }) filter("platforms:Linux") links({ |