Skip to content

Commit 7784219

Browse files
Chocobo1Chocobo1
committed
Update
1 parent f5cd93c commit 7784219

7 files changed

Lines changed: 38 additions & 36 deletions

File tree

‎.appveyor.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ branches:
2525
#---------------------------------#
2626

2727
# environment variables
28-
# build system info: https://www.appveyor.com/docs/installed-software/
29-
os: Visual Studio 2019
28+
# build system info: https://www.appveyor.com/docs/windows-images-software/
29+
os: Visual Studio 2022
3030

3131
environment:
3232
REPO_DIR: &REPO_DIR c:\project # directory created by appveyor
3333

34-
CMAKE_GENERATOR_X86: -G "Visual Studio 16 2019" -A "Win32"
35-
CMAKE_GENERATOR_X64: -G "Visual Studio 16 2019" -A "x64"
36-
CMAKE_COMMON_DEFINES: -DCMAKE_TOOLCHAIN_FILE="%REPO_DIR%\src\msvc_flags.cmake" -DCMAKE_BUILD_TYPE=Release
34+
CMAKE_GENERATOR_X86: -G "Visual Studio 17 2022" -A "Win32"
35+
CMAKE_GENERATOR_X64: -G "Visual Studio 17 2022" -A "x64"
36+
CMAKE_COMMON_DEFINES: -DCMAKE_TOOLCHAIN_FILE="%REPO_DIR%\src\msvc_flags.cmake"
3737

38-
OGG_SOL_FILE: libogg.sln
38+
OGG_SOL_FILE: ogg.sln
3939
OGG_MSBUILD_CMD_X86: /maxcpucount /property:Configuration=Release,Platform=Win32 /target:ogg
4040
OGG_MSBUILD_CMD_X64: /maxcpucount /property:Configuration=Release,Platform=x64 /target:ogg
4141

@@ -55,7 +55,7 @@ environment:
5555
OPUSFILE_MSBUILD_CMD_X86: /maxcpucount /property:Configuration=Release-NoHTTP,Platform=Win32 /target:opusfile
5656
OPUSFILE_MSBUILD_CMD_X64: /maxcpucount /property:Configuration=Release-NoHTTP,Platform=x64 /target:opusfile
5757

58-
NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/win64/nasm-2.14.02-win64.zip
58+
NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win64/nasm-2.15.05-win64.zip
5959

6060
FLAC_SOL_FILE: FLAC.sln
6161
FLAC_CMAKE_X86: -DOGG_INCLUDE_DIR="%REPO_DIR%\lib\libogg\include" -DOGG_LIBRARY="%REPO_DIR%\lib\libogg\_build\Win32\Release\ogg.lib"

‎src/libopusenc/VS2015/opusenc.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,46 +62,46 @@
6262
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6363
<ConfigurationType>StaticLibrary</ConfigurationType>
6464
<UseDebugLibraries>true</UseDebugLibraries>
65-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6666
</PropertyGroup>
6767
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
6868
<ConfigurationType>DynamicLibrary</ConfigurationType>
6969
<UseDebugLibraries>true</UseDebugLibraries>
70-
<PlatformToolset>v142</PlatformToolset>
70+
<PlatformToolset>v143</PlatformToolset>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7373
<ConfigurationType>StaticLibrary</ConfigurationType>
7474
<UseDebugLibraries>true</UseDebugLibraries>
75-
<PlatformToolset>v142</PlatformToolset>
75+
<PlatformToolset>v143</PlatformToolset>
7676
</PropertyGroup>
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration">
7878
<ConfigurationType>DynamicLibrary</ConfigurationType>
7979
<UseDebugLibraries>true</UseDebugLibraries>
80-
<PlatformToolset>v142</PlatformToolset>
80+
<PlatformToolset>v143</PlatformToolset>
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
8383
<ConfigurationType>StaticLibrary</ConfigurationType>
8484
<UseDebugLibraries>false</UseDebugLibraries>
85-
<PlatformToolset>v142</PlatformToolset>
85+
<PlatformToolset>v143</PlatformToolset>
8686
<WholeProgramOptimization>true</WholeProgramOptimization>
8787
</PropertyGroup>
8888
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration">
8989
<ConfigurationType>DynamicLibrary</ConfigurationType>
9090
<UseDebugLibraries>false</UseDebugLibraries>
9191
<WholeProgramOptimization>true</WholeProgramOptimization>
92-
<PlatformToolset>v142</PlatformToolset>
92+
<PlatformToolset>v143</PlatformToolset>
9393
</PropertyGroup>
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
9595
<ConfigurationType>StaticLibrary</ConfigurationType>
9696
<UseDebugLibraries>false</UseDebugLibraries>
9797
<WholeProgramOptimization>true</WholeProgramOptimization>
98-
<PlatformToolset>v142</PlatformToolset>
98+
<PlatformToolset>v143</PlatformToolset>
9999
</PropertyGroup>
100100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration">
101101
<ConfigurationType>DynamicLibrary</ConfigurationType>
102102
<UseDebugLibraries>false</UseDebugLibraries>
103103
<WholeProgramOptimization>true</WholeProgramOptimization>
104-
<PlatformToolset>v142</PlatformToolset>
104+
<PlatformToolset>v143</PlatformToolset>
105105
</PropertyGroup>
106106
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
107107
<ImportGroup Label="ExtensionSettings">

‎src/opus-tools/VS2015/generate_version.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Any|Win32'" Label="Configuration">
1616
<ConfigurationType>Utility</ConfigurationType>
1717
<UseDebugLibraries>false</UseDebugLibraries>
18-
<PlatformToolset>v142</PlatformToolset>
18+
<PlatformToolset>v143</PlatformToolset>
1919
</PropertyGroup>
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2121
<ImportGroup Label="ExtensionSettings">

‎src/opus-tools/VS2015/opusdec.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,23 @@
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5454
<ConfigurationType>Application</ConfigurationType>
5555
<UseDebugLibraries>true</UseDebugLibraries>
56-
<PlatformToolset>v142</PlatformToolset>
56+
<PlatformToolset>v143</PlatformToolset>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5959
<ConfigurationType>Application</ConfigurationType>
6060
<UseDebugLibraries>true</UseDebugLibraries>
61-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6464
<ConfigurationType>Application</ConfigurationType>
6565
<UseDebugLibraries>false</UseDebugLibraries>
66-
<PlatformToolset>v142</PlatformToolset>
66+
<PlatformToolset>v143</PlatformToolset>
6767
<WholeProgramOptimization>true</WholeProgramOptimization>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7070
<ConfigurationType>Application</ConfigurationType>
7171
<UseDebugLibraries>false</UseDebugLibraries>
72-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
<WholeProgramOptimization>true</WholeProgramOptimization>
7474
</PropertyGroup>
7575
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎src/opus-tools/VS2015/opusenc.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ClCompile Include="..\..\share\getopt1.c" />
2424
<ClCompile Include="..\..\src\opus_header.c" />
2525
<ClCompile Include="..\..\src\opusenc.c" />
26-
<ClCompile Include="..\..\src\picture.c" />
26+
<ClCompile Include="..\..\src\tagcompare.c" />
2727
<ClCompile Include="..\..\src\audio-in.c" />
2828
<ClCompile Include="..\..\src\diag_range.c" />
2929
<ClCompile Include="..\..\src\flac.c" />
@@ -37,7 +37,7 @@
3737
<ClInclude Include="..\..\src\encoder.h" />
3838
<ClInclude Include="..\..\src\flac.h" />
3939
<ClInclude Include="..\..\src\opus_header.h" />
40-
<ClInclude Include="..\..\src\picture.h" />
40+
<ClInclude Include="..\..\src\tagcompare.h" />
4141
<ClInclude Include="..\..\src\stack_alloc.h" />
4242
<ClInclude Include="..\..\src\wav_io.h" />
4343
<ClInclude Include="..\..\win32\config.h" />
@@ -53,23 +53,23 @@
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5454
<ConfigurationType>Application</ConfigurationType>
5555
<UseDebugLibraries>true</UseDebugLibraries>
56-
<PlatformToolset>v142</PlatformToolset>
56+
<PlatformToolset>v143</PlatformToolset>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5959
<ConfigurationType>Application</ConfigurationType>
6060
<UseDebugLibraries>true</UseDebugLibraries>
61-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6464
<ConfigurationType>Application</ConfigurationType>
6565
<UseDebugLibraries>false</UseDebugLibraries>
66-
<PlatformToolset>v142</PlatformToolset>
66+
<PlatformToolset>v143</PlatformToolset>
6767
<WholeProgramOptimization>true</WholeProgramOptimization>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7070
<ConfigurationType>Application</ConfigurationType>
7171
<UseDebugLibraries>false</UseDebugLibraries>
72-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
<WholeProgramOptimization>true</WholeProgramOptimization>
7474
</PropertyGroup>
7575
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎src/opus-tools/VS2015/opusinfo.vcxproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<ClCompile Include="..\..\src\opusinfo.c" />
2626
<ClCompile Include="..\..\src\info_opus.c" />
2727
<ClCompile Include="..\..\src\picture.c" />
28+
<ClCompile Include="..\..\src\tagcompare.c" />
2829
<ClCompile Include="..\..\win32\unicode_support.c" />
2930
</ItemGroup>
3031
<ItemGroup>
@@ -33,6 +34,7 @@
3334
<ClInclude Include="..\..\src\opusinfo.h" />
3435
<ClInclude Include="..\..\src\opus_header.h" />
3536
<ClInclude Include="..\..\src\picture.h" />
37+
<ClInclude Include="..\..\src\tagcompare.h" />
3638
<ClInclude Include="..\..\win32\config.h" />
3739
<ClInclude Include="..\..\win32\unicode_support.h" />
3840
</ItemGroup>
@@ -46,23 +48,23 @@
4648
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4749
<ConfigurationType>Application</ConfigurationType>
4850
<UseDebugLibraries>true</UseDebugLibraries>
49-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5052
</PropertyGroup>
5153
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5254
<ConfigurationType>Application</ConfigurationType>
5355
<UseDebugLibraries>true</UseDebugLibraries>
54-
<PlatformToolset>v142</PlatformToolset>
56+
<PlatformToolset>v143</PlatformToolset>
5557
</PropertyGroup>
5658
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5759
<ConfigurationType>Application</ConfigurationType>
5860
<UseDebugLibraries>false</UseDebugLibraries>
59-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6062
<WholeProgramOptimization>true</WholeProgramOptimization>
6163
</PropertyGroup>
6264
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6365
<ConfigurationType>Application</ConfigurationType>
6466
<UseDebugLibraries>false</UseDebugLibraries>
65-
<PlatformToolset>v142</PlatformToolset>
67+
<PlatformToolset>v143</PlatformToolset>
6668
<WholeProgramOptimization>true</WholeProgramOptimization>
6769
</PropertyGroup>
6870
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎src/opusfile/VS2015/opusfile.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,35 +48,35 @@
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4949
<ConfigurationType>StaticLibrary</ConfigurationType>
5050
<UseDebugLibraries>true</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5454
<ConfigurationType>StaticLibrary</ConfigurationType>
5555
<UseDebugLibraries>true</UseDebugLibraries>
56-
<PlatformToolset>v142</PlatformToolset>
56+
<PlatformToolset>v143</PlatformToolset>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5959
<ConfigurationType>StaticLibrary</ConfigurationType>
6060
<UseDebugLibraries>false</UseDebugLibraries>
61-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6262
<WholeProgramOptimization>true</WholeProgramOptimization>
6363
</PropertyGroup>
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoHTTP|Win32'" Label="Configuration">
6565
<ConfigurationType>StaticLibrary</ConfigurationType>
6666
<UseDebugLibraries>false</UseDebugLibraries>
67-
<PlatformToolset>v142</PlatformToolset>
67+
<PlatformToolset>v143</PlatformToolset>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7171
<ConfigurationType>StaticLibrary</ConfigurationType>
7272
<UseDebugLibraries>false</UseDebugLibraries>
73-
<PlatformToolset>v142</PlatformToolset>
73+
<PlatformToolset>v143</PlatformToolset>
7474
<WholeProgramOptimization>true</WholeProgramOptimization>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoHTTP|x64'" Label="Configuration">
7777
<ConfigurationType>StaticLibrary</ConfigurationType>
7878
<UseDebugLibraries>false</UseDebugLibraries>
79-
<PlatformToolset>v142</PlatformToolset>
79+
<PlatformToolset>v143</PlatformToolset>
8080
<WholeProgramOptimization>true</WholeProgramOptimization>
8181
</PropertyGroup>
8282
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)