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
(86) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-01-04 14:07:41
|
Author: manx Date: Sat Jan 4 15:07:17 2025 New Revision: 22785 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22785 Log: [Var] Regenerate project files. Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2019win7/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2019win81/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win7/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win81/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/xcode-ios/ext/mpg123.xcodeproj/project.pbxproj branches/OpenMPT-1.31/build/xcode-macosx/ext/mpg123.xcodeproj/project.pbxproj Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/mpg123.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/mpg123.vcxproj Sat Jan 4 15:05:33 2025 (r22784) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/mpg123.vcxproj Sat Jan 4 15:07:17 2025 (r22785) @@ -301,7 +301,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -324,7 +324,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -346,7 +346,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -373,7 +373,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -399,7 +399,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -427,7 +427,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -454,7 +454,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -476,7 +476,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -497,7 +497,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -524,7 +524,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -550,7 +550,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -578,7 +578,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/mpg123.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/mpg123.vcxproj Sat Jan 4 15:05:33 2025 (r22784) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/mpg123.vcxproj Sat Jan 4 15:07:17 2025 (r22785) @@ -301,7 +301,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -324,7 +324,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -346,7 +346,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -373,7 +373,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -399,7 +399,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -427,7 +427,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -454,7 +454,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -476,7 +476,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -497,7 +497,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -524,7 +524,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -550,7 +550,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -578,7 +578,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> Modified: branches/OpenMPT-1.31/build/vs2019win10/ext/mpg123.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/ext/mpg123.vcxproj Sat Jan 4 15:05:33 2025 (r22784) +++ branches/OpenMPT-1.31/build/vs2019win10/ext/mpg123.vcxproj Sat Jan 4 15:07:17 2025 (r22785) @@ -544,7 +544,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -569,7 +569,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -594,7 +594,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -618,7 +618,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -642,7 +642,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -672,7 +672,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -701,7 +701,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -730,7 +730,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -759,7 +759,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -790,7 +790,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -820,7 +820,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -850,7 +850,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -880,7 +880,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -904,7 +904,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -928,7 +928,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -952,7 +952,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -976,7 +976,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1006,7 +1006,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1035,7 +1035,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1064,7 +1064,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1093,7 +1093,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1124,7 +1124,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1154,7 +1154,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1184,7 +1184,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> Modified: branches/OpenMPT-1.31/build/vs2019win10uwp/ext/mpg123.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10uwp/ext/mpg123.vcxproj Sat Jan 4 15:05:33 2025 (r22784) +++ branches/OpenMPT-1.31/build/vs2019win10uwp/ext/mpg123.vcxproj Sat Jan 4 15:07:17 2025 (r22785) @@ -550,7 +550,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -577,7 +577,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -604,7 +604,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -630,7 +630,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -656,7 +656,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -688,7 +688,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -719,7 +719,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -750,7 +750,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -781,7 +781,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -814,7 +814,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -846,7 +846,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</Pr... [truncated message content] |
|
From: <sv...@op...> - 2025-01-04 14:05:39
|
Author: manx Date: Sat Jan 4 15:05:33 2025 New Revision: 22784 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22784 Log: Merged revision(s) 22774 from trunk/OpenMPT: [Mod] build: premake: mpg123: Use generic config.h. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/premake-xcode/ext-mpg123.lua branches/OpenMPT-1.31/build/premake/ext-mpg123.lua Modified: branches/OpenMPT-1.31/build/premake-xcode/ext-mpg123.lua ============================================================================== --- branches/OpenMPT-1.31/build/premake-xcode/ext-mpg123.lua Sat Jan 4 15:04:22 2025 (r22783) +++ branches/OpenMPT-1.31/build/premake-xcode/ext-mpg123.lua Sat Jan 4 15:05:33 2025 (r22784) @@ -8,7 +8,7 @@ dofile "../../build/premake-xcode/premake-defaults.lua" targetname "openmpt-mpg123" includedirs { - "../../include/mpg123/ports/Xcode", + "../../include/mpg123/ports/generic", "../../include/mpg123/src/include", } files { Modified: branches/OpenMPT-1.31/build/premake/ext-mpg123.lua ============================================================================== --- branches/OpenMPT-1.31/build/premake/ext-mpg123.lua Sat Jan 4 15:04:22 2025 (r22783) +++ branches/OpenMPT-1.31/build/premake/ext-mpg123.lua Sat Jan 4 15:05:33 2025 (r22784) @@ -6,7 +6,7 @@ mpt_kind "shared" targetname "openmpt-mpg123" includedirs { - "../../include/mpg123/ports/MSVC++", + "../../include/mpg123/ports/generic", "../../include/mpg123/src/include", } filter {} |
|
From: <sv...@op...> - 2025-01-04 14:04:34
|
Author: manx Date: Sat Jan 4 15:04:22 2025 New Revision: 22783 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22783 Log: Merged revision(s) 22773 from trunk/OpenMPT: [Mod] build: Makefile: mpg123: Use generic config.h. ........ Merged revision(s) 22778 from trunk/OpenMPT: [Fix] build: Makefile: Copy-paste-typo in r22773 broke ogg build. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/Makefile Modified: branches/OpenMPT-1.31/Makefile ============================================================================== --- branches/OpenMPT-1.31/Makefile Sat Jan 4 15:02:27 2025 (r22782) +++ branches/OpenMPT-1.31/Makefile Sat Jan 4 15:04:22 2025 (r22783) @@ -712,7 +712,7 @@ CPPFLAGS_MPG123 := -DMPT_WITH_MPG123 -DMPG123_NO_LARGENAME LDFLAGS_MPG123 := LDLIBS_MPG123 := -CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ +CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ LOCAL_MPG123_SOURCES := LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat.c LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat_str.c |
|
From: <sv...@op...> - 2025-01-04 14:02:45
|
Author: manx Date: Sat Jan 4 15:02:27 2025 New Revision: 22782 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22782 Log: Merged revision(s) 22772, 22779 from trunk/OpenMPT: [Ref] mpg123: Add generic config.h. ........ [Fix] mpg123: Fix DJGPP build. ........ Added: branches/OpenMPT-1.31/include/mpg123/ports/generic/ - copied from r22772, trunk/OpenMPT/include/mpg123/ports/generic/ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Sat Jan 4 12:35:40 2025 (r22781) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Sat Jan 4 15:02:27 2025 (r22782) @@ -1,5 +1,6 @@ libmpg123 library version 1.32.10 (2024-12-14). The following changes have been made: + * `ports/generic/config.h` has been added for build system independent builds. * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. * `ports/Xcode/config.h` has been retained from older versions. Modified: branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h ============================================================================== --- trunk/OpenMPT/include/mpg123/ports/generic/config.h Sat Jan 4 09:06:18 2025 (r22772) +++ branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h Sat Jan 4 15:02:27 2025 (r22782) @@ -52,7 +52,9 @@ /* yeah, POSIX ... */ #if defined(HAVE_POSIX_CRT) -#if defined(_FILE_OFFSET_BITS) +#if defined(__DJGPP__) +#define SIZEOF_OFF_T 4 +#elif defined(_FILE_OFFSET_BITS) #if (_FILE_OFFSET_BITS == 64) #define SIZEOF_OFF_T 8 #elif (_FILE_OFFSET_BITS == 32) @@ -77,8 +79,6 @@ #endif #elif defined(HAVE_MS_CRT) #define SIZEOF_OFF_T 4 -#elif defined(__DJGPP__) -#define SIZEOF_OFF_T 4 #else #define SIZEOF_OFF_T 8 #endif |
Author: manx Date: Sat Jan 4 12:35:40 2025 New Revision: 22781 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22781 Log: [Var] Regenerate project files. Modified: trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj.filters Modified: trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -602,7 +602,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -602,7 +602,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -611,7 +611,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -1559,7 +1559,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -1187,7 +1187,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -1289,7 +1289,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -623,7 +623,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -929,7 +929,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj Sat Jan 4 12:35:40 2025 (r22781) @@ -929,7 +929,6 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\sample.h" /> Modified: trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj.filters Sat Jan 4 12:33:38 2025 (r22780) +++ trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj.filters Sat Jan 4 12:35:40 2025 (r22781) @@ -7,9 +7,6 @@ <Filter Include="ports\generic"> <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> - <Filter Include="ports\makefile"> - <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> - </Filter> <Filter Include="src"> <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier> </Filter> @@ -30,9 +27,6 @@ <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> <Filter>ports\generic</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> - <Filter>ports\makefile</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h"> <Filter>src\common</Filter> </ClInclude> |
|
From: <sv...@op...> - 2025-01-04 11:33:45
|
Author: manx Date: Sat Jan 4 12:33:38 2025 New Revision: 22780 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22780 Log: [Ref] build: premake: mpg123: Remove ports/makefile/ from project files. Modified: trunk/OpenMPT/build/premake/ext-mpg123.lua Modified: trunk/OpenMPT/build/premake/ext-mpg123.lua ============================================================================== --- trunk/OpenMPT/build/premake/ext-mpg123.lua Sat Jan 4 12:31:59 2025 (r22779) +++ trunk/OpenMPT/build/premake/ext-mpg123.lua Sat Jan 4 12:33:38 2025 (r22780) @@ -11,7 +11,6 @@ } filter {} files { - "../../include/mpg123/ports/makefile/config.h", "../../include/mpg123/ports/generic/config.h", } files { |
|
From: <sv...@op...> - 2025-01-04 11:32:07
|
Author: manx Date: Sat Jan 4 12:31:59 2025 New Revision: 22779 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22779 Log: [Fix] mpg123: Fix DJGPP build. Modified: trunk/OpenMPT/include/mpg123/ports/generic/config.h Modified: trunk/OpenMPT/include/mpg123/ports/generic/config.h ============================================================================== --- trunk/OpenMPT/include/mpg123/ports/generic/config.h Sat Jan 4 11:12:11 2025 (r22778) +++ trunk/OpenMPT/include/mpg123/ports/generic/config.h Sat Jan 4 12:31:59 2025 (r22779) @@ -52,7 +52,9 @@ /* yeah, POSIX ... */ #if defined(HAVE_POSIX_CRT) -#if defined(_FILE_OFFSET_BITS) +#if defined(__DJGPP__) +#define SIZEOF_OFF_T 4 +#elif defined(_FILE_OFFSET_BITS) #if (_FILE_OFFSET_BITS == 64) #define SIZEOF_OFF_T 8 #elif (_FILE_OFFSET_BITS == 32) @@ -77,8 +79,6 @@ #endif #elif defined(HAVE_MS_CRT) #define SIZEOF_OFF_T 4 -#elif defined(__DJGPP__) -#define SIZEOF_OFF_T 4 #else #define SIZEOF_OFF_T 8 #endif |
|
From: <sv...@op...> - 2025-01-04 10:12:18
|
Author: manx Date: Sat Jan 4 11:12:11 2025 New Revision: 22778 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22778 Log: [Fix] build: Makefile: Copy-paste-typo in r22773 broke ogg build. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Sat Jan 4 09:31:06 2025 (r22777) +++ trunk/OpenMPT/Makefile Sat Jan 4 11:12:11 2025 (r22778) @@ -1004,7 +1004,7 @@ CPPFLAGS_OGG := -DMPT_WITH_OGG LDFLAGS_OGG := LDLIBS_OGG := -CPPFLAGS_OGG += -Iinclude/ogg/include/ -Iinclude/ogg/ports/generic/ +CPPFLAGS_OGG += -Iinclude/ogg/include/ -Iinclude/ogg/ports/makefile/ OGG_SOURCES := OGG_SOURCES += include/ogg/src/bitwise.c OGG_SOURCES += include/ogg/src/framing.c |
|
From: <sv...@op...> - 2025-01-04 08:31:18
|
Author: manx Date: Sat Jan 4 09:31:06 2025 New Revision: 22777 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22777 Log: Merged revision(s) 22768, 22771 from trunk/OpenMPT: [New] build: CI: GitHub: Add Cygwin Makefile builder. ........ [Fix] CI: Github: Cygwin: Cancel old jobs. ........ Added: branches/OpenMPT-1.31/.github/workflows/Cygwin-Makefile.yml - copied, changed from r22768, trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml Modified: branches/OpenMPT-1.31/ (props changed) Copied and modified: branches/OpenMPT-1.31/.github/workflows/Cygwin-Makefile.yml (from r22768, trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml Sat Jan 4 08:01:14 2025 (r22768, copy source) +++ branches/OpenMPT-1.31/.github/workflows/Cygwin-Makefile.yml Sat Jan 4 09:31:06 2025 (r22777) @@ -2,9 +2,11 @@ on: push: - branches: [ master ] - pull_request: - branches: [ master ] + branches: [ OpenMPT-1.31 ] + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true jobs: build: |
|
From: <sv...@op...> - 2025-01-04 08:30:15
|
Author: manx Date: Sat Jan 4 09:30:03 2025 New Revision: 22776 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22776 Log: Merged revision(s) 22756-22767 from trunk/OpenMPT: [Imp] build: Makefile: Add basic Cygwin support (without auto-detection). ........ [Imp] build: Makefile: Auto-detect Cygwin. ........ Added: branches/OpenMPT-1.31/build/make/config-cygwin.mk - copied, changed from r22767, trunk/OpenMPT/build/make/config-cygwin.mk Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/Makefile branches/OpenMPT-1.31/build/make/config-defaults.mk Modified: branches/OpenMPT-1.31/Makefile ============================================================================== --- branches/OpenMPT-1.31/Makefile Sat Jan 4 09:13:07 2025 (r22775) +++ branches/OpenMPT-1.31/Makefile Sat Jan 4 09:30:03 2025 (r22776) @@ -256,6 +256,27 @@ else ifeq ($(OS),Windows_NT) +ifeq ($(shell uname -o),Cygwin) + +HOST=unix +HOST_FLAVOUR=CYGWIN + +TOOLCHAIN_SUFFIX= + +CPPCHECK = cppcheck + +MKDIR_P = mkdir -p +RM = rm -f +RMTREE = rm -rf +INSTALL = install +INSTALL_MAKE_DIR = install -d +INSTALL_DIR = cp -r -v +FIXPATH = $1 + +NUMTHREADS:=$(NUMBER_OF_PROCESSORS) + +else + HOST=windows HOST_FLAVOUR= @@ -273,6 +294,8 @@ NUMTHREADS:=$(NUMBER_OF_PROCESSORS) +endif + else HOST=unix Copied and modified: branches/OpenMPT-1.31/build/make/config-cygwin.mk (from r22767, trunk/OpenMPT/build/make/config-cygwin.mk) ============================================================================== --- trunk/OpenMPT/build/make/config-cygwin.mk Sat Jan 4 07:53:11 2025 (r22767, copy source) +++ branches/OpenMPT-1.31/build/make/config-cygwin.mk Sat Jan 4 09:30:03 2025 (r22776) @@ -14,8 +14,6 @@ ifneq ($(STDCXX),) CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread -else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23) -CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20) CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread else @@ -23,8 +21,6 @@ endif ifneq ($(STDC),) CFLAGS_STDC = -std=$(STDC) -pthread -else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23) -CFLAGS_STDC = -std=c23 -pthread else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18) CFLAGS_STDC = -std=c18 -pthread else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17) Modified: branches/OpenMPT-1.31/build/make/config-defaults.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/config-defaults.mk Sat Jan 4 09:13:07 2025 (r22775) +++ branches/OpenMPT-1.31/build/make/config-defaults.mk Sat Jan 4 09:30:03 2025 (r22776) @@ -25,6 +25,10 @@ include build/make/config-mingw-w64.mk endif +else ifeq ($(HOST_FLAVOUR),CYGWIN) + +include build/make/config-cygwin.mk + else ifeq ($(HOST_FLAVOUR),LINUX) include build/make/config-gcc.mk |
|
From: <sv...@op...> - 2025-01-04 08:13:22
|
Author: manx Date: Sat Jan 4 09:13:07 2025 New Revision: 22775 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22775 Log: [Var] Regenerate project files. Modified: trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win7/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win8/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win81/ext/mpg123.vcxproj.filters trunk/OpenMPT/build/xcode-ios/ext/mpg123.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/ext/mpg123.xcodeproj/project.pbxproj Modified: trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj Sat Jan 4 09:08:54 2025 (r22774) +++ trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj Sat Jan 4 09:13:07 2025 (r22775) @@ -301,7 +301,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -324,7 +324,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -346,7 +346,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -373,7 +373,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -399,7 +399,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -427,7 +427,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -454,7 +454,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -476,7 +476,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -497,7 +497,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -524,7 +524,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -550,7 +550,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -578,7 +578,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -601,7 +601,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mpg123\ports\MSVC++\config.h" /> + <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters Sat Jan 4 09:08:54 2025 (r22774) +++ trunk/OpenMPT/build/vs2017winxp/ext/mpg123.vcxproj.filters Sat Jan 4 09:13:07 2025 (r22775) @@ -4,8 +4,8 @@ <Filter Include="ports"> <UniqueIdentifier>{FD8A2810-699F-50C1-3221-F4209EF44CF2}</UniqueIdentifier> </Filter> - <Filter Include="ports\MSVC++"> - <UniqueIdentifier>{5B499528-47AC-24CD-F031-5D83DC73F04F}</UniqueIdentifier> + <Filter Include="ports\generic"> + <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> <Filter Include="ports\makefile"> <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> @@ -27,8 +27,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mpg123\ports\MSVC++\config.h"> - <Filter>ports\MSVC++</Filter> + <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> + <Filter>ports\generic</Filter> </ClInclude> <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> <Filter>ports\makefile</Filter> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj Sat Jan 4 09:08:54 2025 (r22774) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj Sat Jan 4 09:13:07 2025 (r22775) @@ -301,7 +301,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -324,7 +324,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -346,7 +346,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -373,7 +373,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -399,7 +399,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -427,7 +427,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -454,7 +454,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -476,7 +476,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -497,7 +497,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -524,7 +524,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -550,7 +550,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -578,7 +578,7 @@ <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;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -601,7 +601,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mpg123\ports\MSVC++\config.h" /> + <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters Sat Jan 4 09:08:54 2025 (r22774) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/mpg123.vcxproj.filters Sat Jan 4 09:13:07 2025 (r22775) @@ -4,8 +4,8 @@ <Filter Include="ports"> <UniqueIdentifier>{FD8A2810-699F-50C1-3221-F4209EF44CF2}</UniqueIdentifier> </Filter> - <Filter Include="ports\MSVC++"> - <UniqueIdentifier>{5B499528-47AC-24CD-F031-5D83DC73F04F}</UniqueIdentifier> + <Filter Include="ports\generic"> + <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> <Filter Include="ports\makefile"> <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> @@ -27,8 +27,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mpg123\ports\MSVC++\config.h"> - <Filter>ports\MSVC++</Filter> + <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> + <Filter>ports\generic</Filter> </ClInclude> <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> <Filter>ports\makefile</Filter> Modified: trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj Sat Jan 4 09:08:54 2025 (r22774) +++ trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj Sat Jan 4 09:13:07 2025 (r22775) @@ -276,7 +276,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -301,7 +301,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -326,7 +326,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -356,7 +356,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -385,7 +385,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -416,7 +416,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -446,7 +446,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -470,7 +470,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -494,7 +494,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -524,7 +524,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -553,7 +553,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -584,7 +584,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0601;NTDDI_VERSION=0x06010000;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -610,7 +610,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mpg123\ports\MSVC++\config.h" /> + <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h" /> <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\abi_align.h" /> <ClInclude Include="..\..\..\include\mpg123\src\common\debug.h" /> Modified: trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters Sat Jan 4 09:08:54 2025 (r22774) +++ trunk/OpenMPT/build/vs2019win7/ext/mpg123.vcxproj.filters Sat Jan 4 09:13:07 2025 (r22775) @@ -4,8 +4,8 @@ <Filter Include="ports"> <UniqueIdentifier>{FD8A2810-699F-50C1-3221-F4209EF44CF2}</UniqueIdentifier> </Filter> - <Filter Include="ports\MSVC++"> - <UniqueIdentifier>{5B499528-47AC-24CD-F031-5D83DC73F04F}</UniqueIdentifier> + <Filter Include="ports\generic"> + <UniqueIdentifier>{09A36B38-7563-E76E-3E9E-30ECAA1D2C4B}</UniqueIdentifier> </Filter> <Filter Include="ports\makefile"> <UniqueIdentifier>{8A017C94-76CF-6F9A-5F63-E0C04BD04BFF}</UniqueIdentifier> @@ -27,8 +27,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mpg123\ports\MSVC++\config.h"> - <Filter>ports\MSVC++</Filter> + <ClInclude Include="..\..\..\include\mpg123\ports\generic\config.h"> + <Filter>ports\generic</Filter> </ClInclude> <ClInclude Include="..\..\..\include\mpg123\ports\makefile\config.h"> <Filter>ports\makefile</Filter> Modified: trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj Sat Jan 4 09:08:54 2025 (r22774) +++ trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj Sat Jan 4 09:13:07 2025 (r22775) @@ -696,7 +696,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -722,7 +722,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -748,7 +748,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -773,7 +773,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -798,7 +798,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000E;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -823,7 +823,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -854,7 +854,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -884,7 +884,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -914,7 +914,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -944,7 +944,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000E;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -974,7 +974,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1006,7 +1006,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1037,7 +1037,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1068,7 +1068,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1099,7 +1099,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000E;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -1130,7 +1130,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> @@ -1155,7 +1155,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <PreprocessorDefinitions>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=0x0A00;NTDDI_VERSION=0x0A00000C;DYNAMIC_BUILD;OPT_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\MSVC++;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\mpg123\ports\generic;..\..\..\include\mpg123\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat... [truncated message content] |
|
From: <sv...@op...> - 2025-01-04 08:09:06
|
Author: manx Date: Sat Jan 4 09:08:54 2025 New Revision: 22774 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22774 Log: [Mod] build: premake: mpg123: Use generic config.h. Modified: trunk/OpenMPT/build/premake-xcode/ext-mpg123.lua trunk/OpenMPT/build/premake/ext-mpg123.lua Modified: trunk/OpenMPT/build/premake-xcode/ext-mpg123.lua ============================================================================== --- trunk/OpenMPT/build/premake-xcode/ext-mpg123.lua Sat Jan 4 09:07:50 2025 (r22773) +++ trunk/OpenMPT/build/premake-xcode/ext-mpg123.lua Sat Jan 4 09:08:54 2025 (r22774) @@ -8,7 +8,7 @@ dofile "../../build/premake-xcode/premake-defaults.lua" targetname "openmpt-mpg123" includedirs { - "../../include/mpg123/ports/Xcode", + "../../include/mpg123/ports/generic", "../../include/mpg123/src/include", } files { Modified: trunk/OpenMPT/build/premake/ext-mpg123.lua ============================================================================== --- trunk/OpenMPT/build/premake/ext-mpg123.lua Sat Jan 4 09:07:50 2025 (r22773) +++ trunk/OpenMPT/build/premake/ext-mpg123.lua Sat Jan 4 09:08:54 2025 (r22774) @@ -6,13 +6,13 @@ mpt_kind "shared" targetname "openmpt-mpg123" includedirs { - "../../include/mpg123/ports/MSVC++", + "../../include/mpg123/ports/generic", "../../include/mpg123/src/include", } filter {} files { "../../include/mpg123/ports/makefile/config.h", - "../../include/mpg123/ports/MSVC++/config.h", + "../../include/mpg123/ports/generic/config.h", } files { "../../include/mpg123/src/common/abi_align.h", |
|
From: <sv...@op...> - 2025-01-04 08:08:02
|
Author: manx Date: Sat Jan 4 09:07:50 2025 New Revision: 22773 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22773 Log: [Mod] build: Makefile: mpg123: Use generic config.h. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Sat Jan 4 09:06:18 2025 (r22772) +++ trunk/OpenMPT/Makefile Sat Jan 4 09:07:50 2025 (r22773) @@ -824,7 +824,7 @@ CPPFLAGS_MPG123 := -DMPT_WITH_MPG123 -DMPG123_NO_LARGENAME LDFLAGS_MPG123 := LDLIBS_MPG123 := -CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ +CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ MPG123_SOURCES := MPG123_SOURCES += include/mpg123/src/compat/compat.c MPG123_SOURCES += include/mpg123/src/compat/compat_str.c @@ -858,8 +858,8 @@ ALL_DEPENDS += $(MPG123_DEPENDS) include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS) LIBS_MPG123 = bin/$(FLAVOUR_DIR)mpg123.a bin/$(FLAVOUR_DIR)mpg123.a: $(MPG123_OBJECTS) @@ -879,7 +879,7 @@ CPPFLAGS_MPG123 := -DMPT_WITH_MPG123 -DMPG123_NO_LARGENAME LDFLAGS_MPG123 := LDLIBS_MPG123 := -CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ +CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ MPG123_SOURCES := MPG123_SOURCES += include/mpg123/src/compat/compat.c MPG123_SOURCES += include/mpg123/src/compat/compat_str.c @@ -913,8 +913,8 @@ ALL_DEPENDS += $(MPG123_DEPENDS) include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS) LIBS_MPG123 = bin/$(FLAVOUR_DIR)mpg123$(SOSUFFIX) bin/$(FLAVOUR_DIR)mpg123$(SOSUFFIX): $(MPG123_OBJECTS) @@ -934,7 +934,7 @@ CPPFLAGS_MPG123 := -DMPT_WITH_MPG123 -DMPG123_NO_LARGENAME LDFLAGS_MPG123 := LDLIBS_MPG123 := -CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ +CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ MPG123_SOURCES := MPG123_SOURCES += include/mpg123/src/compat/compat.c MPG123_SOURCES += include/mpg123/src/compat/compat_str.c @@ -964,8 +964,8 @@ MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS) MPG123_OBJECTS = $(MPG123_SOURCES:.c=.mpg123$(FLAVOUR_O).o) MPG123_DEPENDS = $(MPG123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(MPG123_OBJECTS) @@ -1004,7 +1004,7 @@ CPPFLAGS_OGG := -DMPT_WITH_OGG LDFLAGS_OGG := LDLIBS_OGG := -CPPFLAGS_OGG += -Iinclude/ogg/include/ -Iinclude/ogg/ports/makefile/ +CPPFLAGS_OGG += -Iinclude/ogg/include/ -Iinclude/ogg/ports/generic/ OGG_SOURCES := OGG_SOURCES += include/ogg/src/bitwise.c OGG_SOURCES += include/ogg/src/framing.c |
|
From: <sv...@op...> - 2025-01-04 08:06:25
|
Author: manx Date: Sat Jan 4 09:06:18 2025 New Revision: 22772 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22772 Log: [Ref] mpg123: Add generic config.h. Added: trunk/OpenMPT/include/mpg123/ports/generic/ trunk/OpenMPT/include/mpg123/ports/generic/config.h (contents, props changed) Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/mpg123/OpenMPT.txt Sat Jan 4 08:44:53 2025 (r22771) +++ trunk/OpenMPT/include/mpg123/OpenMPT.txt Sat Jan 4 09:06:18 2025 (r22772) @@ -1,5 +1,6 @@ libmpg123 library version 1.32.10 (2024-12-14). The following changes have been made: + * `ports/generic/config.h` has been added for build system independent builds. * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. * `ports/Xcode/config.h` has been retained from older versions. Added: trunk/OpenMPT/include/mpg123/ports/generic/config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/include/mpg123/ports/generic/config.h Sat Jan 4 09:06:18 2025 (r22772) @@ -0,0 +1,137 @@ + +#include <stddef.h> + +#if defined(__MINGW32__) || defined(__MINGW64__) +#define HAVE_MINGW_CRT 1 +#elif defined(_MSC_VER) || defined(_UCRT) +#define HAVE_MS_CRT 1 +#else +#define HAVE_POSIX_CRT 1 +#endif + +/* C99 headers */ + +#define HAVE_INTTYPES_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_LOCALE_H 1 +#define HAVE_SIGNAL_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 + +/* Windows headers */ + +#if defined(_WIN32) +#define HAVE_WINDOWS_H 1 +#endif + +/* POSIX headers */ + +#if defined(HAVE_POSIX_CRT) || defined(HAVE_MINGW_CRT) +#define HAVE_STRINGS_H 1 +#endif +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 +#if defined(HAVE_POSIX_CRT) || defined(HAVE_MINGW_CRT) +#define HAVE_UNISTD_H 1 +#endif + +/* C99 functions */ + +#define HAVE_ATOLL 1 +#define HAVE_STRERROR 1 + +/* POSIX functions */ + +#if defined(HAVE_MS_CRT) +#define strcasecmp _strcmpi +#define strncasecmp _strnicmp +#endif + +/* yeah, POSIX ... */ + +#if defined(HAVE_POSIX_CRT) +#if defined(_FILE_OFFSET_BITS) +#if (_FILE_OFFSET_BITS == 64) +#define SIZEOF_OFF_T 8 +#elif (_FILE_OFFSET_BITS == 32) +#define SIZEOF_OFF_T 4 +#else +#define SIZEOF_OFF_T 4 +#endif +#else +#define SIZEOF_OFF_T 8 +#endif +#elif defined(HAVE_MINGW_CRT) +#if defined(_FILE_OFFSET_BITS) +#if (_FILE_OFFSET_BITS == 64) +#define SIZEOF_OFF_T 8 +#elif (_FILE_OFFSET_BITS == 32) +#define SIZEOF_OFF_T 4 +#else +#define SIZEOF_OFF_T 4 +#endif +#else +#define SIZEOF_OFF_T 4 +#endif +#elif defined(HAVE_MS_CRT) +#define SIZEOF_OFF_T 4 +#elif defined(__DJGPP__) +#define SIZEOF_OFF_T 4 +#else +#define SIZEOF_OFF_T 8 +#endif + +/* Features */ + +/* #define LFS_LARGEFILE_64 1 */ + +/* libmpg123 does not care about signals */ +#define NO_CATCHSIGNAL + +/* libmpg123 does not care about directories */ +#define NO_DIR + +/* libmpg123 does not care about environment variables */ +#define NO_ENV + +/* libmpg123 does not care about file mode */ +#define NO_FILEMODE + +/* We want some frame index, eh? */ +#define FRAME_INDEX 1 +#define INDEX_SIZE 1000 + +/* also gapless playback! */ +#define GAPLESS 1 + +/* new huffman decoding */ +#define USE_NEW_HUFFTABLE 1 + +/* Debugging */ + +/* #define DEBUG */ +/* #define EXTRA_DEBUG */ + +/* Precision */ + +/* use floating point */ +#define REAL_IS_FLOAT 1 + +/* floating point is IEEE754 */ +#if defined(_WIN32) +#define IEEE_FLOAT 1 +#endif + +/* use rounding instead of trunction */ +#define ACCURATE_ROUNDING 1 + +/* Platform */ + +/* use the unicode support within libmpg123 */ +#if defined(_WIN32) +#if defined(UNICODE) +#define WANT_WIN32_UNICODE 1 +#endif +#endif |
|
From: <sv...@op...> - 2025-01-04 07:45:00
|
Author: manx Date: Sat Jan 4 08:44:53 2025 New Revision: 22771 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22771 Log: [Fix] CI: Github: Cygwin: Cancel old jobs. Modified: trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml Sat Jan 4 08:43:39 2025 (r22770) +++ trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml Sat Jan 4 08:44:53 2025 (r22771) @@ -6,6 +6,10 @@ pull_request: branches: [ master ] +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: build: runs-on: windows-latest |
|
From: <sv...@op...> - 2025-01-04 07:43:46
|
Author: manx Date: Sat Jan 4 08:43:39 2025 New Revision: 22770 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22770 Log: Merged revision(s) 22769 from trunk/OpenMPT: [Fix] CI: Github: MSYS: Cancel old jobs. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/MSYS2-Autotools.yml branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile-Clang.yml branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/MSYS2-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/MSYS2-Autotools.yml Sat Jan 4 08:43:18 2025 (r22769) +++ branches/OpenMPT-1.31/.github/workflows/MSYS2-Autotools.yml Sat Jan 4 08:43:39 2025 (r22770) @@ -16,6 +16,9 @@ - { sys: MINGW64, rep: mingw64, env: x86_64 } - { sys: MINGW32, rep: mingw32, env: i686 } - { sys: UCRT64, rep: ucrt64, env: ucrt-x86_64 } + concurrency: + group: ${{github.ref}}-${{github.workflow}}-autotools-${{matrix.sys}}-${{matrix.rep}}-${{matrix.env}} + cancel-in-progress: true steps: - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 Modified: branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile-Clang.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile-Clang.yml Sat Jan 4 08:43:18 2025 (r22769) +++ branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile-Clang.yml Sat Jan 4 08:43:39 2025 (r22770) @@ -16,6 +16,9 @@ - { sys: MINGW64, rep: mingw64, env: x86_64 } - { sys: MINGW32, rep: mingw32, env: i686 } - { sys: UCRT64, rep: ucrt64, env: ucrt-x86_64 } + concurrency: + group: ${{github.ref}}-${{github.workflow}}-autotools-${{matrix.sys}}-${{matrix.rep}}-${{matrix.env}} + cancel-in-progress: true steps: - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 Modified: branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile.yml Sat Jan 4 08:43:18 2025 (r22769) +++ branches/OpenMPT-1.31/.github/workflows/MSYS2-Makefile.yml Sat Jan 4 08:43:39 2025 (r22770) @@ -16,6 +16,9 @@ - { sys: MINGW64, rep: mingw64, env: x86_64 } - { sys: MINGW32, rep: mingw32, env: i686 } - { sys: UCRT64, rep: ucrt64, env: ucrt-x86_64 } + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.sys}}-${{matrix.rep}}-${{matrix.env}} + cancel-in-progress: true steps: - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 |
|
From: <sv...@op...> - 2025-01-04 07:43:30
|
Author: manx Date: Sat Jan 4 08:43:18 2025 New Revision: 22769 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22769 Log: [Fix] CI: Github: MSYS: Cancel old jobs. Modified: trunk/OpenMPT/.github/workflows/MSYS2-Autotools.yml trunk/OpenMPT/.github/workflows/MSYS2-Makefile-Clang.yml trunk/OpenMPT/.github/workflows/MSYS2-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/MSYS2-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/MSYS2-Autotools.yml Sat Jan 4 08:01:14 2025 (r22768) +++ trunk/OpenMPT/.github/workflows/MSYS2-Autotools.yml Sat Jan 4 08:43:18 2025 (r22769) @@ -18,6 +18,9 @@ - { sys: MINGW64, rep: mingw64, env: x86_64 } - { sys: MINGW32, rep: mingw32, env: i686 } - { sys: UCRT64, rep: ucrt64, env: ucrt-x86_64 } + concurrency: + group: ${{github.ref}}-${{github.workflow}}-autotools-${{matrix.sys}}-${{matrix.rep}}-${{matrix.env}} + cancel-in-progress: true steps: - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 Modified: trunk/OpenMPT/.github/workflows/MSYS2-Makefile-Clang.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/MSYS2-Makefile-Clang.yml Sat Jan 4 08:01:14 2025 (r22768) +++ trunk/OpenMPT/.github/workflows/MSYS2-Makefile-Clang.yml Sat Jan 4 08:43:18 2025 (r22769) @@ -18,6 +18,9 @@ - { sys: MINGW64, rep: mingw64, env: x86_64 } - { sys: MINGW32, rep: mingw32, env: i686 } - { sys: UCRT64, rep: ucrt64, env: ucrt-x86_64 } + concurrency: + group: ${{github.ref}}-${{github.workflow}}-autotools-${{matrix.sys}}-${{matrix.rep}}-${{matrix.env}} + cancel-in-progress: true steps: - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 Modified: trunk/OpenMPT/.github/workflows/MSYS2-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/MSYS2-Makefile.yml Sat Jan 4 08:01:14 2025 (r22768) +++ trunk/OpenMPT/.github/workflows/MSYS2-Makefile.yml Sat Jan 4 08:43:18 2025 (r22769) @@ -18,6 +18,9 @@ - { sys: MINGW64, rep: mingw64, env: x86_64 } - { sys: MINGW32, rep: mingw32, env: i686 } - { sys: UCRT64, rep: ucrt64, env: ucrt-x86_64 } + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.sys}}-${{matrix.rep}}-${{matrix.env}} + cancel-in-progress: true steps: - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 |
|
From: <sv...@op...> - 2025-01-04 07:01:21
|
Author: manx Date: Sat Jan 4 08:01:14 2025 New Revision: 22768 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22768 Log: [New] build: CI: GitHub: Add Cygwin Makefile builder. Added: trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml Added: trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/Cygwin-Makefile.yml Sat Jan 4 08:01:14 2025 (r22768) @@ -0,0 +1,22 @@ +name: Cygwin Makefile + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - uses: cygwin/cygwin-install-action@master + with: + packages: subversion make gcc-core gcc-g++ autoconf autoconf-archive automake zlib-devel libmpg123-devel libogg-devel libvorbis-devel libsndfile-devel libflac-devel libSDL2-devel libportaudio-devel libportaudiocpp-devel libpulse-devel help2man doygen graphviz curl p7zip zip unzip perl-XML-XPath + - name: setup parallel make + run: bash -c 'echo MAKEFLAGS=-j${NUMBER_OF_PROCESSORS} >> $GITHUB_ENV' + - name: make + run: bash -c 'make' + - name: make check + run: bash -c 'make check' |
|
From: <sv...@op...> - 2025-01-04 06:53:18
|
Author: manx Date: Sat Jan 4 07:53:11 2025 New Revision: 22767 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22767 Log: [Imp] build: Makefile: Auto-detect Cygwin. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Jan 3 22:04:22 2025 (r22766) +++ trunk/OpenMPT/Makefile Sat Jan 4 07:53:11 2025 (r22767) @@ -287,6 +287,27 @@ else ifeq ($(OS),Windows_NT) +ifeq ($(shell uname -o),Cygwin) + +HOST=unix +HOST_FLAVOUR=CYGWIN + +TOOLCHAIN_SUFFIX= + +CPPCHECK = cppcheck + +MKDIR_P = mkdir -p +RM = rm -f +RMTREE = rm -rf +INSTALL = install +INSTALL_MAKE_DIR = install -d +INSTALL_DIR = cp -r -v +FIXPATH = $1 + +NUMTHREADS:=$(NUMBER_OF_PROCESSORS) + +else + HOST=windows HOST_FLAVOUR= @@ -304,6 +325,8 @@ NUMTHREADS:=$(NUMBER_OF_PROCESSORS) +endif + else HOST=unix |
|
From: <sv...@op...> - 2025-01-03 21:04:34
|
Author: manx Date: Fri Jan 3 22:04:22 2025 New Revision: 22766 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22766 Log: [Mod] libopenmpt: Bump prerel version. Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h Fri Jan 3 22:04:10 2025 (r22765) +++ branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h Fri Jan 3 22:04:22 2025 (r22766) @@ -23,7 +23,7 @@ /*! \brief libopenmpt patch version number */ #define OPENMPT_API_VERSION_PATCH 22 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "-pre.1" +#define OPENMPT_API_VERSION_PREREL "-pre.2" /*! \brief libopenmpt pre-release flag */ #define OPENMPT_API_VERSION_IS_PREREL 1 Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk Fri Jan 3 22:04:10 2025 (r22765) +++ branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk Fri Jan 3 22:04:22 2025 (r22766) @@ -1,7 +1,7 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=6 LIBOPENMPT_VERSION_PATCH=22 -LIBOPENMPT_VERSION_PREREL=-pre.1 +LIBOPENMPT_VERSION_PREREL=-pre.2 LIBOPENMPT_LTVER_CURRENT=3 LIBOPENMPT_LTVER_REVISION=22 |
|
From: <sv...@op...> - 2025-01-03 21:04:22
|
Author: manx Date: Fri Jan 3 22:04:10 2025 New Revision: 22765 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22765 Log: [Mod] libopenmpt: Bump prerel version. Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h ============================================================================== --- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h Fri Jan 3 22:03:17 2025 (r22764) +++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h Fri Jan 3 22:04:10 2025 (r22765) @@ -23,7 +23,7 @@ /*! \brief libopenmpt patch version number */ #define OPENMPT_API_VERSION_PATCH 13 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "-pre.1" +#define OPENMPT_API_VERSION_PREREL "-pre.2" /*! \brief libopenmpt pre-release flag */ #define OPENMPT_API_VERSION_IS_PREREL 1 Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk ============================================================================== --- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk Fri Jan 3 22:03:17 2025 (r22764) +++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk Fri Jan 3 22:04:10 2025 (r22765) @@ -1,7 +1,7 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=7 LIBOPENMPT_VERSION_PATCH=13 -LIBOPENMPT_VERSION_PREREL=-pre.1 +LIBOPENMPT_VERSION_PREREL=-pre.2 LIBOPENMPT_LTVER_CURRENT=4 LIBOPENMPT_LTVER_REVISION=13 |
|
From: <sv...@op...> - 2025-01-03 21:03:54
|
Author: manx Date: Fri Jan 3 22:03:17 2025 New Revision: 22764 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22764 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Fri Jan 3 22:03:11 2025 (r22763) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Fri Jan 3 22:03:17 2025 (r22764) @@ -7,6 +7,8 @@ ### libopenmpt 0.6.22-pre + * [**Bug**] Work-around broken user locale support on Cygwin. + * mpg123: Update to v1.32.10 (2024-12-14). * XMPlay SDK: Update to 2025-01-03. |
|
From: <sv...@op...> - 2025-01-03 21:03:20
|
Author: manx Date: Fri Jan 3 22:03:11 2025 New Revision: 22763 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22763 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Fri Jan 3 22:01:30 2025 (r22762) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Fri Jan 3 22:03:11 2025 (r22763) @@ -7,6 +7,8 @@ ### libopenmpt 0.7.13-pre + * [**Bug**] Work-around broken user locale support on Cygwin. + * mpg123: Update to v1.32.10 (2024-12-14). * XMPlay SDK: Update to 2025-01-03. |
|
From: <sv...@op...> - 2025-01-03 21:01:42
|
Author: manx Date: Fri Jan 3 22:01:30 2025 New Revision: 22762 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22762 Log: Merged revision(s) 22750 from trunk/OpenMPT: [Fix] mpt/string_transcode/transcode.hpp: Try to work-around Cygwin locale handling problems the same way we did in libopenmpt 0.5.x and earlier. See <https://cygwin.com/cgit/cygwin-packages/libopenmpt/tree/libopenmpt-0.7.12-1.src.patch?id=c4baa491e8a0975a1c7e0dfdf5ddf208d5b4ba6b>. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Modified: branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Fri Jan 3 22:00:55 2025 (r22761) +++ branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Fri Jan 3 22:01:30 2025 (r22762) @@ -11,6 +11,7 @@ #include "mpt/base/namespace.hpp" #include "mpt/base/saturate_cast.hpp" #include "mpt/detect/mfc.hpp" +#include "mpt/out_of_memory/out_of_memory.hpp" #include "mpt/string/types.hpp" #include <array> @@ -993,10 +994,60 @@ #elif !defined(MPT_COMPILER_QUIRK_NO_WCHAR) switch (encoding) { case logical_encoding::locale: +#if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) + try { + return encode_locale<Tdststring>(std::locale(""), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return encode_locale<Tdststring>(std::locale(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return encode_locale<Tdststring>(std::locale::classic(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + return encode_ascii<Tdststring>(src); +#else return encode_locale<Tdststring>(std::locale(""), src); +#endif break; case logical_encoding::active_locale: +#if defined(MPT_LIBCXX_QUIRK_BROKEN_ACTIVE_LOCALE) + try { + return encode_locale<Tdststring>(std::locale(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return encode_locale<Tdststring>(std::locale(""), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return encode_locale<Tdststring>(std::locale::classic(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + return encode_ascii<Tdststring>(src); +#else return encode_locale<Tdststring>(std::locale(), src); +#endif break; } throw std::domain_error("unsupported encoding"); @@ -1102,10 +1153,60 @@ #elif !defined(MPT_COMPILER_QUIRK_NO_WCHAR) switch (encoding) { case logical_encoding::locale: +#if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) + try { + return decode_locale(std::locale(""), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return decode_locale(std::locale(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return decode_locale(std::locale::classic(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + return decode_ascii(src); +#else return decode_locale(std::locale(""), src); +#endif break; case logical_encoding::active_locale: +#if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) + try { + return decode_locale(std::locale(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return decode_locale(std::locale(""), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + try { + return decode_locale(std::locale::classic(), src); + } catch (mpt::out_of_memory e) { + mpt::rethrow_out_of_memory(e); + } catch (...) { + // nothing + } + return decode_ascii(src); +#else return decode_locale(std::locale(), src); +#endif break; } throw std::domain_error("unsupported encoding"); |
|
From: <sv...@op...> - 2025-01-03 21:01:03
|
Author: manx Date: Fri Jan 3 22:00:55 2025 New Revision: 22761 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22761 Log: Merged revision(s) 22744 from trunk/OpenMPT: [Ref] mpt/base/detect_quirks.hpp: Add MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE and MPT_LIBCXX_QUIRK_BROKEN_ACTIVE_LOCALE for Cygwin. See <https://cygwin.com/cgit/cygwin-packages/libopenmpt/tree/libopenmpt-0.7.12-1.src.patch?id=c4baa491e8a0975a1c7e0dfdf5ddf208d5b4ba6b>. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp Modified: branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp Fri Jan 3 21:58:48 2025 (r22760) +++ branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp Fri Jan 3 22:00:55 2025 (r22761) @@ -135,6 +135,16 @@ +#if MPT_OS_CYGWIN +#define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +#endif + + + +// #define MPT_LIBCXX_QUIRK_BROKEN_ACTIVE_LOCALE + + + #if MPT_OS_MACOSX_OR_IOS #if defined(TARGET_OS_OSX) #if TARGET_OS_OSX |
3 messages has been excluded from this view by a project administrator.
