Mercurial > hg > sonic-lineup

changeset 462:dc2226fa0795

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Duplicate the Win7 compatibility tweaks from recent commits in SV
author Chris Cannam
date Tue, 21 Jul 2020 16:28:29 +0100
parents 222438591c24
children 43a35652aaeb 94881fc47c4d
files base.pro deploy/win64/sonic-lineup.wxs.in noconfig.pri os-other.pro os-win10.pro repoint-lock.json vectapp.pro
diffstat 7 files changed, 89 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/base.pro	Fri Jul 17 18:16:20 2020 +0100
+++ b/base.pro	Tue Jul 21 16:28:29 2020 +0100
@@ -51,7 +51,11 @@
 
 for (file, SVCORE_SOURCES)   { SOURCES += $$sprintf("svcore/%1", $$file) }
 for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
-             
+                     
+win32-msvc* {
+    SOURCES -= svcore/system/os-other.cpp
+}
+
 for (file, CLIENT_HEADERS) {
     HEADERS += $$sprintf("piper-vamp-cpp/vamp-client/qt/%1",  $$file)
 }
--- a/deploy/win64/sonic-lineup.wxs.in	Fri Jul 17 18:16:20 2020 +0100
+++ b/deploy/win64/sonic-lineup.wxs.in	Tue Jul 21 16:28:29 2020 +0100
@@ -166,6 +166,30 @@
           </Component>
 
           <Component Win64="yes"
+                     Id="OSWin10"
+                     Transitive="yes"
+                     Guid="7b9ce14e-62ba-446e-ad45-9642b3bc4188">
+            <Condition>VersionNT64 &gt;= 603</Condition>
+            <File
+                Id="os_win10"
+                Name="os.dll"
+                Source="release\os.dll"
+                KeyPath="yes"/>
+          </Component>
+
+          <Component Win64="yes"
+                     Id="OSOther"
+                     Transitive="yes"
+                     Guid="4419cc33-2a69-437e-8466-98f9104d01e9">
+            <Condition>NOT (VersionNT64 &gt;= 603)</Condition>
+            <File
+                Id="os_other"
+                Name="os.dll"
+                Source="release\os_other.dll"
+                KeyPath="yes"/>
+          </Component>
+
+          <Component Win64="yes"
                Id="VCRuntime"
                Guid="f212288f-e5a4-4fc2-b951-1396f61bc562">
 
@@ -284,6 +308,8 @@
 	Level="1">
       <ComponentRef Id="MainExecutable"/>
       <ComponentRef Id="Plugins"/>
+      <ComponentRef Id="OSWin10"/>
+      <ComponentRef Id="OSOther"/>
       <ComponentRef Id="Qt5"/>
       <ComponentRef Id="Sndfile"/>
       <ComponentRef Id="OpenSSL"/>
--- a/noconfig.pri	Fri Jul 17 18:16:20 2020 +0100
+++ b/noconfig.pri	Tue Jul 21 16:28:29 2020 +0100
@@ -117,7 +117,7 @@
     DEFINES -= HAVE_LIBLO
     LIBS -= -llo
     
-    LIBS += -lWindowsApp -lmfplat -lmfreadwrite -lmfuuid -lpropsys -ladvapi32 -lwinmm -lws2_32
+    LIBS += -lmfplat -lmfreadwrite -lmfuuid -lpropsys -ladvapi32 -lwinmm -lws2_32
 }
 
 macx* {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/os-other.pro	Tue Jul 21 16:28:29 2020 +0100
@@ -0,0 +1,25 @@
+
+TEMPLATE = lib
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+CONFIG -= qt
+CONFIG += plugin no_plugin_name_prefix release warn_on
+
+TARGET = os_other
+
+OBJECTS_DIR = o
+
+win32-msvc* {
+    LIBS += -EXPORT:OSReportsDarkThemeActive -EXPORT:OSQueryAccentColour
+}
+
+SOURCES += \
+    svcore/system/os-other.cpp
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/os-win10.pro	Tue Jul 21 16:28:29 2020 +0100
@@ -0,0 +1,26 @@
+
+TEMPLATE = lib
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+CONFIG -= qt
+CONFIG += plugin no_plugin_name_prefix release warn_on
+
+TARGET = os
+
+OBJECTS_DIR = o
+
+win32-msvc* {
+    LIBS += -EXPORT:OSReportsDarkThemeActive -EXPORT:OSQueryAccentColour
+    LIBS += -lWindowsApp
+}
+
+SOURCES += \
+    svcore/system/os-win10.cpp
+
--- a/repoint-lock.json	Fri Jul 17 18:16:20 2020 +0100
+++ b/repoint-lock.json	Tue Jul 21 16:28:29 2020 +0100
@@ -4,10 +4,10 @@
       "pin": "0e32c328b02a"
     },
     "svcore": {
-      "pin": "38be2fa29efd"
+      "pin": "bdab3a921d5d"
     },
     "svgui": {
-      "pin": "911330a28a7c"
+      "pin": "cbbb411da977"
     },
     "svapp": {
       "pin": "4d10365aa6a9"
--- a/vectapp.pro	Fri Jul 17 18:16:20 2020 +0100
+++ b/vectapp.pro	Tue Jul 21 16:28:29 2020 +0100
@@ -83,6 +83,10 @@
         main/PreferencesDialog.cpp \
         main/SmallSession.cpp
 
+win32-msvc* {
+    LIBS += -los
+}
+
 macx* {
     QMAKE_POST_LINK += cp checker/vamp-plugin-load-checker . && deploy/osx/deploy.sh $$shell_quote(Sonic Lineup)
 }