Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(187) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-03-30 09:58:15
|
Author: manx Date: Sat Mar 30 10:58:03 2024 New Revision: 20483 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20483 Log: [Var] 7-zip: Update to v23.01. Modified: trunk/OpenMPT/build/download_externals.cmd Modified: trunk/OpenMPT/build/download_externals.cmd ============================================================================== --- trunk/OpenMPT/build/download_externals.cmd Sat Mar 30 10:56:13 2024 (r20482) +++ trunk/OpenMPT/build/download_externals.cmd Sat Mar 30 10:58:03 2024 (r20483) @@ -29,11 +29,11 @@ if not exist "build\tools" mkdir "build\tools" -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7za920.zip" "build\externals\7za920.zip" 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 384846 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7za920.zip" "build\externals\7za920.zip" 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 384846 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z2201-extra.7z" "build\externals\7z2201-extra.7z" 845b3fd5dda4187e47fa0650a5d8465484e6c407a2a1745bb12bc50aa266cc4b573393184642c1875388c262f16039c1b93f102908799147dbfc824a52d8d89d 1018450 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-extra.7z" "build\externals\7z2301-extra.7z" c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b 1027828 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z2201-x64.exe" "build\externals\7z2201-x64.exe" 965d43f06d104bf6707513c459f18aaf8b049f4a043643d720b184ed9f1bb6c929309c51c3991d5aaff7b9d87031a7248ee3274896521abe955d0e49f901ac94 1575742 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-x64.exe" "build\externals\7z2301-x64.exe" 1f4da167ff2f1d34eeaf76c3003ba5fcabfc7a7da40e73e317aa99c6e1321cdf97e00f4feb9e79e1a72240e0376af0c3becb3d309e5bb0385e5192da17ea77ff 1589510 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error @@ -65,8 +65,8 @@ rem Get 7zip installer and unpack it with current commandline 7zip rem This is a mess for automatic. Oh well. cscript build\scriptlib\unpack-zip.vbs "build\externals\7za920.zip" "build\tools\7zipold" || goto error -build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2201-extra.7z" || goto error -build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2201-x64.exe" || goto error +build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2301-extra.7z" || goto error +build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2301-x64.exe" || goto error call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error |
|
From: <sv...@op...> - 2024-03-30 09:56:28
|
Author: manx Date: Sat Mar 30 10:56:13 2024 New Revision: 20482 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20482 Log: [Fix] build: Disable all file format filters when compressing 7z archives. Newer 7-zip versions introduce new filters all the time, making the resulting archives incompatible with earlier 7-zip versions. This introduced a slight regression in compression ratio but allows us updating 7-zip in return. See r19844. Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd trunk/OpenMPT/build/auto/setup_arguments.cmd Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Sat Mar 30 10:56:13 2024 (r20482) @@ -296,7 +296,7 @@ if singleThreaded: p7zarm64.communicate() -p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) +p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) if singleThreaded: p7zsymbols.communicate() Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Sat Mar 30 10:56:13 2024 (r20482) @@ -217,7 +217,7 @@ if singleThreaded: p7zamd64.communicate() -p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) +p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) if singleThreaded: p7zsymbols.communicate() Modified: trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd ============================================================================== --- trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd Sat Mar 30 10:56:13 2024 (r20482) @@ -103,7 +103,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\XMPlay-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\in_openmpt.dll .\Winamp-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\Winamp-legacy\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ @@ -248,7 +248,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-ogg.dll bin\amd64-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-vorbis.dll bin\amd64-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-zlib.dll bin\amd64-legacy\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ Modified: trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd ============================================================================== --- trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd Sat Mar 30 10:56:13 2024 (r20482) @@ -83,7 +83,7 @@ copy /y ..\..\bin\release\vs2017-winxp-static\x86\openmpt-mpg123.dll .\XMPlay\ || goto error copy /y ..\..\bin\release\vs2017-winxp-static\x86\in_openmpt.dll .\Winamp\ || goto error copy /y ..\..\bin\release\vs2017-winxp-static\x86\openmpt-mpg123.dll .\Winamp\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.retro.winxp.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\bin.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.retro.winxp.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ @@ -182,7 +182,7 @@ copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-ogg.dll bin\amd64-retro-winxp\ || goto error copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-vorbis.dll bin\amd64-retro-winxp\ || goto error copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-zlib.dll bin\amd64-retro-winxp\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.retro.winxp.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\dev.windows.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.retro.winxp.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ Modified: trunk/OpenMPT/build/auto/setup_arguments.cmd ============================================================================== --- trunk/OpenMPT/build/auto/setup_arguments.cmd Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/setup_arguments.cmd Sat Mar 30 10:56:13 2024 (r20482) @@ -162,8 +162,13 @@ if "%MPT_PKG_FORMAT%" == "" set MPT_PKG_FORMAT=zip + if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_SYMBOLS=xz if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_SYMBOLS=zip + +if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_OPTIONS=-mf=off +if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_OPTIONS= + if "%MPT_PKG_FORMAT_SYMBOLS%" == "" set MPT_PKG_FORMAT_SYMBOLS=zip |
Author: manx Date: Fri Mar 29 09:46:35 2024 New Revision: 20481 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20481 Log: [Mod] build: Opus: Disable optional NoLACE/LACE/DEEP-PLC/DRED features of Opus 1.5. Modified: trunk/OpenMPT/build/premake/ext-opus.lua trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/ext/opus.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2019win10/ext/opus.vcxproj trunk/OpenMPT/build/vs2019win10/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2019win7/ext/opus.vcxproj trunk/OpenMPT/build/vs2019win7/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2019win81/ext/opus.vcxproj trunk/OpenMPT/build/vs2019win81/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2022win10/ext/opus.vcxproj trunk/OpenMPT/build/vs2022win10/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/ext/opus.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2022win7/ext/opus.vcxproj trunk/OpenMPT/build/vs2022win7/ext/opus.vcxproj.filters trunk/OpenMPT/build/vs2022win81/ext/opus.vcxproj trunk/OpenMPT/build/vs2022win81/ext/opus.vcxproj.filters Modified: trunk/OpenMPT/build/premake/ext-opus.lua ============================================================================== --- trunk/OpenMPT/build/premake/ext-opus.lua Thu Mar 28 21:32:40 2024 (r20480) +++ trunk/OpenMPT/build/premake/ext-opus.lua Fri Mar 29 09:46:35 2024 (r20481) @@ -28,8 +28,6 @@ files { "../../include/opus/celt/*.c", "../../include/opus/celt/*.h", - "../../include/opus/dnn/*.c", - "../../include/opus/dnn/*.h", "../../include/opus/silk/*.c", "../../include/opus/silk/*.h", "../../include/opus/silk/float/*.c", @@ -41,8 +39,6 @@ files { "../../include/opus/celt/x86/*.c", "../../include/opus/celt/x86/*.h", - "../../include/opus/dnn/x86/*.c", - "../../include/opus/dnn/x86/*.h", "../../include/opus/silk/float/x86/*.c", "../../include/opus/silk/float/x86/*.h", "../../include/opus/silk/x86/*.c", @@ -53,8 +49,6 @@ files { "../../include/opus/celt/arm/*.c", "../../include/opus/celt/arm/*.h", - "../../include/opus/dnn/arm/*.c", - "../../include/opus/dnn/arm/*.h", "../../include/opus/silk/float/arm/*.c", "../../include/opus/silk/float/arm/*.h", "../../include/opus/silk/arm/*.c", @@ -63,12 +57,6 @@ filter {} excludes { "../../include/opus/celt/opus_custom_demo.c", - "../../include/opus/dnn/dump_data.c", - "../../include/opus/dnn/lossgen.c", - "../../include/opus/dnn/lossgen_data.c", - "../../include/opus/dnn/lossgen_demo.c", - "../../include/opus/dnn/lpcnet_demo.c", - "../../include/opus/dnn/write_lpcnet_weights.c", "../../include/opus/src/opus_compare.c", "../../include/opus/src/opus_demo.c", "../../include/opus/src/repacketizer_demo.c", @@ -77,10 +65,7 @@ defines { "OPUS_BUILD=1", "PACKAGE_VERISON=\"1.5.1\"", - "ENABLE_DEEP_PLC=1", - "ENABLE_DRED=1", "ENABLE_HARDENING=1", - "ENABLE_OSCE=1", "HAVE_STDINT_H=1", "HAVE_STDIO_H=1", "HAVE_STDLIB_H=1", @@ -88,6 +73,41 @@ "USE_ALLOCA=1", } filter {} + if false then -- NoLACE (OSCE) / LACE (OSCE) / DEEP-PLC (DEEP_PLC || DRED) / DRED (DRED). + filter {} + files { + "../../include/opus/dnn/*.c", + "../../include/opus/dnn/*.h", + } + defines { + "ENABLE_DEEP_PLC=1", + "ENABLE_DRED=1", + "ENABLE_OSCE=1", + } + filter {} + filter { "architecture:x86 or x86_64" } + files { + "../../include/opus/dnn/x86/*.c", + "../../include/opus/dnn/x86/*.h", + } + filter {} + filter { "architecture:arm or arm64" } + files { + "../../include/opus/dnn/arm/*.c", + "../../include/opus/dnn/arm/*.h", + } + filter {} + excludes { + "../../include/opus/dnn/dump_data.c", + "../../include/opus/dnn/lossgen.c", + "../../include/opus/dnn/lossgen_data.c", + "../../include/opus/dnn/lossgen_demo.c", + "../../include/opus/dnn/lpcnet_demo.c", + "../../include/opus/dnn/write_lpcnet_weights.c", + } + filter {} + end + filter {} if _OPTIONS["clang"] then filter { "architecture:x86" } defines { Modified: trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj Thu Mar 28 21:32:40 2024 (r20480) +++ trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj Fri Mar 29 09:46:35 2024 (r20481) @@ -294,7 +294,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -314,7 +314,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -333,7 +333,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -357,7 +357,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -380,7 +380,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -405,7 +405,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -429,7 +429,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -450,7 +450,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -470,7 +470,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -496,7 +496,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -521,7 +521,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -548,7 +548,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -606,42 +606,6 @@ <ClInclude Include="..\..\..\include\opus\celt\x86\vq_sse.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\x86_arch_macros.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\x86cpu.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\burg.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\common.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_coding.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_config.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_decoder.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_encoder.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_constants.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_dec.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_dec_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_enc.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_enc_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_stats_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\fargan.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\fargan_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\freq.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\lace_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\lossgen.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\lossgen_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\lpcnet.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\lpcnet_private.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\nndsp.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\nnet.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\nnet_arch.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\nolace_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\osce.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\osce_config.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\osce_features.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\osce_structs.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\pitchdnn.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\pitchdnn_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\plc_data.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\vec.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\vec_avx.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\vec_neon.h" /> - <ClInclude Include="..\..\..\include\opus\dnn\x86\dnn_x86.h" /> <ClInclude Include="..\..\..\include\opus\include\opus.h" /> <ClInclude Include="..\..\..\include\opus\include\opus_custom.h" /> <ClInclude Include="..\..\..\include\opus\include\opus_defines.h" /> @@ -706,36 +670,6 @@ <ClCompile Include="..\..\..\include\opus\celt\x86\vq_sse2.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\x86_celt_map.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\x86cpu.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\burg.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_coding.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_decoder.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_encoder.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_dec.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_dec_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_enc.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_enc_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_stats_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\fargan.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\fargan_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\freq.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\lace_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\lpcnet_enc.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\lpcnet_plc.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\lpcnet_tables.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\nndsp.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\nnet.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\nnet_default.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\nolace_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\osce.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\osce_features.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\parse_lpcnet_weights.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\pitchdnn.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\pitchdnn_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\plc_data.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\x86\nnet_avx2.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\x86\nnet_sse2.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\x86\nnet_sse4_1.c" /> - <ClCompile Include="..\..\..\include\opus\dnn\x86\x86_dnn_map.c" /> <ClCompile Include="..\..\..\include\opus\silk\A2NLSF.c" /> <ClCompile Include="..\..\..\include\opus\silk\CNG.c" /> <ClCompile Include="..\..\..\include\opus\silk\HP_variable_cutoff.c" /> Modified: trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj.filters Thu Mar 28 21:32:40 2024 (r20480) +++ trunk/OpenMPT/build/vs2017winxp/ext/opus.vcxproj.filters Fri Mar 29 09:46:35 2024 (r20481) @@ -7,12 +7,6 @@ <Filter Include="celt\x86"> <UniqueIdentifier>{429F1E3C-2E6C-7947-5785-67EF43B1AED5}</UniqueIdentifier> </Filter> - <Filter Include="dnn"> - <UniqueIdentifier>{E56A880B-5174-887C-DAEF-9E7C46F8937C}</UniqueIdentifier> - </Filter> - <Filter Include="dnn\x86"> - <UniqueIdentifier>{1A21F91D-8600-78B9-8F18-0390FB76DE1A}</UniqueIdentifier> - </Filter> <Filter Include="include"> <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier> </Filter> @@ -138,114 +132,6 @@ <ClInclude Include="..\..\..\include\opus\celt\x86\x86cpu.h"> <Filter>celt\x86</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\burg.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\common.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_coding.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_config.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_decoder.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_encoder.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_constants.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_dec.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_dec_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_enc.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_enc_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\dred_rdovae_stats_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\fargan.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\fargan_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\freq.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\lace_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\lossgen.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\lossgen_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\lpcnet.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\lpcnet_private.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\nndsp.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\nnet.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\nnet_arch.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\nolace_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\osce.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\osce_config.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\osce_features.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\osce_structs.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\pitchdnn.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\pitchdnn_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\plc_data.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\vec.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\vec_avx.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\vec_neon.h"> - <Filter>dnn</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\opus\dnn\x86\dnn_x86.h"> - <Filter>dnn\x86</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\opus\include\opus.h"> <Filter>include</Filter> </ClInclude> @@ -434,96 +320,6 @@ <ClCompile Include="..\..\..\include\opus\celt\x86\x86cpu.c"> <Filter>celt\x86</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\burg.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_coding.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_decoder.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_encoder.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_dec.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_dec_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_enc.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_enc_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\dred_rdovae_stats_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\fargan.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\fargan_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\freq.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\lace_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\lpcnet_enc.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\lpcnet_plc.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\lpcnet_tables.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\nndsp.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\nnet.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\nnet_default.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\nolace_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\osce.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\osce_features.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\parse_lpcnet_weights.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\pitchdnn.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\pitchdnn_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\plc_data.c"> - <Filter>dnn</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\x86\nnet_avx2.c"> - <Filter>dnn\x86</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\x86\nnet_sse2.c"> - <Filter>dnn\x86</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\x86\nnet_sse4_1.c"> - <Filter>dnn\x86</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\opus\dnn\x86\x86_dnn_map.c"> - <Filter>dnn\x86</Filter> - </ClCompile> <ClCompile Include="..\..\..\include\opus\silk\A2NLSF.c"> <Filter>silk</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/opus.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/opus.vcxproj Thu Mar 28 21:32:40 2024 (r20480) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/opus.vcxproj Fri Mar 29 09:46:35 2024 (r20481) @@ -294,7 +294,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -314,7 +314,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -333,7 +333,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -357,7 +357,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -380,7 +380,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -405,7 +405,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -429,7 +429,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -450,7 +450,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -470,7 +470,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -496,7 +496,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.1";ENABLE_DEEP_PLC=1;ENABLE_DRED=1;ENABLE_HARDENING=1;ENABLE_OSCE=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_... [truncated message content] |
|
From: <sv...@op...> - 2024-03-28 20:32:53
|
Author: manx Date: Thu Mar 28 21:32:40 2024 New Revision: 20480 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20480 Log: [Var] Update .gitignore. Modified: trunk/OpenMPT/.gitignore Modified: trunk/OpenMPT/.gitignore ============================================================================== --- trunk/OpenMPT/.gitignore Thu Mar 28 21:31:47 2024 (r20479) +++ trunk/OpenMPT/.gitignore Thu Mar 28 21:32:40 2024 (r20480) @@ -557,11 +557,11 @@ /include/opus/tests /include/opus/celt/meson.build /include/opus/celt/tests +/include/opus/dnn/meson.build /include/opus/include/meson.build /include/opus/silk/meson.build /include/opus/silk/tests /include/opus/src/meson.build -/include/opus/win32/VS2015 /include/opusenc/Makefile.am /include/opusenc/Makefile.in /include/opusenc/README.md |
|
From: <sv...@op...> - 2024-03-28 20:31:58
|
Author: manx Date: Thu Mar 28 21:31:47 2024 New Revision: 20479 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20479 Log: [Ref] Opus: Silence warning. Modified: trunk/OpenMPT/include/opus/OpenMPT.txt trunk/OpenMPT/include/opus/dnn/dred_encoder.c Modified: trunk/OpenMPT/include/opus/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/opus/OpenMPT.txt Thu Mar 28 15:19:01 2024 (r20478) +++ trunk/OpenMPT/include/opus/OpenMPT.txt Thu Mar 28 21:31:47 2024 (r20479) @@ -3,6 +3,7 @@ * Obviously, unnecessary folders and files have been removed. * celt/x86/vq_sse2.c has been modified to check for OPUS_X86_MAY_HAVE_SSE2. * celt/x86/x86_arch_macros.c has been modified to support AVX and AVX2. + * A warning in dnn/dred_encoder.c has been silenced. * Performance warning in dnn/nnet.c has been silenced. * Performance warning in dnn/nnet.h has been silenced. * dnn/nnet_avx2.c has been modified to check for Modified: trunk/OpenMPT/include/opus/dnn/dred_encoder.c ============================================================================== --- trunk/OpenMPT/include/opus/dnn/dred_encoder.c Thu Mar 28 15:19:01 2024 (r20478) +++ trunk/OpenMPT/include/opus/dnn/dred_encoder.c Thu Mar 28 21:31:47 2024 (r20479) @@ -133,7 +133,11 @@ { float downmix[MAX_DOWNMIX_BUFFER]; int i; +#if 0 /* OpenMPT */ int up; +#else /* OpenMPT */ + int up=0; /* OpenMPT */ +#endif /* OpenMPT */ celt_assert(enc->channels*in_len <= MAX_DOWNMIX_BUFFER); celt_assert(in_len * (opus_int32)16000 == out_len * enc->Fs); switch(enc->Fs) { |
|
From: <sv...@op...> - 2024-03-28 14:19:08
|
Author: manx Date: Thu Mar 28 15:19:01 2024 New Revision: 20478 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20478 Log: [Fix] Opus: Fix typo. Modified: trunk/OpenMPT/include/opus/silk/x86/NSQ_sse4_1.c trunk/OpenMPT/include/opus/silk/x86/VAD_sse4_1.c Modified: trunk/OpenMPT/include/opus/silk/x86/NSQ_sse4_1.c ============================================================================== --- trunk/OpenMPT/include/opus/silk/x86/NSQ_sse4_1.c Thu Mar 28 14:57:29 2024 (r20477) +++ trunk/OpenMPT/include/opus/silk/x86/NSQ_sse4_1.c Thu Mar 28 15:19:01 2024 (r20478) @@ -29,7 +29,7 @@ #include "config.h" #endif -#if defined(OPUS_X86_MAY_HAVE_AVX2) /* OpenMPT */ +#if defined(OPUS_X86_MAY_HAVE_SSE4_1) /* OpenMPT */ #include <xmmintrin.h> #include <emmintrin.h> Modified: trunk/OpenMPT/include/opus/silk/x86/VAD_sse4_1.c ============================================================================== --- trunk/OpenMPT/include/opus/silk/x86/VAD_sse4_1.c Thu Mar 28 14:57:29 2024 (r20477) +++ trunk/OpenMPT/include/opus/silk/x86/VAD_sse4_1.c Thu Mar 28 15:19:01 2024 (r20478) @@ -29,7 +29,7 @@ #include "config.h" #endif -#if defined(OPUS_X86_MAY_HAVE_AVX2) /* OpenMPT */ +#if defined(OPUS_X86_MAY_HAVE_SSE4_1) /* OpenMPT */ #include <xmmintrin.h> #include <emmintrin.h> |
|
From: <sv...@op...> - 2024-03-28 13:53:29
|
Author: manx Date: Thu Mar 28 14:53:18 2024 New Revision: 20476 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20476 Log: [Mod] OpenMPT: Version is now 1.32.00.08 Modified: trunk/OpenMPT/common/versionNumber.h Modified: trunk/OpenMPT/common/versionNumber.h ============================================================================== --- trunk/OpenMPT/common/versionNumber.h Thu Mar 28 08:34:46 2024 (r20475) +++ trunk/OpenMPT/common/versionNumber.h Thu Mar 28 14:53:18 2024 (r20476) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 32 #define VER_MINOR 00 -#define VER_MINORMINOR 07 +#define VER_MINORMINOR 08 OPENMPT_NAMESPACE_END |
|
From: <sv...@op...> - 2024-03-28 07:34:58
|
Author: manx Date: Thu Mar 28 08:34:46 2024 New Revision: 20475 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20475 Log: Merged revision(s) 20474 from trunk/OpenMPT: [Fix] build: CI: GitHub: Properly quote macOS target version. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Thu Mar 28 08:34:22 2024 (r20474) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Thu Mar 28 08:34:46 2024 (r20475) @@ -11,30 +11,30 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '15.3', arch: '' , target: '' , deps: sys , check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.15, deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.14, deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.14, deps: local, check: false } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-13, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-13, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: small, check: true } - - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: small, check: false } + - { host: macos-14, compiler: '15.3', arch: '' , target: '' , deps: sys , check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '14' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '14' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '13' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '13' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '12' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '12' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '11' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '11' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.15', deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.14', deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: '10.14', deps: local, check: false } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: '10.13', deps: local, check: false } + - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true } + - { host: macos-13, compiler: '15.2', arch: i386 , target: '10.13', deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: local, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: '10.13', deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: small, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: '10.13', deps: small, check: false } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}} cancel-in-progress: true |
|
From: <sv...@op...> - 2024-03-28 07:34:37
|
Author: manx Date: Thu Mar 28 08:34:22 2024 New Revision: 20474 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20474 Log: [Fix] build: CI: GitHub: Properly quote macOS target version. Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Thu Mar 28 08:33:07 2024 (r20473) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Thu Mar 28 08:34:22 2024 (r20474) @@ -13,30 +13,30 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '15.3', arch: '' , target: '' , deps: sys , check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: arm64 , target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.15, deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.14, deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.14, deps: local, check: false } - - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-13, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-13, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: small, check: true } - - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: small, check: false } + - { host: macos-14, compiler: '15.3', arch: '' , target: '' , deps: sys , check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '14' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '14' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '13' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '13' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '12' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '12' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '11' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '11' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.15', deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.14', deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: '10.14', deps: local, check: false } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: '10.13', deps: local, check: false } + - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true } + - { host: macos-13, compiler: '15.2', arch: i386 , target: '10.13', deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: local, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: '10.13', deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: small, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: '10.13', deps: small, check: false } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}} cancel-in-progress: true |
|
From: <sv...@op...> - 2024-03-28 07:33:19
|
Author: manx Date: Thu Mar 28 08:33:07 2024 New Revision: 20473 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20473 Log: Merged revision(s) 20472 from trunk/OpenMPT: [Mod] build: CI: GitHub: Update XCode on macOS 14 to 15.3. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Thu Mar 28 08:14:52 2024 (r20472) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Thu Mar 28 08:33:07 2024 (r20473) @@ -11,24 +11,24 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '15.2', arch: '' , target: '' , deps: sys, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.15, deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.14, deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.14, deps: local, check: false } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-14, compiler: '15.3', arch: '' , target: '' , deps: sys , check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.15, deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.14, deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.14, deps: local, check: false } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.13, deps: local, check: false } - { host: macos-13, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } - { host: macos-13, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: local, check: true } |
|
From: <sv...@op...> - 2024-03-28 07:15:00
|
Author: manx Date: Thu Mar 28 08:14:52 2024 New Revision: 20472 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20472 Log: [Mod] build: CI: GitHub: Update XCode on macOS 14 to 15.3. Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Tue Mar 26 14:19:54 2024 (r20471) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Thu Mar 28 08:14:52 2024 (r20472) @@ -13,24 +13,24 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '15.2', arch: '' , target: '' , deps: sys, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: small, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 14 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 13 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 12 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: arm64 , target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 11 , deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.15, deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.14, deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.14, deps: local, check: false } - - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-14, compiler: '15.3', arch: '' , target: '' , deps: sys , check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: arm64 , target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.15, deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.14, deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.14, deps: local, check: false } + - { host: macos-14, compiler: '15.3', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-14, compiler: '15.3', arch: i386 , target: 10.13, deps: local, check: false } - { host: macos-13, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } - { host: macos-13, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: local, check: true } |
|
From: <sv...@op...> - 2024-03-26 13:20:05
|
Author: manx Date: Tue Mar 26 14:19:54 2024 New Revision: 20471 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20471 Log: Merged revision(s) 20470 from trunk/OpenMPT: [Fix] Update Check: Cancel running Update Check when exiting OpenMPT and wait for the Update Check thread to exit. Fixes <https://bugs.openmpt.org/view.php?id=1760>. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/MainFrm.cpp branches/OpenMPT-1.31/mptrack/Mainfrm.h branches/OpenMPT-1.31/mptrack/UpdateCheck.cpp branches/OpenMPT-1.31/mptrack/UpdateCheck.h Modified: branches/OpenMPT-1.31/mptrack/MainFrm.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/MainFrm.cpp Tue Mar 26 14:18:31 2024 (r20470) +++ branches/OpenMPT-1.31/mptrack/MainFrm.cpp Tue Mar 26 14:19:54 2024 (r20471) @@ -370,6 +370,10 @@ } } +#if defined(MPT_ENABLE_UPDATE) + m_cancelUpdateCheck = true; +#endif // MPT_ENABLE_UPDATE + CChildFrame *pMDIActive = (CChildFrame *)MDIGetActive(); BeginWaitCursor(); @@ -395,6 +399,10 @@ m_InputHandler->m_activeCommandSet->SaveFile(TrackerSettings::Instance().m_szKbdFile); } +#if defined(MPT_ENABLE_UPDATE) + CUpdateCheck::WaitForUpdateCheckFinished(); +#endif // MPT_ENABLE_UPDATE + EndWaitCursor(); CMDIFrameWnd::OnClose(); } @@ -2699,6 +2707,10 @@ LRESULT CMainFrame::OnUpdateCheckProgress(WPARAM wparam, LPARAM lparam) { + if(m_cancelUpdateCheck) + { + return FALSE; + } bool isAutoUpdate = wparam != 0; CString updateText = MPT_CFORMAT("Checking for updates... {}%")(lparam); if(isAutoUpdate) Modified: branches/OpenMPT-1.31/mptrack/Mainfrm.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/Mainfrm.h Tue Mar 26 14:18:31 2024 (r20470) +++ branches/OpenMPT-1.31/mptrack/Mainfrm.h Tue Mar 26 14:19:54 2024 (r20471) @@ -312,6 +312,7 @@ #if defined(MPT_ENABLE_UPDATE) class CUpdateSetupDlg *m_UpdateOptionsDialog = nullptr; std::unique_ptr<UpdateCheckResult> m_updateCheckResult; + bool m_cancelUpdateCheck = false; #endif // MPT_ENABLE_UPDATE DWORD helpCookie = 0; bool m_bOptionsLocked = false; Modified: branches/OpenMPT-1.31/mptrack/UpdateCheck.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/UpdateCheck.cpp Tue Mar 26 14:18:31 2024 (r20470) +++ branches/OpenMPT-1.31/mptrack/UpdateCheck.cpp Tue Mar 26 14:19:54 2024 (r20471) @@ -461,6 +461,24 @@ } +void CUpdateCheck::WaitForUpdateCheckFinished() +{ + while(GetNumCurrentRunningInstances() > 0) + { + MSG msg; + while(::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + if(GetNumCurrentRunningInstances() > 0) + { + Sleep(1); + } + } +} + + // Start update check void CUpdateCheck::StartUpdateCheckAsync(bool isAutoUpdate) { Modified: branches/OpenMPT-1.31/mptrack/UpdateCheck.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/UpdateCheck.h Tue Mar 26 14:18:31 2024 (r20470) +++ branches/OpenMPT-1.31/mptrack/UpdateCheck.h Tue Mar 26 14:19:54 2024 (r20471) @@ -62,13 +62,15 @@ static std::vector<mpt::ustring> GetDefaultUpdateSigningKeysRootAnchors(); static mpt::ustring GetDefaultAPIURL(); - int32 GetNumCurrentRunningInstances(); + static int32 GetNumCurrentRunningInstances(); static bool IsSuitableUpdateMoment(); static void DoAutoUpdateCheck() { StartUpdateCheckAsync(true); } static void DoManualUpdateCheck() { StartUpdateCheckAsync(false); } + static void WaitForUpdateCheckFinished(); + public: struct Context |
|
From: <sv...@op...> - 2024-03-26 13:18:42
|
Author: manx Date: Tue Mar 26 14:18:31 2024 New Revision: 20470 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20470 Log: [Fix] Update Check: Cancel running Update Check when exiting OpenMPT and wait for the Update Check thread to exit. Fixes <https://bugs.openmpt.org/view.php?id=1760>. Modified: trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Mainfrm.h trunk/OpenMPT/mptrack/UpdateCheck.cpp trunk/OpenMPT/mptrack/UpdateCheck.h Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Sun Mar 24 19:18:34 2024 (r20469) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Tue Mar 26 14:18:31 2024 (r20470) @@ -375,6 +375,10 @@ } } +#if defined(MPT_ENABLE_UPDATE) + m_cancelUpdateCheck = true; +#endif // MPT_ENABLE_UPDATE + CChildFrame *pMDIActive = (CChildFrame *)MDIGetActive(); BeginWaitCursor(); @@ -400,6 +404,10 @@ m_InputHandler->m_activeCommandSet->SaveFile(TrackerSettings::Instance().m_szKbdFile); } +#if defined(MPT_ENABLE_UPDATE) + CUpdateCheck::WaitForUpdateCheckFinished(); +#endif // MPT_ENABLE_UPDATE + EndWaitCursor(); CMDIFrameWnd::OnClose(); } @@ -2765,6 +2773,10 @@ LRESULT CMainFrame::OnUpdateCheckProgress(WPARAM wparam, LPARAM lparam) { + if(m_cancelUpdateCheck) + { + return FALSE; + } bool isAutoUpdate = wparam != 0; CString updateText = MPT_CFORMAT("Checking for updates... {}%")(lparam); if(isAutoUpdate) Modified: trunk/OpenMPT/mptrack/Mainfrm.h ============================================================================== --- trunk/OpenMPT/mptrack/Mainfrm.h Sun Mar 24 19:18:34 2024 (r20469) +++ trunk/OpenMPT/mptrack/Mainfrm.h Tue Mar 26 14:18:31 2024 (r20470) @@ -191,6 +191,7 @@ #if defined(MPT_ENABLE_UPDATE) class CUpdateSetupDlg *m_UpdateOptionsDialog = nullptr; std::unique_ptr<UpdateCheckResult> m_updateCheckResult; + bool m_cancelUpdateCheck = false; #endif // MPT_ENABLE_UPDATE DWORD helpCookie = 0; bool m_bOptionsLocked = false; Modified: trunk/OpenMPT/mptrack/UpdateCheck.cpp ============================================================================== --- trunk/OpenMPT/mptrack/UpdateCheck.cpp Sun Mar 24 19:18:34 2024 (r20469) +++ trunk/OpenMPT/mptrack/UpdateCheck.cpp Tue Mar 26 14:18:31 2024 (r20470) @@ -462,6 +462,24 @@ } +void CUpdateCheck::WaitForUpdateCheckFinished() +{ + while(GetNumCurrentRunningInstances() > 0) + { + MSG msg; + while(::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + if(GetNumCurrentRunningInstances() > 0) + { + Sleep(1); + } + } +} + + // Start update check void CUpdateCheck::StartUpdateCheckAsync(bool isAutoUpdate) { Modified: trunk/OpenMPT/mptrack/UpdateCheck.h ============================================================================== --- trunk/OpenMPT/mptrack/UpdateCheck.h Sun Mar 24 19:18:34 2024 (r20469) +++ trunk/OpenMPT/mptrack/UpdateCheck.h Tue Mar 26 14:18:31 2024 (r20470) @@ -62,13 +62,15 @@ static std::vector<mpt::ustring> GetDefaultUpdateSigningKeysRootAnchors(); static mpt::ustring GetDefaultAPIURL(); - int32 GetNumCurrentRunningInstances(); + static int32 GetNumCurrentRunningInstances(); static bool IsSuitableUpdateMoment(); static void DoAutoUpdateCheck() { StartUpdateCheckAsync(true); } static void DoManualUpdateCheck() { StartUpdateCheckAsync(false); } + static void WaitForUpdateCheckFinished(); + public: struct Context |
|
From: <sv...@op...> - 2024-03-24 18:18:44
|
Author: sagamusix Date: Sun Mar 24 19:18:34 2024 New Revision: 20469 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20469 Log: Merged revision(s) 20468 from trunk/OpenMPT: [Var] ancient: Remove unused source files. ........ Deleted: branches/OpenMPT-1.31/include/ancient/src/SHR3Decompressor.cpp branches/OpenMPT-1.31/include/ancient/src/SHR3Decompressor.hpp branches/OpenMPT-1.31/include/ancient/src/SHRIDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/SHRIDecompressor.hpp Modified: branches/OpenMPT-1.31/ (props changed) |
|
From: <sv...@op...> - 2024-03-24 18:18:21
|
Author: sagamusix Date: Sun Mar 24 19:18:14 2024 New Revision: 20468 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20468 Log: [Var] ancient: Remove unused source files. Deleted: trunk/OpenMPT/include/ancient/src/SHR3Decompressor.cpp trunk/OpenMPT/include/ancient/src/SHR3Decompressor.hpp trunk/OpenMPT/include/ancient/src/SHRIDecompressor.cpp trunk/OpenMPT/include/ancient/src/SHRIDecompressor.hpp |
|
From: <sv...@op...> - 2024-03-24 16:34:10
|
Author: manx Date: Sun Mar 24 17:33:58 2024 New Revision: 20467 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20467 Log: Merged revision(s) 20463-20464 from trunk/OpenMPT: [Fix] Update: Avoid deprecated datetime.utcnow(). See <https://docs.python.org/3/library/datetime.html#datetime.datetime.utcnow>. ........ [Fix] Update: Avoid timezone information in formatted timestamp. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/installer/generate_update_json.py branches/OpenMPT-1.31/installer/generate_update_json_retro.py Modified: branches/OpenMPT-1.31/installer/generate_update_json.py ============================================================================== --- branches/OpenMPT-1.31/installer/generate_update_json.py Sun Mar 24 17:33:14 2024 (r20466) +++ branches/OpenMPT-1.31/installer/generate_update_json.py Sun Mar 24 17:33:58 2024 (r20467) @@ -163,7 +163,7 @@ update = { "OpenMPT " + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR: { "version": version, - "date": datetime.datetime.utcnow().isoformat(), + "date": datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).isoformat(), "announcement_url": announcement_url, "changelog_url": changelog_url, "downloads": { Modified: branches/OpenMPT-1.31/installer/generate_update_json_retro.py ============================================================================== --- branches/OpenMPT-1.31/installer/generate_update_json_retro.py Sun Mar 24 17:33:14 2024 (r20466) +++ branches/OpenMPT-1.31/installer/generate_update_json_retro.py Sun Mar 24 17:33:58 2024 (r20467) @@ -95,7 +95,7 @@ update = { "OpenMPT " + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR: { "version": version, - "date": datetime.datetime.utcnow().isoformat(), + "date": datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).isoformat(), "announcement_url": announcement_url, "changelog_url": changelog_url, "downloads": { |
|
From: <sv...@op...> - 2024-03-24 16:33:25
|
Author: sagamusix Date: Sun Mar 24 17:33:14 2024 New Revision: 20466 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20466 Log: Merged revision(s) 20465 from trunk/OpenMPT: [Mod] Channel Manager: Allow middle-click to open Quick Channel Settings for all formats. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/ChannelManagerDlg.cpp Modified: branches/OpenMPT-1.31/mptrack/ChannelManagerDlg.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/ChannelManagerDlg.cpp Sun Mar 24 17:32:55 2024 (r20465) +++ branches/OpenMPT-1.31/mptrack/ChannelManagerDlg.cpp Sun Mar 24 17:33:14 2024 (r20466) @@ -89,7 +89,7 @@ return m_show; } -void CChannelManagerDlg::Update(UpdateHint hint, CObject* pHint) +void CChannelManagerDlg::Update(UpdateHint hint, CObject *pHint) { if(!m_hWnd || !m_show) return; @@ -647,7 +647,7 @@ btn.left, btn.top, btn.Width(), btn.Height(), ftn); } } - ::SelectObject(bdc, (HBITMAP)NULL); + ::SelectObject(bdc, nullptr); ::DeleteDC(bdc); ::EndPaint(m_hWnd, &pDC); @@ -959,7 +959,7 @@ { CHANNELINDEX chn; CRect rect; - if(m_ModDoc != nullptr && (m_ModDoc->GetModType() & (MOD_TYPE_XM | MOD_TYPE_IT | MOD_TYPE_MPT)) && ButtonHit(point, &chn, &rect)) + if(m_ModDoc != nullptr && ButtonHit(point, &chn, &rect)) { ClientToScreen(&point); m_quickChannelProperties.Show(m_ModDoc, pattern[chn], point); |
|
From: <sv...@op...> - 2024-03-24 16:33:06
|
Author: sagamusix Date: Sun Mar 24 17:32:55 2024 New Revision: 20465 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20465 Log: [Mod] Channel Manager: Allow middle-click to open Quick Channel Settings for all formats. Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp Sun Mar 24 17:09:29 2024 (r20464) +++ trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp Sun Mar 24 17:32:55 2024 (r20465) @@ -91,7 +91,7 @@ return m_show; } -void CChannelManagerDlg::Update(UpdateHint hint, CObject* pHint) +void CChannelManagerDlg::Update(UpdateHint hint, CObject *pHint) { if(!m_hWnd || !m_show) return; @@ -613,7 +613,7 @@ btn.left, btn.top, btn.Width(), btn.Height(), ftn); } } - ::SelectObject(bdc, (HBITMAP)NULL); + ::SelectObject(bdc, nullptr); ::DeleteDC(bdc); ::EndPaint(m_hWnd, &pDC); @@ -925,7 +925,7 @@ { CHANNELINDEX chn; CRect rect; - if(m_ModDoc != nullptr && (m_ModDoc->GetModType() & (MOD_TYPE_XM | MOD_TYPE_IT | MOD_TYPE_MPT)) && ButtonHit(point, &chn, &rect)) + if(m_ModDoc != nullptr && ButtonHit(point, &chn, &rect)) { ClientToScreen(&point); m_quickChannelProperties.Show(m_ModDoc, pattern[chn], point); |
|
From: <sv...@op...> - 2024-03-24 16:09:44
|
Author: manx Date: Sun Mar 24 17:09:29 2024 New Revision: 20464 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20464 Log: [Fix] Update: Avoid timezone information in formatted timestamp. Modified: trunk/OpenMPT/installer/generate_update_json.py trunk/OpenMPT/installer/generate_update_json_retro.py Modified: trunk/OpenMPT/installer/generate_update_json.py ============================================================================== --- trunk/OpenMPT/installer/generate_update_json.py Sun Mar 24 13:34:43 2024 (r20463) +++ trunk/OpenMPT/installer/generate_update_json.py Sun Mar 24 17:09:29 2024 (r20464) @@ -163,7 +163,7 @@ update = { "OpenMPT " + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR: { "version": version, - "date": datetime.datetime.now(datetime.timezone.utc).isoformat(), + "date": datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).isoformat(), "announcement_url": announcement_url, "changelog_url": changelog_url, "downloads": { Modified: trunk/OpenMPT/installer/generate_update_json_retro.py ============================================================================== --- trunk/OpenMPT/installer/generate_update_json_retro.py Sun Mar 24 13:34:43 2024 (r20463) +++ trunk/OpenMPT/installer/generate_update_json_retro.py Sun Mar 24 17:09:29 2024 (r20464) @@ -95,7 +95,7 @@ update = { "OpenMPT " + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR: { "version": version, - "date": datetime.datetime.now(datetime.timezone.utc).isoformat(), + "date": datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).isoformat(), "announcement_url": announcement_url, "changelog_url": changelog_url, "downloads": { |
|
From: <sv...@op...> - 2024-03-24 12:34:56
|
Author: manx Date: Sun Mar 24 13:34:43 2024 New Revision: 20463 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20463 Log: [Fix] Update: Avoid deprecated datetime.utcnow(). See <https://docs.python.org/3/library/datetime.html#datetime.datetime.utcnow>. Modified: trunk/OpenMPT/installer/generate_update_json.py trunk/OpenMPT/installer/generate_update_json_retro.py Modified: trunk/OpenMPT/installer/generate_update_json.py ============================================================================== --- trunk/OpenMPT/installer/generate_update_json.py Sun Mar 24 13:21:01 2024 (r20462) +++ trunk/OpenMPT/installer/generate_update_json.py Sun Mar 24 13:34:43 2024 (r20463) @@ -163,7 +163,7 @@ update = { "OpenMPT " + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR: { "version": version, - "date": datetime.datetime.utcnow().isoformat(), + "date": datetime.datetime.now(datetime.timezone.utc).isoformat(), "announcement_url": announcement_url, "changelog_url": changelog_url, "downloads": { Modified: trunk/OpenMPT/installer/generate_update_json_retro.py ============================================================================== --- trunk/OpenMPT/installer/generate_update_json_retro.py Sun Mar 24 13:21:01 2024 (r20462) +++ trunk/OpenMPT/installer/generate_update_json_retro.py Sun Mar 24 13:34:43 2024 (r20463) @@ -95,7 +95,7 @@ update = { "OpenMPT " + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR: { "version": version, - "date": datetime.datetime.utcnow().isoformat(), + "date": datetime.datetime.now(datetime.timezone.utc).isoformat(), "announcement_url": announcement_url, "changelog_url": changelog_url, "downloads": { |
|
From: <sv...@op...> - 2024-03-24 12:21:07
|
Author: manx Date: Sun Mar 24 13:21:01 2024 New Revision: 20462 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20462 Log: [Mod] OpenMPT: Version is now 1.31.06.01 Modified: branches/OpenMPT-1.31/common/versionNumber.h Modified: branches/OpenMPT-1.31/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.31/common/versionNumber.h Sun Mar 24 13:18:58 2024 (r20461) +++ branches/OpenMPT-1.31/common/versionNumber.h Sun Mar 24 13:21:01 2024 (r20462) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 31 #define VER_MINOR 06 -#define VER_MINORMINOR 00 +#define VER_MINORMINOR 01 OPENMPT_NAMESPACE_END |
|
From: <sv...@op...> - 2024-03-24 12:19:09
|
Author: manx Date: Sun Mar 24 13:18:58 2024 New Revision: 20461 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20461 Log: [Mod] OpenMPT: Version is now 1.28.10.61 Modified: branches/OpenMPT-1.28/common/versionNumber.h Modified: branches/OpenMPT-1.28/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.28/common/versionNumber.h Sun Mar 24 13:18:57 2024 (r20460) +++ branches/OpenMPT-1.28/common/versionNumber.h Sun Mar 24 13:18:58 2024 (r20461) @@ -21,7 +21,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 28 #define VER_MINOR 10 -#define VER_MINORMINOR 60 +#define VER_MINORMINOR 61 //Numerical value of the version. #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR) |
|
From: <sv...@op...> - 2024-03-24 12:19:09
|
Author: manx Date: Sun Mar 24 13:18:57 2024 New Revision: 20460 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20460 Log: [Mod] libopenmpt: Bump patch version. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Mar 24 13:18:57 2024 (r20459) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Mar 24 13:18:57 2024 (r20460) @@ -5,6 +5,8 @@ For fully detailed change log, please see the source repository directly. This is just a high-level summary. +### libopenmpt 0.4.42-pre + ### libopenmpt 0.4.41 (2024-03-24) * [**Sec**] Undefined behaviour in song length calculation with nested loops Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Mar 24 13:18:57 2024 (r20459) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Mar 24 13:18:57 2024 (r20460) @@ -19,11 +19,11 @@ /*! \brief libopenmpt minor version number */ #define OPENMPT_API_VERSION_MINOR 4 /*! \brief libopenmpt patch version number */ -#define OPENMPT_API_VERSION_PATCH 41 +#define OPENMPT_API_VERSION_PATCH 42 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "" +#define OPENMPT_API_VERSION_PREREL "-pre.0" /*! \brief libopenmpt pre-release flag */ -#define OPENMPT_API_VERSION_IS_PREREL 0 +#define OPENMPT_API_VERSION_IS_PREREL 1 /*! \brief libopenmpt version number as a single integer value * \since 0.3 Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Mar 24 13:18:57 2024 (r20459) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Mar 24 13:18:57 2024 (r20460) @@ -1,8 +1,8 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=4 -LIBOPENMPT_VERSION_PATCH=41 -LIBOPENMPT_VERSION_PREREL= +LIBOPENMPT_VERSION_PATCH=42 +LIBOPENMPT_VERSION_PREREL=-pre.0 LIBOPENMPT_LTVER_CURRENT=1 -LIBOPENMPT_LTVER_REVISION=41 +LIBOPENMPT_LTVER_REVISION=42 LIBOPENMPT_LTVER_AGE=1 |
|
From: <sv...@op...> - 2024-03-24 12:19:08
|
Author: manx Date: Sun Mar 24 13:18:57 2024 New Revision: 20459 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20459 Log: tag libopenmpt-0.4.41 Added: tags/libopenmpt-0.4.41/ (props changed) - copied from r20458, branches/OpenMPT-1.28/ |
|
From: <sv...@op...> - 2024-03-24 12:19:07
|
Author: manx Date: Sun Mar 24 13:18:55 2024 New Revision: 20457 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20457 Log: [Mod] OpenMPT: Version is now 1.28.10.60 Modified: branches/OpenMPT-1.28/common/versionNumber.h Modified: branches/OpenMPT-1.28/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.28/common/versionNumber.h Sun Mar 24 13:18:40 2024 (r20456) +++ branches/OpenMPT-1.28/common/versionNumber.h Sun Mar 24 13:18:55 2024 (r20457) @@ -21,7 +21,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 28 #define VER_MINOR 10 -#define VER_MINORMINOR 59 +#define VER_MINORMINOR 60 //Numerical value of the version. #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR) |
3 messages has been excluded from this view by a project administrator.
