[CI] (Hopefully) working static Qt
This commit is contained in:
parent
71b623053b
commit
7dc644dc22
|
@ -41,11 +41,14 @@ init:
|
||||||
# clone directory
|
# clone directory
|
||||||
clone_folder: c:\dev\xenia
|
clone_folder: c:\dev\xenia
|
||||||
|
|
||||||
|
# build cache
|
||||||
|
cache:
|
||||||
|
- C:\Qt\5.10.1\msvc2017_64-static -> .appveyor.yml
|
||||||
|
|
||||||
# environment variables
|
# environment variables
|
||||||
environment:
|
environment:
|
||||||
QT_DIR: C:\Qt\5.10.1\msvc2017_64
|
QT_DIR: C:\Qt\5.10.1\msvc2017_64-static
|
||||||
QT_LIB: C:\Qt\5.10.1-static\msvc2017_64\lib
|
QT_STATIC: 1
|
||||||
my_var2: value2
|
|
||||||
|
|
||||||
# build cache to preserve files/folders between builds
|
# build cache to preserve files/folders between builds
|
||||||
#cache:
|
#cache:
|
||||||
|
@ -53,6 +56,11 @@ environment:
|
||||||
# scripts that run after cloning repository
|
# scripts that run after cloning repository
|
||||||
install:
|
install:
|
||||||
- cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
|
- cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
|
||||||
|
- ps: |
|
||||||
|
if (!(Test-Path $env:QT_DIR -PathType Container)) {
|
||||||
|
Invoke-WebRequest $env:QT_S3 -OutFile C:\Qt\5.10.1\msvc2017_64-static.7z
|
||||||
|
7z x C:\Qt\5.10.1\msvc2017_64-static.7z -oc:\Qt\5.10.1
|
||||||
|
}
|
||||||
- cmd: xb.bat setup
|
- cmd: xb.bat setup
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -43,15 +43,59 @@ project("xenia-app")
|
||||||
-- Setup Qt libraries
|
-- Setup Qt libraries
|
||||||
qt.enable()
|
qt.enable()
|
||||||
qtmodules{"core", "gui", "widgets"}
|
qtmodules{"core", "gui", "widgets"}
|
||||||
|
qtpath(qt.defaultpath)
|
||||||
qtprefix "Qt5"
|
qtprefix "Qt5"
|
||||||
if os.getenv("QT_LIB") then
|
configuration {"Checked"}
|
||||||
qtlibpath(os.getenv("QT_LIB"))
|
|
||||||
end
|
|
||||||
|
|
||||||
configuration {"Debug"}
|
|
||||||
qtsuffix "d"
|
qtsuffix "d"
|
||||||
configuration {}
|
configuration {}
|
||||||
|
|
||||||
|
-- Qt static configuration (if necessary). Used by AppVeyor.
|
||||||
|
if os.getenv("QT_STATIC") then
|
||||||
|
qt.modules["AccessibilitySupport"] = {
|
||||||
|
name = "AccessibilitySupport",
|
||||||
|
include = "QtAccessibilitySupport",
|
||||||
|
}
|
||||||
|
qt.modules["EventDispatcherSupport"] = {
|
||||||
|
name = "EventDispatcherSupport",
|
||||||
|
include = "QtEventDispatcherSupport",
|
||||||
|
}
|
||||||
|
qt.modules["FontDatabaseSupport"] = {
|
||||||
|
name = "FontDatabaseSupport",
|
||||||
|
include = "QtFontDatabaseSupport",
|
||||||
|
}
|
||||||
|
qt.modules["ThemeSupport"] = {
|
||||||
|
name = "ThemeSupport",
|
||||||
|
include = "QtThemeSupport",
|
||||||
|
}
|
||||||
|
qt.modules["VulkanSupport"] = {
|
||||||
|
name = "VulkanSupport",
|
||||||
|
include = "QtVulkanSupport",
|
||||||
|
}
|
||||||
|
|
||||||
|
links({
|
||||||
|
"qtmain",
|
||||||
|
"qtfreetype",
|
||||||
|
"qtlibpng",
|
||||||
|
"qtpcre2",
|
||||||
|
"qtharfbuzz",
|
||||||
|
})
|
||||||
|
qtmodules{"AccessibilitySupport", "EventDispatcherSupport", "FontDatabaseSupport", "ThemeSupport", "VulkanSupport"}
|
||||||
|
libdirs("%{cfg.qtpath}/plugins/platforms")
|
||||||
|
|
||||||
|
filter("platforms:Windows")
|
||||||
|
-- Qt dependencies
|
||||||
|
links({
|
||||||
|
"dwmapi",
|
||||||
|
"version",
|
||||||
|
"imm32",
|
||||||
|
"winmm",
|
||||||
|
"netapi32",
|
||||||
|
"userenv",
|
||||||
|
"qwindows",
|
||||||
|
})
|
||||||
|
filter()
|
||||||
|
end
|
||||||
|
|
||||||
flags({
|
flags({
|
||||||
"WinMain", -- Use WinMain instead of main.
|
"WinMain", -- Use WinMain instead of main.
|
||||||
})
|
})
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include "xenia/base/debugging.h"
|
#include "xenia/base/debugging.h"
|
||||||
#include "xenia/base/logging.h"
|
#include "xenia/base/logging.h"
|
||||||
#include "xenia/base/main.h"
|
#include "xenia/base/main.h"
|
||||||
|
#include "xenia/base/platform.h"
|
||||||
#include "xenia/base/profiling.h"
|
#include "xenia/base/profiling.h"
|
||||||
#include "xenia/base/threading.h"
|
#include "xenia/base/threading.h"
|
||||||
#include "xenia/vfs/devices/host_path_device.h"
|
#include "xenia/vfs/devices/host_path_device.h"
|
||||||
|
@ -19,6 +20,11 @@
|
||||||
#include "xenia/app/emulator_window.h"
|
#include "xenia/app/emulator_window.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
#include <QtPlugin>
|
||||||
|
|
||||||
|
#if XE_PLATFORM_WIN32
|
||||||
|
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
|
||||||
|
#endif
|
||||||
|
|
||||||
DEFINE_bool(mount_scratch, false, "Enable scratch mount");
|
DEFINE_bool(mount_scratch, false, "Enable scratch mount");
|
||||||
DEFINE_bool(mount_cache, false, "Enable cache mount");
|
DEFINE_bool(mount_cache, false, "Enable cache mount");
|
||||||
|
|
Loading…
Reference in New Issue