From a88ce50ba44584dfe6ee77c6f0a4ed754d704248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Fri, 16 Feb 2024 13:57:54 +0000 Subject: [PATCH] Merged revision(s) 20133 from trunk/OpenMPT: [Fix] mpt/osinfo/class.hpp: Avoid clashing with BSD macro on FreeBSD. Fixes . ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@20135 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- mptrack/MPTrackWine.cpp | 12 ++++++------ src/mpt/osinfo/class.hpp | 4 ++-- src/openmpt/sounddevice/SoundDeviceManager.cpp | 2 +- src/openmpt/sounddevice/SoundDevicePortAudio.cpp | 6 +++--- src/openmpt/sounddevice/SoundDeviceRtAudio.cpp | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mptrack/MPTrackWine.cpp b/mptrack/MPTrackWine.cpp index 856dee2dedc..ace6c57adc9 100644 --- a/mptrack/MPTrackWine.cpp +++ b/mptrack/MPTrackWine.cpp @@ -157,7 +157,7 @@ bool WineSetupIsSupported(mpt::OS::Wine::VersionContext & wineVersion) if(wineVersion.RawBuildID().empty()) supported = false; if(!TrackerSettings::Instance().WineSupportAllowUnknownHost) { - if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) && wineVersion.RawHostSysName() == "FreeBSD")) + if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) && wineVersion.RawHostSysName() == "FreeBSD")) { // ok } else @@ -425,7 +425,7 @@ void Initialize() script += std::string() + "\n"; - const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "gmake" : "make"); + const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "gmake" : "make"); std::vector commands; commands.push_back(make); @@ -490,7 +490,7 @@ void Initialize() winegcc.push_back("winegcc64-development"); } winegcc.push_back("winegcc-development"); - if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD) + if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_) { // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there. if constexpr(mpt::arch_bits == 32) { // 32bit winegcc probably cannot compile to 64bit @@ -511,7 +511,7 @@ void Initialize() winegcc.push_back("winegcc64"); } winegcc.push_back("winegcc"); - if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD) + if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_) { // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there. if constexpr(mpt::arch_bits == 32) { // 32bit winegcc probably cannot compile to 64bit @@ -601,7 +601,7 @@ void Initialize() script += std::string() + "{" + "\n"; script += std::string() + " echo 0" + "\n"; - script += std::string() + " " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" + "\n"; + script += std::string() + " " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" + "\n"; script += std::string() + " echo -n $? > stdexit.txt" + "\n"; script += std::string() + " echo 100" + "\n"; script += std::string() + "} | " + dialog.Progress("[OK] Prepare OpenMPT Wine Integration\\n[OK] Compile native support\\n[>>] Compile Wine wrapper\\n\\n[3/3] Compiling Wine wrapper ...") + "\n"; @@ -634,7 +634,7 @@ void Initialize() script += std::string() + " " + dialog.TextBox("stderr.txt") + "\n"; script += std::string() + "fi" + "\n"; - script += std::string() + "" + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" + "\n"; + script += std::string() + "" + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" + "\n"; script += std::string() + "if [ \"$?\" -ne \"0\" ] ; then" + "\n"; if(TrackerSettings::Instance().WineSupportCompileVerbosity >= 1) { diff --git a/src/mpt/osinfo/class.hpp b/src/mpt/osinfo/class.hpp index 2c997966034..9cf4f591b6e 100644 --- a/src/mpt/osinfo/class.hpp +++ b/src/mpt/osinfo/class.hpp @@ -31,7 +31,7 @@ enum class osclass { Windows, Linux, Darwin, - BSD, + BSD_, Haiku, DOS, }; @@ -47,7 +47,7 @@ inline mpt::osinfo::osclass get_class_from_sysname(const std::string & sysname) } else if (sysname == "Darwin") { result = mpt::osinfo::osclass::Darwin; } else if (sysname == "FreeBSD" || sysname == "DragonFly" || sysname == "NetBSD" || sysname == "OpenBSD" || sysname == "MidnightBSD") { - result = mpt::osinfo::osclass::BSD; + result = mpt::osinfo::osclass::BSD_; } else if (sysname == "Haiku") { result = mpt::osinfo::osclass::Haiku; } else if (sysname == "MS-DOS") { diff --git a/src/openmpt/sounddevice/SoundDeviceManager.cpp b/src/openmpt/sounddevice/SoundDeviceManager.cpp index 2c16527370e..108d718b90c 100644 --- a/src/openmpt/sounddevice/SoundDeviceManager.cpp +++ b/src/openmpt/sounddevice/SoundDeviceManager.cpp @@ -227,7 +227,7 @@ void Manager::ReEnumerate(bool firstRun) #if defined(MPT_WITH_PORTAUDIO) typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paJACK)].value = Info::DefaultFor::ProAudio; #endif - } else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD) + } else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD_) { #if defined(MPT_WITH_PORTAUDIO) typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paOSS)].value = Info::DefaultFor::System; diff --git a/src/openmpt/sounddevice/SoundDevicePortAudio.cpp b/src/openmpt/sounddevice/SoundDevicePortAudio.cpp index e8824552422..dda45f7b6fd 100644 --- a/src/openmpt/sounddevice/SoundDevicePortAudio.cpp +++ b/src/openmpt/sounddevice/SoundDevicePortAudio.cpp @@ -860,12 +860,12 @@ std::vector CPortaudioDevice::EnumerateDevices(ILogger &logge result.apiName = MPT_USTRING("OSS"); result.default_ = ((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == static_cast(dev)) ? Info::Default::Named : Info::Default::None); result.flags = { - sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable, + sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable, Info::Level::Primary, Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated, Info::Io::FullDuplex, - sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software, + sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software, Info::Implementor::External }; break; diff --git a/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp b/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp index 6f1e1d6fbba..50691e08d96 100644 --- a/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp +++ b/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp @@ -667,12 +667,12 @@ std::vector CRtAudioDevice::EnumerateDevices(ILogger &logger, info.apiName = MPT_USTRING("OSS"); info.default_ = (rtinfo.isDefaultOutput ? Info::Default::Named : Info::Default::None); info.flags = { - sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable, + sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable, Info::Level::Secondary, Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated, Info::Io::FullDuplex, - sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software, + sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software, Info::Implementor::External }; break;