Update build script

Author: Chocobo1

.appveyor.yml

@@ -58,7 +58,7 @@ environment:
 
   NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/win64/nasm-2.16.03-win64.zip
 
-  FLAC_SOL_FILE: src\libFLAC++\FLAC++.vcxproj
+  FLAC_SOL_FILE: src\libFLAC\FLAC.vcxproj
   FLAC_CMAKE_X86: -DOGG_INCLUDE_DIR="%REPO_DIR%\lib\libogg\include" -DOGG_LIBRARY="%REPO_DIR%\lib\libogg\_build\Win32\Release\ogg.lib" -DINSTALL_MANPAGES=OFF
   FLAC_CMAKE_X64: -DOGG_INCLUDE_DIR="%REPO_DIR%\lib\libogg\include" -DOGG_LIBRARY="%REPO_DIR%\lib\libogg\_build\x64\Release\ogg.lib" -DINSTALL_MANPAGES=OFF
   FLAC_MSBUILD_CMD_X86: /maxcpucount /property:Configuration=Release,Platform=Win32
@@ -125,7 +125,7 @@ before_build:
 
   # prepare opusfile
   - cd "%REPO_DIR%"
-  - if exist "lib\opusfile\win32\VS2015" (rd /S /Q "lib\opusfile\win32\VS2015")
+  - mkdir "lib\opusfile\win32"
   - move /Y "src\opusfile\VS2015" "lib\opusfile\win32"
   - msbuild "lib\opusfile\win32\VS2015\%OPUSFILE_SOL_FILE%" %OPUSFILE_MSBUILD_CMD_X86%
   - msbuild "lib\opusfile\win32\VS2015\%OPUSFILE_SOL_FILE%" %OPUSFILE_MSBUILD_CMD_X64%
@@ -155,7 +155,7 @@ build_script:
   - cd "%REPO_DIR%"
   - if exist "lib\opus-tools\win32\VS2015" (rd /S /Q "lib\opus-tools\win32\VS2015")
   - move /Y "src\opus-tools\VS2015" "lib\opus-tools\win32\VS2015"
-  - ps: (Get-Content 'lib\opus-tools\win32\config.h') | ForEach-Object { $_ -replace 'libFLAC_static.lib', 'FLAC++.lib' } | Set-Content 'lib\opus-tools\win32\config.h'
+  - ps: (Get-Content 'lib\opus-tools\win32\config.h') | ForEach-Object { $_ -replace 'libFLAC_static.lib', 'FLAC.lib' } | Set-Content 'lib\opus-tools\win32\config.h'
   - msbuild "lib\opus-tools\win32\VS2015\%OPUS-TOOLS_SOL_FILE%" %OPUS-TOOLS_MSBUILD_CMD_X86%
 
   #- mkdir "lib\opus-tools\win32\VS2015\x64\Release"

.github/workflows/build.yaml

@@ -127,10 +127,7 @@ jobs:
 
       - name: Prepare opusfile
         run: |
-          if (Test-Path "lib\opusfile\win32\VS2015")
-          {
-            Remove-Item "lib\opusfile\win32\VS2015" -Recurse
-          }
+          mkdir "lib\opusfile\win32"
           Move-Item -Force -Path "src\opusfile\VS2015" -Destination "lib\opusfile\win32"
           msbuild "lib\opusfile\win32\VS2015\${{ env.OPUSFILE_SOL_FILE }}" ${{ env.OPUSFILE_MSBUILD_CMD_X86 }}
           msbuild "lib\opusfile\win32\VS2015\${{ env.OPUSFILE_SOL_FILE }}" ${{ env.OPUSFILE_MSBUILD_CMD_X64 }}

src/msvc_flags.cmake

@@ -29,3 +29,5 @@ function(cmake_initialize_per_config_variable _PREFIX _DOCSTRING)
 
   _cmake_initialize_per_config_variable(${ARGV})
 endfunction()
+
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

src/opus-tools/VS2015/opusenc.vcxproj

@@ -100,18 +100,12 @@
       <AdditionalOptions>/Gw %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>HAVE_LIBFLAC;FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>FLAC.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalOptions>/Gw %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>HAVE_LIBFLAC;FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>FLAC.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />