[CI] Account for Qt binaries being placed in a different directory
This commit is contained in:
parent
ed5810e205
commit
7f9ed83844
|
@ -43,6 +43,7 @@ clone_folder: c:\dev\xenia
|
||||||
|
|
||||||
# environment variables
|
# environment variables
|
||||||
environment:
|
environment:
|
||||||
|
QT_BIN: C:\Qt\5.10.1\msvc2017_64\bin
|
||||||
QT_DIR: C:\Qt\5.10.1-static\msvc2017_64
|
QT_DIR: C:\Qt\5.10.1-static\msvc2017_64
|
||||||
my_var2: value2
|
my_var2: value2
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,9 @@ project("xenia-app")
|
||||||
qt.enable()
|
qt.enable()
|
||||||
qtmodules{"core", "gui", "widgets"}
|
qtmodules{"core", "gui", "widgets"}
|
||||||
qtprefix "Qt5"
|
qtprefix "Qt5"
|
||||||
|
if os.getenv("QT_BIN") then
|
||||||
|
qtbinpath(os.getenv("QT_BIN"))
|
||||||
|
end
|
||||||
|
|
||||||
configuration {"Debug"}
|
configuration {"Debug"}
|
||||||
qtsuffix "d"
|
qtsuffix "d"
|
||||||
|
@ -66,12 +69,9 @@ project("xenia-app")
|
||||||
"*.qrc",
|
"*.qrc",
|
||||||
})
|
})
|
||||||
filter("platforms:Windows")
|
filter("platforms:Windows")
|
||||||
files({
|
resincludedirs({
|
||||||
"main_resources.rc",
|
project_root,
|
||||||
})
|
})
|
||||||
resincludedirs({
|
|
||||||
project_root,
|
|
||||||
})
|
|
||||||
|
|
||||||
filter("platforms:Linux")
|
filter("platforms:Linux")
|
||||||
links({
|
links({
|
||||||
|
|
Loading…
Reference in New Issue