Revision 361:fe0e9a1ffeda

View differences:

.appveyor.yml
1 1 

  		




  2
  2
  
    
image:


  		




  3
  
  
    
  - Visual Studio 2017


  		




  
  3
  
    
  - Visual Studio 2019


  		




  4
  4
  
    

  		




  5
  5
  
    
configuration:


  		




  6
  6
  
    
  - Release


  		












  

    
      deploy/win64/build-64.bat
    
  





  7
  7
  
    

  		




  8
  8
  
    
set QTDIR=C:\Qt\5.13.1\msvc2017_64


  		




  9
  9
  
    
if not exist %QTDIR% (


  		




  10
  
  
    
@   echo Could not find 64-bit Qt


  		




  
  10
  
    
@   echo Could not find 64-bit Qt in %QTDIR%


  		




  11
  11
  
    
@   exit /b 2


  		




  12
  12
  
    
)


  		




  13
  13
  
    

  		




  14
  
  
    
if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (


  		




  
  14
  
    
set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"


  		




  
  15
  
    

  		




  
  16
  
    
if not exist %vcvarsall% (


  		




  15
  17
  
    
@   echo "Could not find MSVC vars batch file"


  		




  16
  18
  
    
@   exit /b 2


  		




  17
  19
  
    
)


  		




  18
  20
  
    

  		




  19
  
  
    
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64


  		




  
  21
  
    
call %vcvarsall% amd64


  		




  20
  22
  
    

  		




  21
  23
  
    
set ORIGINALPATH=%PATH%


  		




  22
  24
  
    
set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin


  		












  

    
      deploy/win64/sonic-lineup.wxs
    
  





  162
  162
  
    
                 installers and get installed by default to C:\Program


  		




  163
  163
  
    
                 Files (x86)\Windows Kits\... -->


  		




  164
  164
  
    
               


  		




  165
  
  
    
               <File


  		




  166
  
  
    
                   Id="concrt140"


  		




  167
  
  
    
                   Name="concrt140.dll"


  		




  168
  
  
    
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\concrt140.DLL"


  		




  169
  
  
    
                   KeyPath="yes"/>


  		




  170
  
  
    
               <File


  		




  171
  
  
    
                   Id="msvcp140"


  		




  172
  
  
    
                   Name="msvcp140.dll"


  		




  173
  
  
    
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>


  		




  174
  
  
    
               <File


  		




  175
  
  
    
                   Id="vccorlib140"


  		




  176
  
  
    
                   Name="vccorlib140.dll"


  		




  177
  
  
    
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>


  		




  178
  
  
    
               <File


  		




  179
  
  
    
                   Id="vcruntime140"


  		




  180
  
  
    
                   Name="vcruntime140.dll"


  		




  181
  
  
    
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>


  		




  
  165
  
    
            <File


  		




  
  166
  
    
                Id="concrt140"


  		




  
  167
  
    
                Name="concrt140.dll"


  		




  
  168
  
    
                Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\concrt140.DLL"


  		




  
  169
  
    
                KeyPath="yes"/>


  		




  
  170
  
    
            <File


  		




  
  171
  
    
                Id="msvcp140"


  		




  
  172
  
    
                Name="msvcp140.dll"


  		




  
  173
  
    
                Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\msvcp140.DLL"/>


  		




  
  174
  
    
            <File


  		




  
  175
  
    
                Id="vccorlib140"


  		




  
  176
  
    
                Name="vccorlib140.dll"


  		




  
  177
  
    
                Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\vccorlib140.DLL"/>


  		




  
  178
  
    
            <File


  		




  
  179
  
    
                Id="vcruntime140"


  		




  
  180
  
    
                Name="vcruntime140.dll"


  		




  
  181
  
    
                Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\vcruntime140.DLL"/>


  		




  182
  182
  
    
          </Component>


  		




  183
  183
  
    

  		




  184
  184
  
    
	  <Directory Id="Platforms" Name="platforms">


  		












  

    
      noconfig.pri
    
  





  84
  84
  
    
    # we want to do 32-bit builds with MSVC as well, then we'll


  		




  85
  85
  
    
    # need to add a way to distinguish the two.


  		




  86
  86
  
    
    


  		




  87
  
  
    
    INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include $$PWD/sv-dependency-builds/win64-msvc/include/opus /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0/


  		




  
  87
  
    
    INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include $$PWD/sv-dependency-builds/win64-msvc/include/opus /Libraries/boost_1_71_0 /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0/


  		




  88
  88
  
    

  		




  89
  89
  
    
    # This seems to be intruding even when we're supposed to be release


  		




  90
  90
  
    
#    CONFIG(debug) {


  		












Also available in:  Unified diff