diff --git a/.gitignore b/.gitignore index 66cc3e3..83a7908 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ Makefile* installer/*.exe *.user* build_scripts/win/__pycache__ -build_scripts/win/current_build.bat \ No newline at end of file +build_scripts/win/current_build.bat +AdvancedSettings_resource.rc diff --git a/advancedSettings.pro b/advancedSettings.pro index 2d4e754..d53dd70 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -5,6 +5,11 @@ DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE VERSION = "$$cat($$PWD/build_scripts/compile_version_string.txt)" DEFINES += APPLICATION_VERSION=\\\"$$VERSION\\\" +# Qmake can't handle non-integers in the version string, +# so we take out anything after the dash. +SPLIT_VERSION_STRING = $$split(VERSION, -) +NUMERICAL_VERSION_NUMBER = $$member(SPLIT_VERSION_STRING, 0, 0) +VERSION = $$NUMERICAL_VERSION_NUMBER lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5.12 or higher") lessThan(QT_MINOR_VERSION, 12): error("requires Qt 5.12 or higher") diff --git a/build_scripts/qt/resources.pri b/build_scripts/qt/resources.pri index f0c32c9..7cf19f4 100644 --- a/build_scripts/qt/resources.pri +++ b/build_scripts/qt/resources.pri @@ -47,4 +47,4 @@ DISTFILES += \ src/res/qml/desktop_overlay_page/translation_back_forwards/SteamDesktopTranslationBackForwards.qml \ src/res/qml/desktop_overlay_page/translation_up_down/SteamDesktopTranslationUpDown.qml \ -RC_FILE = src/res/icon.rc +win32:RC_ICONS += src/res/img/icons/advicon256px.ico diff --git a/src/res/icon.rc b/src/res/icon.rc deleted file mode 100644 index c1f36c5..0000000 --- a/src/res/icon.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "img/icons/advicon256px.ico" \ No newline at end of file