flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 20:40:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix version number embedding in Windows EXE and DLL files

Browse Source 
Remove our Windows resource files (*.rc)
and let qmake generate them instead.
This commit is contained in:
Mat Sutcliffe
2019-10-31 14:33:44 +00:00
parent f056d4fcd6
commit bb65506d22
9 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mkspecs/features/version.pri
View File

@@ -16,16 +16,17 @@ defineReplace(gitRevCount) {
setSwiftConfig(version.full, $$swiftConfig(version.major).$$swiftConfig(version.minor).$$swiftConfig(version.micro)) setSwiftConfig(version.full, $$swiftConfig(version.major).$$swiftConfig(version.minor).$$swiftConfig(version.micro))
!win32 { VER_MAJ = $$swiftConfig(version.major)
VER_MAJ = $$swiftConfig(version.major) VER_MIN = $$swiftConfig(version.minor)
VER_MIN = $$swiftConfig(version.minor) VER_PAT = $$swiftConfig(version.micro)
VER_PAT = $$swiftConfig(version.micro) VERSION = $$swiftConfig(version.full)
VERSION = $$swiftConfig(version.full)
}
!isEmpty(GIT_BIN) { !isEmpty(GIT_BIN) {
isEmpty(VER_REV) { isEmpty(VER_REV) {
VER_REV = $$gitRevCount() VER_REV = $$gitRevCount()
cache(VER_REV) cache(VER_REV)
} }
win32: VERSION = $${VERSION}.$${VER_REV}
} }
win32: CONFIG *= skip_target_version_ext

5
src/swiftcore/swiftcore.pro
View File

@@ -17,9 +17,8 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
OTHER_FILES += *.qss *.ico *.rc *.icns OTHER_FILES += *.qss *.ico *.icns
RC_FILE = swiftcore.rc RC_ICONS = swiftcore.ico
DISTFILES += swiftcore.rc
ICON = swiftcore.icns ICON = swiftcore.icns
DESTDIR = $$DestRoot/bin DESTDIR = $$DestRoot/bin

1
src/swiftcore/swiftcore.rc
View File

@@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "swiftcore.ico"

5
src/swiftdata/swiftdata.pro
View File

@@ -18,9 +18,8 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
OTHER_FILES += *.qss *.ico *.rc *.icns OTHER_FILES += *.qss *.ico *.icns
RC_FILE = swiftdata.rc RC_ICONS = swiftdata.ico
DISTFILES += swiftdata.rc
ICON = swiftdata.icns ICON = swiftdata.icns
DESTDIR = $$DestRoot/bin DESTDIR = $$DestRoot/bin

1
src/swiftdata/swiftdata.rc
View File

@@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "swiftdata.ico"

1
src/swiftguistandard/swift.rc
View File

@@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "swift.ico"

5
src/swiftguistandard/swiftguistandard.pro
View File

@@ -18,9 +18,8 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
OTHER_FILES += *.qss *.ico *.rc *.icns OTHER_FILES += *.qss *.ico *.icns
RC_FILE = swift.rc RC_ICONS = swift.ico
DISTFILES += swift.rc
ICON = swift.icns ICON = swift.icns
DESTDIR = $$DestRoot/bin DESTDIR = $$DestRoot/bin

5
src/swiftlauncher/swiftlauncher.pro
View File

@@ -18,10 +18,9 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
INCLUDEPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src
OTHER_FILES += *.qss *.ico *.rc *.icns OTHER_FILES += *.qss *.ico *.icns
RESOURCES += swiftlauncher.qrc RESOURCES += swiftlauncher.qrc
RC_FILE = swiftlauncher.rc RC_ICONS = swiftlauncher.ico
DISTFILES += swiftlauncher.rc
ICON = swiftlauncher.icns ICON = swiftlauncher.icns
DESTDIR = $$DestRoot/bin DESTDIR = $$DestRoot/bin

1
src/swiftlauncher/swiftlauncher.rc
View File

@@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "swiftlauncher.ico"