Revision 462:dc2226fa0795

View differences:

base.pro
51 51

  
52 52
for (file, SVCORE_SOURCES)   { SOURCES += $$sprintf("svcore/%1", $$file) }
53 53
for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
54
             
54
                     
55
win32-msvc* {
56
    SOURCES -= svcore/system/os-other.cpp
57
}
58

  
55 59
for (file, CLIENT_HEADERS) {
56 60
    HEADERS += $$sprintf("piper-vamp-cpp/vamp-client/qt/%1",  $$file)
57 61
}
deploy/win64/sonic-lineup.wxs.in
166 166
          </Component>
167 167

  
168 168
          <Component Win64="yes"
169
                     Id="OSWin10"
170
                     Transitive="yes"
171
                     Guid="7b9ce14e-62ba-446e-ad45-9642b3bc4188">
172
            <Condition>VersionNT64 &gt;= 603</Condition>
173
            <File
174
                Id="os_win10"
175
                Name="os.dll"
176
                Source="release\os.dll"
177
                KeyPath="yes"/>
178
          </Component>
179

  
180
          <Component Win64="yes"
181
                     Id="OSOther"
182
                     Transitive="yes"
183
                     Guid="4419cc33-2a69-437e-8466-98f9104d01e9">
184
            <Condition>NOT (VersionNT64 &gt;= 603)</Condition>
185
            <File
186
                Id="os_other"
187
                Name="os.dll"
188
                Source="release\os_other.dll"
189
                KeyPath="yes"/>
190
          </Component>
191

  
192
          <Component Win64="yes"
169 193
               Id="VCRuntime"
170 194
               Guid="f212288f-e5a4-4fc2-b951-1396f61bc562">
171 195

  
......
284 308
	Level="1">
285 309
      <ComponentRef Id="MainExecutable"/>
286 310
      <ComponentRef Id="Plugins"/>
311
      <ComponentRef Id="OSWin10"/>
312
      <ComponentRef Id="OSOther"/>
287 313
      <ComponentRef Id="Qt5"/>
288 314
      <ComponentRef Id="Sndfile"/>
289 315
      <ComponentRef Id="OpenSSL"/>
noconfig.pri
117 117
    DEFINES -= HAVE_LIBLO
118 118
    LIBS -= -llo
119 119
    
120
    LIBS += -lWindowsApp -lmfplat -lmfreadwrite -lmfuuid -lpropsys -ladvapi32 -lwinmm -lws2_32
120
    LIBS += -lmfplat -lmfreadwrite -lmfuuid -lpropsys -ladvapi32 -lwinmm -lws2_32
121 121
}
122 122

  
123 123
macx* {
os-other.pro
1

  
2
TEMPLATE = lib
3

  
4
exists(config.pri) {
5
    include(config.pri)
6
}
7

  
8
!exists(config.pri) {
9
    include(noconfig.pri)
10
}
11

  
12
CONFIG -= qt
13
CONFIG += plugin no_plugin_name_prefix release warn_on
14

  
15
TARGET = os_other
16

  
17
OBJECTS_DIR = o
18

  
19
win32-msvc* {
20
    LIBS += -EXPORT:OSReportsDarkThemeActive -EXPORT:OSQueryAccentColour
21
}
22

  
23
SOURCES += \
24
    svcore/system/os-other.cpp
25

  
os-win10.pro
1

  
2
TEMPLATE = lib
3

  
4
exists(config.pri) {
5
    include(config.pri)
6
}
7

  
8
!exists(config.pri) {
9
    include(noconfig.pri)
10
}
11

  
12
CONFIG -= qt
13
CONFIG += plugin no_plugin_name_prefix release warn_on
14

  
15
TARGET = os
16

  
17
OBJECTS_DIR = o
18

  
19
win32-msvc* {
20
    LIBS += -EXPORT:OSReportsDarkThemeActive -EXPORT:OSQueryAccentColour
21
    LIBS += -lWindowsApp
22
}
23

  
24
SOURCES += \
25
    svcore/system/os-win10.cpp
26

  
repoint-lock.json
4 4
      "pin": "0e32c328b02a"
5 5
    },
6 6
    "svcore": {
7
      "pin": "38be2fa29efd"
7
      "pin": "bdab3a921d5d"
8 8
    },
9 9
    "svgui": {
10
      "pin": "911330a28a7c"
10
      "pin": "cbbb411da977"
11 11
    },
12 12
    "svapp": {
13 13
      "pin": "4d10365aa6a9"
vectapp.pro
83 83
        main/PreferencesDialog.cpp \
84 84
        main/SmallSession.cpp
85 85

  
86
win32-msvc* {
87
    LIBS += -los
88
}
89

  
86 90
macx* {
87 91
    QMAKE_POST_LINK += cp checker/vamp-plugin-load-checker . && deploy/osx/deploy.sh $$shell_quote(Sonic Lineup)
88 92
}

Also available in: Unified diff