From: <man...@us...> - 2015-05-04 08:01:22
|
Revision: 5041 http://sourceforge.net/p/modplug/code/5041 Author: manxorist Date: 2015-05-04 08:01:15 +0000 (Mon, 04 May 2015) Log Message: ----------- [Mod] sounddev: Remove [Sound Settings]Enable* hidden settings. Allow switching off individual sound device backends via Components.Block* instead. Modified Paths: -------------- trunk/OpenMPT/mptrack/Mpdlgs.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/TrackerSettings.h trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp trunk/OpenMPT/sounddev/SoundDeviceASIO.h trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h trunk/OpenMPT/sounddev/SoundDeviceManager.cpp trunk/OpenMPT/sounddev/SoundDeviceManager.h trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp trunk/OpenMPT/sounddev/SoundDeviceWaveout.h Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-05-04 08:01:15 UTC (rev 5041) @@ -201,7 +201,7 @@ delete CMainFrame::GetMainFrame()->gpSoundDevice; CMainFrame::GetMainFrame()->gpSoundDevice = nullptr; } - theApp.GetSoundDevicesManager()->ReEnumerate(TrackerSettings::Instance().GetEnabledSoundDeviceTypes()); + theApp.GetSoundDevicesManager()->ReEnumerate(); SetDevice(m_CurrentDeviceInfo.GetIdentifier(), true); UpdateEverything(); } Modified: trunk/OpenMPT/mptrack/Mptrack.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-04 08:01:15 UTC (rev 5041) @@ -999,7 +999,7 @@ m_pMainWnd->DragAcceptFiles(); // Load sound APIs - m_pSoundDevicesManager = new SoundDevice::Manager(SoundDevice::AppInfo().SetName(MPT_USTRING("OpenMPT")).SetHWND(*m_pMainWnd), TrackerSettings::Instance().GetEnabledSoundDeviceTypes()); + m_pSoundDevicesManager = new SoundDevice::Manager(SoundDevice::AppInfo().SetName(MPT_USTRING("OpenMPT")).SetHWND(*m_pMainWnd)); if(TrackerSettings::Instance().m_SoundDeviceSettingsUseOldDefaults) { // get the old default device Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-04 08:01:15 UTC (rev 5041) @@ -725,19 +725,6 @@ } -SoundDevice::TypesSet TrackerSettings::GetEnabledSoundDeviceTypes() const -//----------------------------------------------------------------------- -{ - SoundDevice::TypesSet result; - for(int i = 0; i < SoundDevice::TypeNUM_DEVTYPES; ++i) - { - SoundDevice::Type type = static_cast<SoundDevice::Type>(i); - result[i] = conf.Read<bool>(MPT_USTRING("Sound Settings"), MPT_USTRING("Enable") + SoundDevice::TypeToString(type, true), true); - } - return result; -} - - MixerSettings TrackerSettings::GetMixerSettings() const //----------------------------------------------------- { Modified: trunk/OpenMPT/mptrack/TrackerSettings.h =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.h 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/mptrack/TrackerSettings.h 2015-05-04 08:01:15 UTC (rev 5041) @@ -453,8 +453,6 @@ SoundDevice::Settings GetSoundDeviceSettings(const SoundDevice::Identifier &device) const; void SetSoundDeviceSettings(const SoundDevice::Identifier &device, const SoundDevice::Settings &settings); - SoundDevice::TypesSet GetEnabledSoundDeviceTypes() const; - Setting<uint32> MixerMaxChannels; Setting<uint32> MixerDSPMask; Setting<uint32> MixerFlags; Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-04 08:01:15 UTC (rev 5041) @@ -31,6 +31,9 @@ #ifndef NO_ASIO +MPT_REGISTERED_COMPONENT(ComponentASIO) + + static const double AsioSampleRateTolerance = 0.05; Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-05-04 08:01:15 UTC (rev 5041) @@ -13,6 +13,8 @@ #include "SoundDevice.h" +#include "../common/ComponentManager.h" + #include "../common/FlagSet.h" #ifndef NO_ASIO @@ -30,6 +32,16 @@ #ifndef NO_ASIO +class ComponentASIO : public ComponentBuiltin +{ + MPT_DECLARE_COMPONENT_MEMBERS +public: + ComponentASIO() { } + virtual ~ComponentASIO() { } + std::string GetSettingsKey() const { return "ASIO"; } + virtual bool DoInitialize() { return true; } +}; + enum AsioFeatures { AsioFeatureResetRequest = 1<<0, Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-04 08:01:15 UTC (rev 5041) @@ -34,6 +34,9 @@ #ifndef NO_DSOUND +MPT_REGISTERED_COMPONENT(ComponentDirectSound) + + static BOOL WINAPI DSEnumCallbackW(GUID * lpGuid, LPCWSTR lpstrDescription, LPCWSTR, LPVOID lpContext) //---------------------------------------------------------------------------------------------------- { Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h 2015-05-04 08:01:15 UTC (rev 5041) @@ -14,6 +14,8 @@ #include "SoundDevice.h" #include "SoundDeviceUtilities.h" +#include "../common/ComponentManager.h" + #ifndef NO_DSOUND #include <dsound.h> #endif @@ -29,6 +31,16 @@ #ifndef NO_DSOUND +class ComponentDirectSound : public ComponentBuiltin +{ + MPT_DECLARE_COMPONENT_MEMBERS +public: + ComponentDirectSound() { } + virtual ~ComponentDirectSound() { } + std::string GetSettingsKey() const { return "DirectSound"; } + virtual bool DoInitialize() { return true; } +}; + //================================================ class CDSoundDevice: public CSoundDeviceWithThread //================================================ Modified: trunk/OpenMPT/sounddev/SoundDeviceManager.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-04 08:01:15 UTC (rev 5041) @@ -25,15 +25,15 @@ namespace SoundDevice { - + /////////////////////////////////////////////////////////////////////////////////////// // // Global Functions // -void Manager::ReEnumerate(SoundDevice::TypesSet enabledTypes) -//----------------------------------------------------------- +void Manager::ReEnumerate() +//------------------------- { m_SoundDevices.clear(); m_DeviceUnavailable.clear(); @@ -47,25 +47,27 @@ } #endif // NO_PORTAUDIO - if(enabledTypes[SoundDevice::TypeWAVEOUT]) + if(IsComponentAvailable(m_WaveOut)) { const std::vector<SoundDevice::Info> infos = CWaveDevice::EnumerateDevices(); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); } + #ifndef NO_ASIO - if(enabledTypes[SoundDevice::TypeASIO]) + if(IsComponentAvailable(m_ASIO)) { const std::vector<SoundDevice::Info> infos = CASIODevice::EnumerateDevices(); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); } #endif // NO_ASIO + #ifndef NO_PORTAUDIO - if(IsComponentAvailable(m_PortAudio) && enabledTypes[SoundDevice::TypePORTAUDIO_WASAPI]) + if(IsComponentAvailable(m_PortAudio)) { const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_WASAPI); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); } - if(IsComponentAvailable(m_PortAudio) && enabledTypes[SoundDevice::TypePORTAUDIO_WDMKS]) + if(IsComponentAvailable(m_PortAudio)) { const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_WDMKS); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); @@ -74,7 +76,7 @@ // kind of deprecated by now #ifndef NO_DSOUND - if(enabledTypes[SoundDevice::TypeDSOUND]) + if(IsComponentAvailable(m_DirectSound)) { const std::vector<SoundDevice::Info> infos = CDSoundDevice::EnumerateDevices(); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); @@ -83,17 +85,17 @@ // duplicate devices, only used if [Sound Settings]MorePortaudio=1 #ifndef NO_PORTAUDIO - if(IsComponentAvailable(m_PortAudio) && enabledTypes[SoundDevice::TypePORTAUDIO_WMME]) + if(IsComponentAvailable(m_PortAudio)) { const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_WMME); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); } - if(IsComponentAvailable(m_PortAudio) && enabledTypes[SoundDevice::TypePORTAUDIO_ASIO]) + if(IsComponentAvailable(m_PortAudio)) { const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_ASIO); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); } - if(IsComponentAvailable(m_PortAudio) && enabledTypes[SoundDevice::TypePORTAUDIO_DS]) + if(IsComponentAvailable(m_PortAudio)) { const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_DS); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); @@ -343,11 +345,11 @@ } -Manager::Manager(SoundDevice::AppInfo appInfo, SoundDevice::TypesSet enabledTypes) -//-------------------------------------------------------------------------------- +Manager::Manager(SoundDevice::AppInfo appInfo) +//-------------------------------------------- : m_AppInfo(appInfo) { - ReEnumerate(enabledTypes); + ReEnumerate(); } Modified: trunk/OpenMPT/sounddev/SoundDeviceManager.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceManager.h 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceManager.h 2015-05-04 08:01:15 UTC (rev 5041) @@ -22,6 +22,9 @@ namespace SoundDevice { +class ComponentWaveOut; +class ComponentDirectSound; +class ComponentASIO; class ComponentPortAudio; @@ -33,6 +36,13 @@ const SoundDevice::AppInfo m_AppInfo; + ComponentHandle<ComponentWaveOut> m_WaveOut; +#ifndef NO_DSOUND + ComponentHandle<ComponentDirectSound> m_DirectSound; +#endif // NO_DSOUND +#ifndef NO_ASIO + ComponentHandle<ComponentASIO> m_ASIO; +#endif // NO_ASIO #ifndef NO_PORTAUDIO ComponentHandle<ComponentPortAudio> m_PortAudio; #endif // NO_PORTAUDIO @@ -43,12 +53,12 @@ std::map<SoundDevice::Identifier, SoundDevice::DynamicCaps> m_DeviceDynamicCaps; public: - Manager(SoundDevice::AppInfo appInfo, SoundDevice::TypesSet enabledTypes); + Manager(SoundDevice::AppInfo appInfo); ~Manager(); public: - void ReEnumerate(SoundDevice::TypesSet enabledTypes); + void ReEnumerate(); std::vector<SoundDevice::Info>::const_iterator begin() const { return m_SoundDevices.begin(); } std::vector<SoundDevice::Info>::const_iterator end() const { return m_SoundDevices.end(); } Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-05-04 08:01:15 UTC (rev 5041) @@ -24,13 +24,16 @@ namespace SoundDevice { - + /////////////////////////////////////////////////////////////////////////////////////// // // MMSYSTEM WaveOut Device // +MPT_REGISTERED_COMPONENT(ComponentWaveOut) + + static const std::size_t WAVEOUT_MINBUFFERS = 3; static const std::size_t WAVEOUT_MAXBUFFERS = 4096; static const std::size_t WAVEOUT_MINBUFFERFRAMECOUNT = 8; Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceWaveout.h 2015-05-03 21:15:20 UTC (rev 5040) +++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.h 2015-05-04 08:01:15 UTC (rev 5041) @@ -14,6 +14,8 @@ #include "SoundDevice.h" #include "SoundDeviceUtilities.h" +#include "../common/ComponentManager.h" + #include <MMSystem.h> @@ -28,6 +30,18 @@ // MMSYSTEM WaveOut device // + +class ComponentWaveOut : public ComponentBuiltin +{ + MPT_DECLARE_COMPONENT_MEMBERS +public: + ComponentWaveOut() { } + virtual ~ComponentWaveOut() { } + std::string GetSettingsKey() const { return "WaveOut"; } + virtual bool DoInitialize() { return true; } +}; + + //============================================== class CWaveDevice: public CSoundDeviceWithThread //============================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-04 16:01:11
|
Revision: 5042 http://sourceforge.net/p/modplug/code/5042 Author: manxorist Date: 2015-05-04 16:01:05 +0000 (Mon, 04 May 2015) Log Message: ----------- [Ref] sounddev: Avoid empty internalID for the default DirectSound device. Use a zero-GUID instead. [Mod] OpenMPT: Version is now 1.25.00.04 Modified Paths: -------------- trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/TrackerSettings.h trunk/OpenMPT/sounddev/SoundDevice.h trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp Modified: trunk/OpenMPT/common/versionNumber.h =================================================================== --- trunk/OpenMPT/common/versionNumber.h 2015-05-04 08:01:15 UTC (rev 5041) +++ trunk/OpenMPT/common/versionNumber.h 2015-05-04 16:01:05 UTC (rev 5042) @@ -19,7 +19,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 25 #define VER_MINOR 00 -#define VER_MINORMINOR 03 +#define VER_MINORMINOR 04 //Version string. For example "1.17.02.28" #define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR) Modified: trunk/OpenMPT/mptrack/Mptrack.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-04 08:01:15 UTC (rev 5041) +++ trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-04 16:01:05 UTC (rev 5042) @@ -1010,6 +1010,46 @@ TrackerSettings::Instance().SetSoundDeviceSettings(it->GetIdentifier(), TrackerSettings::Instance().GetSoundDeviceSettingsDefaults()); } } + if(TrackerSettings::Instance().m_SoundDeviceDirectSoundOldDefaultIdentifier) + { + mpt::ustring oldIdentifier = SoundDevice::Legacy::GetDirectSoundDefaultDeviceIdentifierPre_1_25_00_04(); + mpt::ustring newIdentifier = SoundDevice::Legacy::GetDirectSoundDefaultDeviceIdentifier_1_25_00_04(); + if(!oldIdentifier.empty()) + { + SoundDevice::Info info = m_pSoundDevicesManager->FindDeviceInfo(newIdentifier); + if(info.IsValid()) + { + SoundDevice::Settings defaults = + TrackerSettings::Instance().m_SoundDeviceSettingsUseOldDefaults ? + TrackerSettings::Instance().GetSoundDeviceSettingsDefaults() + : + m_pSoundDevicesManager->GetDeviceCaps(newIdentifier).DefaultSettings + ; + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"Latency", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"Latency", Util::Round<int32>(defaults.Latency * 1000000.0))); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"UpdateInterval", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"UpdateInterval", Util::Round<int32>(defaults.UpdateInterval * 1000000.0))); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"SampleRate", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"SampleRate", defaults.Samplerate)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"Channels", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"Channels", defaults.Channels)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"SampleFormat", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"SampleFormat", defaults.sampleFormat)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"ExclusiveMode", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"ExclusiveMode", defaults.ExclusiveMode)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"BoostThreadPriority", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"BoostThreadPriority", defaults.BoostThreadPriority)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"KeepDeviceRunning", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"KeepDeviceRunning", defaults.KeepDeviceRunning)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"UseHardwareTiming", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"UseHardwareTiming", defaults.UseHardwareTiming)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"DitherType", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"DitherType", defaults.DitherType)); + m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"ChannelMapping", + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"ChannelMapping", defaults.ChannelMapping)); + } + } + } // Load DLS Banks if (!cmdInfo.m_bNoDls) LoadDefaultDLSBanks(); Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-04 08:01:15 UTC (rev 5041) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-04 16:01:05 UTC (rev 5042) @@ -178,6 +178,7 @@ , m_SoundSettingsStopMode(conf, "Sound Settings", "StopMode", SoundDeviceStopModeClosed) , m_SoundDeviceSettingsUseOldDefaults(false) , m_SoundDeviceID_DEPRECATED(SoundDevice::ID()) + , m_SoundDeviceDirectSoundOldDefaultIdentifier(false) , m_SoundDeviceIdentifier(conf, "Sound Settings", "Device", SoundDevice::Identifier()) , m_SoundDevicePreferSameTypeIfDeviceUnavailable(conf, "Sound Settings", "PreferSameTypeIfDeviceUnavailable", false) , MixerMaxChannels(conf, "Sound Settings", "MixChannels", MixerSettings().m_nMaxMixChannels) @@ -481,6 +482,10 @@ } m_SoundDeviceSettingsUseOldDefaults = true; } + if(storedVersion < MAKE_VERSION_NUMERIC(1,25,00,04)) + { + m_SoundDeviceDirectSoundOldDefaultIdentifier = true; + } if(storedVersion < MAKE_VERSION_NUMERIC(1,21,01,26)) { MixerFlags &= ~OLD_SOUNDSETUP_REVERSESTEREO; Modified: trunk/OpenMPT/mptrack/TrackerSettings.h =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.h 2015-05-04 08:01:15 UTC (rev 5041) +++ trunk/OpenMPT/mptrack/TrackerSettings.h 2015-05-04 16:01:05 UTC (rev 5042) @@ -445,6 +445,7 @@ SoundDevice::ID m_SoundDeviceID_DEPRECATED; SoundDevice::Settings m_SoundDeviceSettingsDefaults; SoundDevice::Settings GetSoundDeviceSettingsDefaults() const; + bool m_SoundDeviceDirectSoundOldDefaultIdentifier; Setting<SoundDevice::Identifier> m_SoundDeviceIdentifier; Setting<bool> m_SoundDevicePreferSameTypeIfDeviceUnavailable; Modified: trunk/OpenMPT/sounddev/SoundDevice.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-04 08:01:15 UTC (rev 5041) +++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-04 16:01:05 UTC (rev 5042) @@ -698,6 +698,13 @@ }; +namespace Legacy +{ +mpt::ustring GetDirectSoundDefaultDeviceIdentifierPre_1_25_00_04(); +mpt::ustring GetDirectSoundDefaultDeviceIdentifier_1_25_00_04(); +} + + } // namespace SoundDevice Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-04 08:01:15 UTC (rev 5041) +++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-04 16:01:05 UTC (rev 5042) @@ -37,6 +37,46 @@ MPT_REGISTERED_COMPONENT(ComponentDirectSound) + +namespace Legacy +{ +static BOOL WINAPI DSEnumCallbackGetDefaultName(GUID * lpGuid, LPCWSTR lpstrDescription, LPCWSTR, LPVOID lpContext) +{ + mpt::ustring & name = *reinterpret_cast<mpt::ustring*>(lpContext); + if(!lpGuid) + { + if(lpstrDescription) + { + name = mpt::ToUnicode(std::wstring(lpstrDescription)); + return FALSE; + } + } + return TRUE; +} +mpt::ustring GetDirectSoundDefaultDeviceIdentifierPre_1_25_00_04() +{ + mpt::ustring name = mpt::ustring(); + ComponentHandle<ComponentDirectSound> drectSound; + if(!IsComponentAvailable(drectSound)) + { + return name; + } + DirectSoundEnumerateW(DSEnumCallbackGetDefaultName, &name); + if(name.empty()) + { + return name; + } + std::string utf8String = mpt::ToCharset(mpt::CharsetUTF8, name); + mpt::ustring hexString = Util::BinToHex(std::vector<char>(utf8String.begin(), utf8String.end())); + return MPT_USTRING("DirectSound") + MPT_USTRING("_") + hexString; +} +mpt::ustring GetDirectSoundDefaultDeviceIdentifier_1_25_00_04() +{ + return MPT_USTRING("DirectSound_{00000000-0000-0000-0000-000000000000}"); +} +} + + static BOOL WINAPI DSEnumCallbackW(GUID * lpGuid, LPCWSTR lpstrDescription, LPCWSTR, LPVOID lpContext) //---------------------------------------------------------------------------------------------------- { @@ -56,6 +96,9 @@ if(lpGuid) { info.internalID = mpt::ToUnicode(Util::GUIDToString(*lpGuid)); + } else + { + info.internalID = mpt::ToUnicode(Util::GUIDToString(GUID())); } devices.push_back(info); return TRUE; @@ -115,9 +158,8 @@ ds = m_piDS; } else { - const mpt::ustring internalID = GetDeviceInternalID(); - GUID guid = internalID.empty() ? GUID() : Util::StringToGUID(mpt::ToWide(internalID)); - if(DirectSoundCreate(internalID.empty() ? NULL : &guid, &dummy, NULL) != DS_OK) + GUID guid = Util::StringToGUID(mpt::ToWide(GetDeviceInternalID())); + if(DirectSoundCreate(Util::IsValid(guid) ? &guid : NULL, &dummy, NULL) != DS_OK) { return caps; } @@ -158,9 +200,8 @@ ds = m_piDS; } else { - const mpt::ustring internalID = GetDeviceInternalID(); - GUID guid = internalID.empty() ? GUID() : Util::StringToGUID(mpt::ToWide(internalID)); - if(DirectSoundCreate(internalID.empty() ? NULL : &guid, &dummy, NULL) != DS_OK) + GUID guid = Util::StringToGUID(mpt::ToWide(GetDeviceInternalID())); + if(DirectSoundCreate(Util::IsValid(guid) ? &guid : NULL, &dummy, NULL) != DS_OK) { return caps; } @@ -213,9 +254,8 @@ DSBCAPS dsc; if(m_piDS) return true; - const mpt::ustring internalID = GetDeviceInternalID(); - GUID guid = internalID.empty() ? GUID() : Util::StringToGUID(mpt::ToWide(internalID)); - if(DirectSoundCreate(internalID.empty() ? NULL : &guid, &m_piDS, NULL) != DS_OK) return false; + GUID guid = Util::StringToGUID(mpt::ToWide(GetDeviceInternalID())); + if(DirectSoundCreate(Util::IsValid(guid) ? &guid : NULL, &m_piDS, NULL) != DS_OK) return false; if(!m_piDS) return false; if(m_piDS->SetCooperativeLevel(m_AppInfo.GetHWND(), m_Settings.ExclusiveMode ? DSSCL_WRITEPRIMARY : DSSCL_PRIORITY) != DS_OK) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-05 10:01:55
|
Revision: 5046 http://sourceforge.net/p/modplug/code/5046 Author: manxorist Date: 2015-05-05 10:01:42 +0000 (Tue, 05 May 2015) Log Message: ----------- [Ref] sounddev: Kill SoundDevice::ID and replace all occurences with the unique and stable SoundDevice::Identifier or a per-session unique SoundDevice::Manager::GlobalID. [Ref] sounddev: For WaveOut devices, store the WaveOut device index as string in internalID. [Ref] sounddev: Convert the PortAudio internalID from per-HostAPI index to the global PortAudio PA_DeviceIndex. This simplifies a whole lot of per-HostAPI device counting and confusing number conversions. [Mod] sounddev: Sort sound devices depending on OS version. [Mod] sounddev: Show PortAudio WDM-KS devices as WaveRT in Vista and newer. Modified Paths: -------------- trunk/OpenMPT/mptrack/Mpdlgs.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/TrackerSettings.h trunk/OpenMPT/sounddev/SoundDevice.cpp trunk/OpenMPT/sounddev/SoundDevice.h trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp trunk/OpenMPT/sounddev/SoundDeviceManager.cpp trunk/OpenMPT/sounddev/SoundDeviceManager.h trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp trunk/OpenMPT/sounddev/SoundDevicePortAudio.h trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp trunk/OpenMPT/sounddev/SoundDeviceWaveout.h Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -344,7 +344,6 @@ m_CbnDevice.ResetContent(); m_CbnDevice.SetImageList(&CMainFrame::GetMainFrame()->m_MiscIcons); - COMBOBOXEXITEM cbi; UINT iItem = 0; for(std::vector<SoundDevice::Info>::const_iterator it = theApp.GetSoundDevicesManager()->begin(); it != theApp.GetSoundDevicesManager()->end(); ++it) @@ -352,7 +351,7 @@ if(!TrackerSettings::Instance().m_MorePortaudio) { - if(it->id.GetType() == SoundDevice::TypePORTAUDIO_ASIO || it->id.GetType() == SoundDevice::TypePORTAUDIO_DS || it->id.GetType() == SoundDevice::TypePORTAUDIO_WMME) + if(it->type == SoundDevice::TypePORTAUDIO_DS || it->type == SoundDevice::TypePORTAUDIO_WMME) { // skip those portaudio apis that are already implemented via our own SoundDevice class // can be overwritten via [Sound Settings]MorePortaudio=1 @@ -361,53 +360,60 @@ } { + COMBOBOXEXITEM cbi; + MemsetZero(cbi); CString name = mpt::ToCString(it->name); - cbi.mask = CBEIF_IMAGE | CBEIF_LPARAM | CBEIF_TEXT | CBEIF_SELECTEDIMAGE | CBEIF_OVERLAY; + cbi.mask = CBEIF_LPARAM | CBEIF_TEXT | CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_OVERLAY; cbi.iItem = iItem; cbi.cchTextMax = 0; - switch(it->id.GetType()) + if(it->type == SoundDevice::TypeWAVEOUT) { - case SoundDevice::TypeWAVEOUT: - case SoundDevice::TypePORTAUDIO_WMME: cbi.iImage = IMAGE_WAVEOUT; - break; - case SoundDevice::TypeDSOUND: - case SoundDevice::TypePORTAUDIO_DS: + } else if(it->type == SoundDevice::TypePORTAUDIO_WMME) + { + cbi.iImage = IMAGE_WAVEOUT; + } else if(it->type == SoundDevice::TypeDSOUND) + { cbi.iImage = IMAGE_DIRECTX; - break; - case SoundDevice::TypeASIO: - case SoundDevice::TypePORTAUDIO_ASIO: + } else if(it->type == SoundDevice::TypePORTAUDIO_DS) + { + cbi.iImage = IMAGE_DIRECTX; + } else if(it->type == SoundDevice::TypeASIO) + { cbi.iImage = IMAGE_ASIO; - break; - case SoundDevice::TypePORTAUDIO_WASAPI: + } else if(it->type == SoundDevice::TypePORTAUDIO_WASAPI) + { // No real image available for now, // prepend API name to name and misuse another icon cbi.iImage = IMAGE_SAMPLEMUTE; - name = mpt::ToCString(it->apiName) + TEXT(" - ") + name; - break; - case SoundDevice::TypePORTAUDIO_WDMKS: + name = mpt::ToCString(it->apiName) + _T(" - ") + name; + } else if(it->type == SoundDevice::TypePORTAUDIO_WDMKS) + { // No real image available for now, // prepend API name to name and misuse another icon. cbi.iImage = IMAGE_CHIP; - name = mpt::ToCString(it->apiName) + TEXT(" - ") + name; - break; - default: - cbi.iImage = IMAGE_WAVEOUT; - break; + name = mpt::ToCString(it->apiName) + _T(" - ") + name; + } else + { + cbi.mask &= ~(CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_OVERLAY); + std::vector<mpt::ustring> api = it->apiPath; + api.push_back(it->apiName); + name = mpt::ToCString(mpt::String::Combine(api, MPT_USTRING(" - "))) + _T(" - ") + name; } if(it->isDefault) { - name += " (Default)"; + name += _T(" (Default)"); } cbi.iSelectedImage = cbi.iImage; cbi.iOverlay = cbi.iImage; cbi.iIndent = 0; - cbi.lParam = it->id.GetIdRaw(); - TCHAR tmp[256]; - _tcscpy(tmp, name); + cbi.lParam = theApp.GetSoundDevicesManager()->GetGlobalID(it->GetIdentifier()); + TCHAR tmp[1024]; + MemsetZero(tmp); + lstrcpyn(tmp, name, 1023); cbi.pszText = tmp; int pos = m_CbnDevice.InsertItem(&cbi); - if(cbi.lParam == m_CurrentDeviceInfo.id.GetIdRaw()) + if(static_cast<SoundDevice::Manager::GlobalID>(cbi.lParam) == theApp.GetSoundDevicesManager()->GetGlobalID(m_CurrentDeviceInfo.GetIdentifier())) { m_CbnDevice.SetCurSel(pos); } @@ -619,7 +625,7 @@ int n = m_CbnDevice.GetCurSel(); if(n >= 0) { - SetDevice(theApp.GetSoundDevicesManager()->FindDeviceInfo(SoundDevice::ID::FromIdRaw(m_CbnDevice.GetItemData(n))).GetIdentifier()); + SetDevice(theApp.GetSoundDevicesManager()->FindDeviceInfo(static_cast<SoundDevice::Manager::GlobalID>(m_CbnDevice.GetItemData(n))).GetIdentifier()); UpdateDevice(); OnSettingsChanged(); } @@ -646,7 +652,7 @@ //---------------------------------------------- { theApp.GetSoundDevicesManager()->OpenDriverSettings( - theApp.GetSoundDevicesManager()->FindDeviceInfo(SoundDevice::ID::FromIdRaw(m_CbnDevice.GetItemData(m_CbnDevice.GetCurSel()))).GetIdentifier(), + theApp.GetSoundDevicesManager()->FindDeviceInfo(static_cast<SoundDevice::Manager::GlobalID>(m_CbnDevice.GetItemData(m_CbnDevice.GetCurSel()))).GetIdentifier(), CMainFrame::GetMainFrame(), CMainFrame::GetMainFrame()->gpSoundDevice ); Modified: trunk/OpenMPT/mptrack/Mptrack.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -1003,7 +1003,7 @@ if(TrackerSettings::Instance().m_SoundDeviceSettingsUseOldDefaults) { // get the old default device - TrackerSettings::Instance().SetSoundDeviceIdentifier(m_pSoundDevicesManager->FindDeviceInfo(TrackerSettings::Instance().m_SoundDeviceID_DEPRECATED).GetIdentifier()); + TrackerSettings::Instance().SetSoundDeviceIdentifier(SoundDevice::Legacy::FindDeviceInfo(*m_pSoundDevicesManager, TrackerSettings::Instance().m_SoundDeviceID_DEPRECATED).GetIdentifier()); // apply old global sound device settings to each found device for(std::vector<SoundDevice::Info>::const_iterator it = m_pSoundDevicesManager->begin(); it != m_pSoundDevicesManager->end(); ++it) { Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -177,7 +177,7 @@ , m_SoundSettingsOpenDeviceAtStartup(conf, "Sound Settings", "OpenDeviceAtStartup", false) , m_SoundSettingsStopMode(conf, "Sound Settings", "StopMode", SoundDeviceStopModeClosed) , m_SoundDeviceSettingsUseOldDefaults(false) - , m_SoundDeviceID_DEPRECATED(SoundDevice::ID()) + , m_SoundDeviceID_DEPRECATED(SoundDevice::Legacy::ID()) , m_SoundDeviceDirectSoundOldDefaultIdentifier(false) , m_SoundDeviceIdentifier(conf, "Sound Settings", "Device", SoundDevice::Identifier()) , m_SoundDevicePreferSameTypeIfDeviceUnavailable(conf, "Sound Settings", "PreferSameTypeIfDeviceUnavailable", false) @@ -426,7 +426,7 @@ } if(storedVersion < MAKE_VERSION_NUMERIC(1,22,07,04)) { - m_SoundDeviceID_DEPRECATED = conf.Read<SoundDevice::ID>("Sound Settings", "WaveDevice", SoundDevice::ID()); + m_SoundDeviceID_DEPRECATED = conf.Read<SoundDevice::Legacy::ID>("Sound Settings", "WaveDevice", SoundDevice::Legacy::ID()); Setting<uint32> m_BufferLength_DEPRECATED(conf, "Sound Settings", "BufferLength", 50); Setting<uint32> m_LatencyMS(conf, "Sound Settings", "Latency", Util::Round<int32>(SoundDevice::Settings().Latency * 1000.0)); Setting<uint32> m_UpdateIntervalMS(conf, "Sound Settings", "UpdateInterval", Util::Round<int32>(SoundDevice::Settings().UpdateInterval * 1000.0)); @@ -441,7 +441,7 @@ { if(m_BufferLength_DEPRECATED < 1) m_BufferLength_DEPRECATED = 1; // 1ms if(m_BufferLength_DEPRECATED > 1000) m_BufferLength_DEPRECATED = 1000; // 1sec - if(m_SoundDeviceID_DEPRECATED.GetType() == SoundDevice::TypeASIO) + if((m_SoundDeviceID_DEPRECATED & SoundDevice::Legacy::MaskType) == SoundDevice::Legacy::TypeASIO) { m_LatencyMS = m_BufferLength_DEPRECATED; m_UpdateIntervalMS = m_BufferLength_DEPRECATED / 8; @@ -649,7 +649,7 @@ ChannelMapping = SoundDevice::ChannelMapping(Channels); } // store informational data (not read back, just to allow the user to mock with the raw ini file) - conf.Write(L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"ID", deviceInfo.id); + conf.Write(L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"Type", deviceInfo.type); conf.Write(L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"InternalID", deviceInfo.internalID); conf.Write(L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"API", deviceInfo.apiName); conf.Write(L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"Name", deviceInfo.name); Modified: trunk/OpenMPT/mptrack/TrackerSettings.h =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.h 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/mptrack/TrackerSettings.h 2015-05-05 10:01:42 UTC (rev 5046) @@ -261,9 +261,6 @@ template<> inline SettingValue ToSettingValue(const std::vector<uint32> &val) { return mpt::String::Combine(val); } template<> inline std::vector<uint32> FromSettingValue(const SettingValue &val) { return mpt::String::Split<uint32>(val); } -template<> inline SettingValue ToSettingValue(const SoundDevice::ID &val) { return SettingValue(int32(val.GetIdRaw())); } -template<> inline SoundDevice::ID FromSettingValue(const SettingValue &val) { return SoundDevice::ID::FromIdRaw(val.as<int32>()); } - template<> inline SettingValue ToSettingValue(const SampleFormat &val) { return SettingValue(int32(val.value)); } template<> inline SampleFormat FromSettingValue(const SettingValue &val) { return SampleFormatEnum(val.as<int32>()); } @@ -442,7 +439,7 @@ Setting<SoundDeviceStopMode> m_SoundSettingsStopMode; bool m_SoundDeviceSettingsUseOldDefaults; - SoundDevice::ID m_SoundDeviceID_DEPRECATED; + SoundDevice::Legacy::ID m_SoundDeviceID_DEPRECATED; SoundDevice::Settings m_SoundDeviceSettingsDefaults; SoundDevice::Settings GetSoundDeviceSettingsDefaults() const; bool m_SoundDeviceDirectSoundOldDefaultIdentifier; Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -16,6 +16,7 @@ #include "../common/misc_util.h" #include "../common/StringFixer.h" +#include <map> OPENMPT_NAMESPACE_BEGIN @@ -24,24 +25,6 @@ namespace SoundDevice { -mpt::ustring TypeToString(SoundDevice::Type type, bool verbose) -//------------------------------------------------------------- -{ - switch(type) - { - case TypeWAVEOUT: return MPT_USTRING("WaveOut"); break; - case TypeDSOUND: return MPT_USTRING("DirectSound"); break; - case TypeASIO: return MPT_USTRING("ASIO"); break; - case TypePORTAUDIO_WASAPI: return (verbose ? MPT_USTRING("PortAudio") : MPT_USTRING("")) + MPT_USTRING("WASAPI"); break; - case TypePORTAUDIO_WDMKS: return (verbose ? MPT_USTRING("PortAudio") : MPT_USTRING("")) + MPT_USTRING("WDM-KS"); break; - case TypePORTAUDIO_WMME: return (verbose ? MPT_USTRING("PortAudio") : MPT_USTRING("")) + MPT_USTRING("MME"); break; - case TypePORTAUDIO_DS: return (verbose ? MPT_USTRING("PortAudio") : MPT_USTRING("")) + MPT_USTRING("DS"); break; - case TypePORTAUDIO_ASIO: return (verbose ? MPT_USTRING("PortAudio") : MPT_USTRING("")) + MPT_USTRING("ASIO"); break; - } - return mpt::ustring(); -} - - ChannelMapping::ChannelMapping() //------------------------------ { Modified: trunk/OpenMPT/sounddev/SoundDevice.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-05 10:01:42 UTC (rev 5046) @@ -17,8 +17,6 @@ #include "../common/mptAtomic.h" #include "../soundlib/SampleFormat.h" -#include <bitset> -#include <map> #include <vector> @@ -110,107 +108,35 @@ // SoundDevice::Base Interface // -enum Type -{ - // do not change old values, these get saved to the ini - TypeINVALID =-1, - TypeWAVEOUT = 0, - TypeDSOUND = 1, - TypeASIO = 2, - TypePORTAUDIO_WASAPI = 3, - TypePORTAUDIO_WDMKS = 4, - TypePORTAUDIO_WMME = 5, - TypePORTAUDIO_DS = 6, - TypePORTAUDIO_ASIO = 7, - TypeNUM_DEVTYPES -}; -typedef std::bitset<TypeNUM_DEVTYPES> TypesSet; +static const MPT_UCHAR_TYPE TypeWAVEOUT [] = MPT_ULITERAL("WaveOut"); +static const MPT_UCHAR_TYPE TypeDSOUND [] = MPT_ULITERAL("DirectSound"); +static const MPT_UCHAR_TYPE TypeASIO [] = MPT_ULITERAL("ASIO"); +static const MPT_UCHAR_TYPE TypePORTAUDIO_WASAPI [] = MPT_ULITERAL("WASAPI"); +static const MPT_UCHAR_TYPE TypePORTAUDIO_WDMKS [] = MPT_ULITERAL("WDM-KS"); +static const MPT_UCHAR_TYPE TypePORTAUDIO_WMME [] = MPT_ULITERAL("MME"); +static const MPT_UCHAR_TYPE TypePORTAUDIO_DS [] = MPT_ULITERAL("DS"); -mpt::ustring TypeToString(SoundDevice::Type type, bool verbose = false); +typedef mpt::ustring Type; -typedef uint8 Index; -template<typename T> -bool IndexIsValid(const T & x) -{ - return 0 <= x && x <= std::numeric_limits<Index>::max(); -} - -//====== -class ID -//====== -{ -private: - SoundDevice::Type type; - SoundDevice::Index index; -public: - ID() : type(TypeWAVEOUT), index(0) {} - ID(SoundDevice::Type type, SoundDevice::Index index) - : type(type) - , index(index) - { - return; - } - bool IsValid() const - { - return (type > TypeINVALID); - } - SoundDevice::Type GetType() const { return type; } - SoundDevice::Index GetIndex() const { return index; } - bool operator == (const SoundDevice::ID &cmp) const - { - return (type == cmp.type) && (index == cmp.index); - } - - bool operator != (const SoundDevice::ID &cmp) const - { - return (type != cmp.type) || (index != cmp.index); - } - bool operator < (const SoundDevice::ID &cmp) const - { - return (type < cmp.type) || (type == cmp.type && index < cmp.index); - } -public: - // Do not change these. These functions are used to manipulate the value that gets stored in the settings. - template<typename T> - static SoundDevice::ID FromIdRaw(T id_) - { - uint16 id = static_cast<uint16>(id_); - return SoundDevice::ID((SoundDevice::Type)((id>>8)&0xff), (id>>0)&0xff); - } - uint16 GetIdRaw() const - { - return static_cast<uint16>(((int)type<<8) | (index<<0)); - } -}; - - typedef mpt::ustring Identifier; SoundDevice::Type ParseType(const SoundDevice::Identifier &identifier); - struct Info { - SoundDevice::ID id; - mpt::ustring name; - mpt::ustring apiName; + SoundDevice::Type type; mpt::ustring internalID; + mpt::ustring name; // user visible + mpt::ustring apiName; // user visible + std::vector<mpt::ustring> apiPath; // i.e. Wine-support, PortAudio bool isDefault; - Info() : id(TypeINVALID, 0), isDefault(false) { } - Info(SoundDevice::ID id, const mpt::ustring &name, const mpt::ustring &apiName, const mpt::ustring &internalID = mpt::ustring()) - : id(id) - , name(name) - , apiName(apiName) - , internalID(internalID) - , isDefault(false) - { - return; - } + bool useNameAsIdentifier; + Info() : isDefault(false), useNameAsIdentifier(false) { } bool IsValid() const { - return id.IsValid(); + return !type.empty() && !internalID.empty(); } SoundDevice::Identifier GetIdentifier() const { @@ -218,13 +144,11 @@ { return mpt::ustring(); } - mpt::ustring result = apiName; + mpt::ustring result = mpt::ustring(); + result += type; result += MPT_USTRING("_"); - if(!internalID.empty()) + if(useNameAsIdentifier) { - result += internalID; // safe to not contain special characters - } else if(!name.empty()) - { // UTF8-encode the name and convert the utf8 to hex. // This ensures that no special characters are contained in the configuration key. std::string utf8String = mpt::ToCharset(mpt::CharsetUTF8, name); @@ -232,7 +156,7 @@ result += hexString; } else { - result += mpt::ufmt::dec(id.GetIndex()); + result += internalID; // safe to not contain special characters } return result; } @@ -604,9 +528,7 @@ protected: - SoundDevice::ID GetDeviceID() const { return m_Info.id; } - SoundDevice::Type GetDeviceType() const { return m_Info.id.GetType(); } - SoundDevice::Index GetDeviceIndex() const { return m_Info.id.GetIndex(); } + SoundDevice::Type GetDeviceType() const { return m_Info.type; } mpt::ustring GetDeviceInternalID() const { return m_Info.internalID; } SoundDevice::Identifier GetDeviceIdentifier() const { return m_Info.GetIdentifier(); } @@ -700,6 +622,16 @@ namespace Legacy { +typedef uint16 ID; +static const SoundDevice::Legacy::ID MaskType = 0xff00; +static const SoundDevice::Legacy::ID MaskIndex = 0x00ff; +static const SoundDevice::Legacy::ID TypeWAVEOUT = 0; +static const SoundDevice::Legacy::ID TypeDSOUND = 1; +static const SoundDevice::Legacy::ID TypeASIO = 2; +static const SoundDevice::Legacy::ID TypePORTAUDIO_WASAPI = 3; +static const SoundDevice::Legacy::ID TypePORTAUDIO_WDMKS = 4; +static const SoundDevice::Legacy::ID TypePORTAUDIO_WMME = 5; +static const SoundDevice::Legacy::ID TypePORTAUDIO_DS = 6; mpt::ustring GetDirectSoundDefaultDeviceIdentifierPre_1_25_00_04(); mpt::ustring GetDirectSoundDefaultDeviceIdentifier_1_25_00_04(); } Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -158,11 +158,14 @@ if(Util::IsCLSID(mpt::ToWide(internalID))) { Log(mpt::String::Print("ASIO: clsid=%1", mpt::ToLocale(internalID))); - if(SoundDevice::IndexIsValid(devices.size())) - { - // everything ok - devices.push_back(SoundDevice::Info(SoundDevice::ID(TypeASIO, static_cast<SoundDevice::Index>(devices.size())), description, SoundDevice::TypeToString(TypeASIO), internalID)); - } + SoundDevice::Info info; + info.type = TypeASIO; + info.internalID = internalID; + info.apiName = MPT_USTRING("ASIO"); + info.name = description; + info.useNameAsIdentifier = false; + info.isDefault = false; + devices.push_back(info); } } @@ -255,8 +258,7 @@ InitMembers(); - Log(mpt::String::Print("ASIO: Open(%1:'%2'): %3-bit, %4 channels, %5Hz, hw-timing=%6" - , GetDeviceIndex() + Log(mpt::String::Print("ASIO: Open('%1'): %2-bit, %3 channels, %4Hz, hw-timing=%5" , mpt::ToLocale(GetDeviceInternalID()) , m_Settings.sampleFormat.GetBitsPerSample() , m_Settings.Channels Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -85,21 +85,20 @@ { return TRUE; } - if(!SoundDevice::IndexIsValid(devices.size())) - { - return FALSE; - } SoundDevice::Info info; - info.id = SoundDevice::ID(TypeDSOUND, static_cast<SoundDevice::Index>(devices.size())); - info.name = mpt::ToUnicode(lpstrDescription); - info.apiName = SoundDevice::TypeToString(TypeDSOUND); - if(lpGuid) + info.type = TypeDSOUND; + if(!lpGuid) { - info.internalID = mpt::ToUnicode(Util::GUIDToString(*lpGuid)); + info.isDefault = true; + info.internalID = mpt::ToUnicode(Util::GUIDToString(GUID())); } else { - info.internalID = mpt::ToUnicode(Util::GUIDToString(GUID())); + info.isDefault = false; + info.internalID = mpt::ToUnicode(Util::GUIDToString(*lpGuid)); } + info.name = mpt::ToUnicode(lpstrDescription); + info.apiName = MPT_USTRING("DirectSound"); + info.useNameAsIdentifier = false; devices.push_back(info); return TRUE; } Modified: trunk/OpenMPT/sounddev/SoundDeviceManager.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -32,6 +32,20 @@ // + struct CompareType + { + std::map<SoundDevice::Type, int> ordering; + CompareType(const std::map<SoundDevice::Type, int> &ordering) + : ordering(ordering) + { + return; + } + bool operator () (const SoundDevice::Info &x, const SoundDevice::Info &y) + { + return (ordering[x.type] > ordering[y.type]); + } + }; + void Manager::ReEnumerate() //------------------------- { @@ -52,6 +66,14 @@ const std::vector<SoundDevice::Info> infos = CWaveDevice::EnumerateDevices(); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); } + // kind of deprecated by now +#ifndef NO_DSOUND + if(IsComponentAvailable(m_DirectSound)) + { + const std::vector<SoundDevice::Info> infos = CDSoundDevice::EnumerateDevices(); + m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); + } +#endif // NO_DSOUND #ifndef NO_ASIO if(IsComponentAvailable(m_ASIO)) @@ -64,49 +86,56 @@ #ifndef NO_PORTAUDIO if(IsComponentAvailable(m_PortAudio)) { - const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_WASAPI); + const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(); m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); } - if(IsComponentAvailable(m_PortAudio)) - { - const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_WDMKS); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); - } #endif // NO_PORTAUDIO - // kind of deprecated by now -#ifndef NO_DSOUND - if(IsComponentAvailable(m_DirectSound)) - { - const std::vector<SoundDevice::Info> infos = CDSoundDevice::EnumerateDevices(); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); + std::map<SoundDevice::Type, int> typePriorities; + if(mpt::Windows::Version::IsWine()) + { // Wine + typePriorities[SoundDevice::TypeDSOUND] = 29; + typePriorities[SoundDevice::TypeWAVEOUT] = 28; + typePriorities[SoundDevice::TypePORTAUDIO_WASAPI] = 21; + typePriorities[SoundDevice::TypePORTAUDIO_WMME] = 19; + typePriorities[SoundDevice::TypePORTAUDIO_DS] = 18; + typePriorities[SoundDevice::TypeASIO] = 10; + typePriorities[SoundDevice::TypePORTAUDIO_WDMKS] = -1; + } else if(!mpt::Windows::Version::IsNT()) + { // Win9x + typePriorities[SoundDevice::TypeWAVEOUT] = 29; + typePriorities[SoundDevice::TypeDSOUND] = 28; + typePriorities[SoundDevice::TypePORTAUDIO_WMME] = 19; + typePriorities[SoundDevice::TypePORTAUDIO_DS] = 18; + typePriorities[SoundDevice::TypeASIO] = 1; + typePriorities[SoundDevice::TypePORTAUDIO_WDMKS] = -1; + typePriorities[SoundDevice::TypePORTAUDIO_WASAPI] = -2; + } else if(!mpt::Windows::Version::IsAtLeast(mpt::Windows::Version::WinVista)) + { // WinXP + typePriorities[SoundDevice::TypeWAVEOUT] = 29; + typePriorities[SoundDevice::TypeASIO] = 28; + typePriorities[SoundDevice::TypeDSOUND] = 27; + typePriorities[SoundDevice::TypePORTAUDIO_WDMKS] = 26; + typePriorities[SoundDevice::TypePORTAUDIO_WMME] = 19; + typePriorities[SoundDevice::TypePORTAUDIO_DS] = 17; + typePriorities[SoundDevice::TypePORTAUDIO_WASAPI] = -1; + } else + { // >=Vista + typePriorities[SoundDevice::TypeWAVEOUT] = 29; + typePriorities[SoundDevice::TypePORTAUDIO_WASAPI] = 28; + typePriorities[SoundDevice::TypeASIO] = 27; + typePriorities[SoundDevice::TypePORTAUDIO_WDMKS] = 26; + typePriorities[SoundDevice::TypePORTAUDIO_WMME] = 19; + typePriorities[SoundDevice::TypeDSOUND] = -1; + typePriorities[SoundDevice::TypePORTAUDIO_DS] = -2; } -#endif // NO_DSOUND + std::stable_sort(m_SoundDevices.begin(), m_SoundDevices.end(), CompareType(typePriorities)); - // duplicate devices, only used if [Sound Settings]MorePortaudio=1 -#ifndef NO_PORTAUDIO - if(IsComponentAvailable(m_PortAudio)) - { - const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_WMME); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); - } - if(IsComponentAvailable(m_PortAudio)) - { - const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_ASIO); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); - } - if(IsComponentAvailable(m_PortAudio)) - { - const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(TypePORTAUDIO_DS); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); - } -#endif // NO_PORTAUDIO - Log(LogDebug, MPT_USTRING("Sound Devices enumerated:")); for(std::size_t i = 0; i < m_SoundDevices.size(); ++i) { Log(LogDebug, mpt::String::Print(MPT_USTRING(" Identifier : %1") , m_SoundDevices[i].GetIdentifier())); - Log(LogDebug, mpt::String::Print(MPT_USTRING(" ID : %1.%2"), static_cast<uint32>(m_SoundDevices[i].id.GetType()), m_SoundDevices[i].id.GetIndex())); + Log(LogDebug, mpt::String::Print(MPT_USTRING(" Type : %1") , m_SoundDevices[i].type)); Log(LogDebug, mpt::String::Print(MPT_USTRING(" InternalID: %1") , m_SoundDevices[i].internalID)); Log(LogDebug, mpt::String::Print(MPT_USTRING(" API Name : %1") , m_SoundDevices[i].apiName)); Log(LogDebug, mpt::String::Print(MPT_USTRING(" Name : %1") , m_SoundDevices[i].name)); @@ -115,20 +144,31 @@ } -SoundDevice::Info Manager::FindDeviceInfo(SoundDevice::ID id) const -//----------------------------------------------------------------- +SoundDevice::Manager::GlobalID Manager::GetGlobalID(SoundDevice::Identifier identifier) const +//------------------------------------------------------------------------------------------- { - for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) + for(std::size_t i = 0; i < m_SoundDevices.size(); ++i) { - if(it->id == id) + if(m_SoundDevices[i].GetIdentifier() == identifier) { - return *it; + return i; } } - return SoundDevice::Info(); + return ~SoundDevice::Manager::GlobalID(); } +SoundDevice::Info Manager::FindDeviceInfo(SoundDevice::Manager::GlobalID id) const +//-------------------------------------------------------------------------------- +{ + if(id > m_SoundDevices.size()) + { + return SoundDevice::Info(); + } + return m_SoundDevices[id]; +} + + SoundDevice::Info Manager::FindDeviceInfo(SoundDevice::Identifier identifier) const //--------------------------------------------------------------------------------- { @@ -154,15 +194,12 @@ SoundDevice::Type ParseType(const SoundDevice::Identifier &identifier) //-------------------------------------------------------------------- { - for(int i = 0; i < TypeNUM_DEVTYPES; ++i) + std::vector<mpt::ustring> tmp = mpt::String::Split<mpt::ustring>(identifier, MPT_USTRING("_")); + if(tmp.size() == 0) { - const mpt::ustring api = SoundDevice::TypeToString(static_cast<SoundDevice::Type>(i)); - if(identifier.find(api) == 0) - { - return static_cast<SoundDevice::Type>(i); - } + return SoundDevice::Type(); } - return TypeINVALID; + return tmp[0]; } @@ -185,47 +222,31 @@ } } const SoundDevice::Type type = ParseType(identifier); - switch(type) + if(type == TypePORTAUDIO_WASAPI) { - case TypePORTAUDIO_WASAPI: - // WASAPI devices might change names if a different connector jack is used. - // In order to avoid defaulting to wave mapper in that case, - // just find the first WASAPI device. - for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) + // WASAPI devices might change names if a different connector jack is used. + // In order to avoid defaulting to wave mapper in that case, + // just find the first WASAPI device. + for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) + { + if((it->type == TypePORTAUDIO_WASAPI) && !IsDeviceUnavailable(it->GetIdentifier())) { - if((it->id.GetType() == TypePORTAUDIO_WASAPI) && !IsDeviceUnavailable(it->GetIdentifier())) - { - return *it; - } + return *it; } - // default to first device - return *begin(); - break; - case TypeWAVEOUT: - case TypeDSOUND: - case TypePORTAUDIO_WMME: - case TypePORTAUDIO_DS: - case TypeASIO: - case TypePORTAUDIO_WDMKS: - case TypePORTAUDIO_ASIO: - if(preferSameType) + } + } + if(preferSameType) + { + for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) + { + if((it->type == type) && !IsDeviceUnavailable(it->GetIdentifier())) { - for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) - { - if((it->id.GetType() == type) && !IsDeviceUnavailable(it->GetIdentifier())) - { - return *it; - } - } - } else - { - // default to first device - return *begin(); + return *it; } - break; + } } - // invalid - return SoundDevice::Info(); + // default to first device + return *begin(); } @@ -318,28 +339,23 @@ return nullptr; } SoundDevice::IBase *result = nullptr; - switch(info.id.GetType()) - { - case TypeWAVEOUT: result = new CWaveDevice(info); break; + if(info.type.empty()) { result = nullptr; } + if(info.type == TypeWAVEOUT) { result = new CWaveDevice(info); } #ifndef NO_DSOUND - case TypeDSOUND: result = new CDSoundDevice(info); break; + if(info.type == TypeDSOUND) { result = new CDSoundDevice(info); } #endif // NO_DSOUND #ifndef NO_ASIO - case TypeASIO: result = new CASIODevice(info); break; + if(info.type == TypeASIO) { result = new CASIODevice(info); } #endif // NO_ASIO #ifndef NO_PORTAUDIO - case TypePORTAUDIO_WASAPI: - case TypePORTAUDIO_WDMKS: - case TypePORTAUDIO_WMME: - case TypePORTAUDIO_DS: - case TypePORTAUDIO_ASIO: - if(IsComponentAvailable(m_PortAudio)) - { - result = new CPortaudioDevice(info); - } - break; + if(IsComponentAvailable(m_PortAudio)) + { + if(info.type == TypePORTAUDIO_WASAPI) { result = new CPortaudioDevice(info); } + if(info.type == TypePORTAUDIO_WDMKS) { result = new CPortaudioDevice(info); } + if(info.type == TypePORTAUDIO_WMME) { result = new CPortaudioDevice(info); } + if(info.type == TypePORTAUDIO_DS) { result = new CPortaudioDevice(info); } + } #endif // NO_PORTAUDIO - } if(!result) { return nullptr; @@ -370,6 +386,66 @@ } +namespace Legacy +{ +SoundDevice::Info FindDeviceInfo(SoundDevice::Manager &manager, SoundDevice::Legacy::ID id) +{ + if(manager.GetDeviceInfos().empty()) + { + return SoundDevice::Info(); + } + SoundDevice::Type type = SoundDevice::Type(); + switch(id & SoundDevice::Legacy::MaskType) + { + case SoundDevice::Legacy::TypeWAVEOUT: + type = SoundDevice::TypeWAVEOUT; + break; + case SoundDevice::Legacy::TypeDSOUND: + type = SoundDevice::TypeDSOUND; + break; + case SoundDevice::Legacy::TypeASIO: + type = SoundDevice::TypeASIO; + break; + case SoundDevice::Legacy::TypePORTAUDIO_WASAPI: + type = SoundDevice::TypePORTAUDIO_WASAPI; + break; + case SoundDevice::Legacy::TypePORTAUDIO_WDMKS: + type = SoundDevice::TypePORTAUDIO_WDMKS; + break; + case SoundDevice::Legacy::TypePORTAUDIO_WMME: + type = SoundDevice::TypePORTAUDIO_WMME; + break; + case SoundDevice::Legacy::TypePORTAUDIO_DS: + type = SoundDevice::TypePORTAUDIO_DS; + break; + } + if(type.empty()) + { // fallback to first device + return *manager.begin(); + } + std::size_t index = static_cast<uint8>(id & SoundDevice::Legacy::MaskIndex); + std::size_t seenDevicesOfDesiredType = 0; + for(std::vector<SoundDevice::Info>::const_iterator it = manager.begin(); it != manager.end(); ++it) + { + if(it->type == type) + { + if(seenDevicesOfDesiredType == index) + { + if(!it->IsValid()) + { // fallback to first device + return *manager.begin(); + } + return *it; + } + seenDevicesOfDesiredType++; + } + } + // default to first device + return *manager.begin(); +} +} + + } // namespace SoundDevice Modified: trunk/OpenMPT/sounddev/SoundDeviceManager.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceManager.h 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDeviceManager.h 2015-05-05 10:01:42 UTC (rev 5046) @@ -15,7 +15,10 @@ #include "../common/ComponentManager.h" +#include <map> +#include <vector> + OPENMPT_NAMESPACE_BEGIN @@ -32,6 +35,11 @@ class Manager //=========== { + +public: + + typedef std::size_t GlobalID; + private: const SoundDevice::AppInfo m_AppInfo; @@ -64,7 +72,9 @@ std::vector<SoundDevice::Info>::const_iterator end() const { return m_SoundDevices.end(); } const std::vector<SoundDevice::Info> & GetDeviceInfos() const { return m_SoundDevices; } - SoundDevice::Info FindDeviceInfo(SoundDevice::ID id) const; + SoundDevice::Manager::GlobalID GetGlobalID(SoundDevice::Identifier identifier) const; + + SoundDevice::Info FindDeviceInfo(SoundDevice::Manager::GlobalID id) const; SoundDevice::Info FindDeviceInfo(SoundDevice::Identifier identifier) const; SoundDevice::Info FindDeviceInfoBestMatch(SoundDevice::Identifier identifier, bool preferSameType); @@ -81,6 +91,12 @@ }; +namespace Legacy +{ +SoundDevice::Info FindDeviceInfo(SoundDevice::Manager &manager, SoundDevice::Legacy::ID id); +} + + } // namespace SoundDevice Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -42,7 +42,8 @@ : SoundDevice::Base(info) , m_StatisticPeriodFrames(0) { - m_HostApi = SndDevTypeToHostApi(info.id.GetType()); + m_DeviceIndex = ConvertStrTo<PaDeviceIndex>(GetDeviceInternalID()); + m_HostApiType = Pa_GetHostApiInfo(Pa_GetDeviceInfo(m_DeviceIndex)->hostApi)->type; MemsetZero(m_StreamParameters); m_Stream = 0; m_StreamInfo = 0; @@ -66,7 +67,7 @@ m_StreamInfo = 0; m_CurrentFrameBuffer = 0; m_CurrentFrameCount = 0; - m_StreamParameters.device = HostApiOutputIndexToGlobalDeviceIndex(GetDeviceIndex(), m_HostApi); + m_StreamParameters.device = m_DeviceIndex; if(m_StreamParameters.device == -1) return false; m_StreamParameters.channelCount = m_Settings.Channels; if(m_Settings.sampleFormat.IsFloat()) @@ -87,7 +88,7 @@ m_StreamParameters.suggestedLatency = m_Settings.Latency; m_StreamParameters.hostApiSpecificStreamInfo = NULL; unsigned long framesPerBuffer = static_cast<long>(m_Settings.UpdateInterval * m_Settings.Samplerate); - if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paWASAPI)) + if(m_HostApiType == paWASAPI) { if(m_Settings.ExclusiveMode) { @@ -104,14 +105,14 @@ { m_Flags.NeedsClippedFloat = true; } - } else if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paWDMKS)) + } else if(m_HostApiType == paWDMKS) { m_Flags.NeedsClippedFloat = false; framesPerBuffer = paFramesPerBufferUnspecified; // let portaudio choose - } else if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paMME)) + } else if(m_HostApiType == paMME) { m_Flags.NeedsClippedFloat = mpt::Windows::Version::IsAtLeast(mpt::Windows::Version::WinVista); - } else if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paDirectSound)) + } else if(m_HostApiType == paDirectSound) { m_Flags.NeedsClippedFloat = mpt::Windows::Version::IsAtLeast(mpt::Windows::Version::WinVista); } else @@ -227,25 +228,25 @@ caps.CanChannelMapping = false; caps.CanDriverPanel = false; caps.HasInternalDither = true; - const PaDeviceInfo *deviceInfo = Pa_GetDeviceInfo(m_StreamParameters.device = HostApiOutputIndexToGlobalDeviceIndex(GetDeviceIndex(), m_HostApi)); + const PaDeviceInfo *deviceInfo = Pa_GetDeviceInfo(m_StreamParameters.device = m_DeviceIndex); if(deviceInfo) { caps.DefaultSettings.Latency = deviceInfo->defaultLowOutputLatency; } caps.DefaultSettings.sampleFormat = SampleFormatFloat32; - if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paWASAPI)) + if(m_HostApiType == paWASAPI) { caps.CanExclusiveMode = true; caps.CanDriverPanel = true; caps.DefaultSettings.sampleFormat = SampleFormatFloat32; - } else if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paWDMKS)) + } else if(m_HostApiType == paWDMKS) { caps.CanUpdateInterval = false; caps.DefaultSettings.sampleFormat = SampleFormatInt32; - } else if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paDirectSound)) + } else if(m_HostApiType == paDirectSound) { caps.DefaultSettings.sampleFormat = SampleFormatInt16; - } else if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paMME)) + } else if(m_HostApiType == paMME) { if(mpt::Windows::Version::IsWine()) { @@ -257,7 +258,7 @@ { caps.DefaultSettings.sampleFormat = SampleFormatInt16; } - } else if(m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paASIO)) + } else if(m_HostApiType == paASIO) { caps.DefaultSettings.sampleFormat = SampleFormatInt32; } @@ -269,7 +270,7 @@ //------------------------------------------------------------------------------------------------------- { SoundDevice::DynamicCaps caps; - PaDeviceIndex device = HostApiOutputIndexToGlobalDeviceIndex(GetDeviceIndex(), m_HostApi); + PaDeviceIndex device = m_DeviceIndex; if(device == -1) { return caps; @@ -283,7 +284,7 @@ StreamParameters.sampleFormat = paInt16; StreamParameters.suggestedLatency = 0.0; StreamParameters.hostApiSpecificStreamInfo = NULL; - if((m_HostApi == Pa_HostApiTypeIdToHostApiIndex(paWASAPI)) && m_Settings.ExclusiveMode) + if((m_HostApiType == paWASAPI) && m_Settings.ExclusiveMode) { MemsetZero(m_WasapiStreamInfo); m_WasapiStreamInfo.size = sizeof(PaWasapiStreamInfo); @@ -305,7 +306,7 @@ bool CPortaudioDevice::OpenDriverSettings() //----------------------------------------- { - if(m_HostApi != Pa_HostApiTypeIdToHostApiIndex(paWASAPI)) + if(m_HostApiType != paWASAPI) { return false; } @@ -334,16 +335,16 @@ MPT_UNREFERENCED_PARAMETER(input); MPT_UNREFERENCED_PARAMETER(statusFlags); if(!output) return paAbort; - if(Pa_GetHostApiInfo(m_HostApi)->type == paWDMKS) + if(m_HostApiType == paWDMKS) { // For WDM-KS, timeInfo->outputBufferDacTime seems to contain bogus values. // Work-around it by using the slightly less accurate per-stream latency estimation. m_CurrentRealLatency = m_StreamInfo->outputLatency; - } else if(Pa_GetHostApiInfo(m_HostApi)->type == paWASAPI) + } else if(m_HostApiType == paWASAPI) { // PortAudio latency calculation appears to miss the current period or chunk for WASAPI. Compensate it. m_CurrentRealLatency = timeInfo->outputBufferDacTime - timeInfo->currentTime + ((double)frameCount / (double)m_Settings.Samplerate); - } else if(Pa_GetHostApiInfo(m_HostApi)->type == paDirectSound) + } else if(m_HostApiType == paDirectSound) { // PortAudio latency calculation appears to miss the buffering latency. // The current chunk, however, appears to be compensated for. @@ -375,111 +376,82 @@ } -PaDeviceIndex CPortaudioDevice::HostApiOutputIndexToGlobalDeviceIndex(int hostapioutputdeviceindex, PaHostApiIndex hostapi) -//------------------------------------------------------------------------------------------------------------------- +std::vector<SoundDevice::Info> CPortaudioDevice::EnumerateDevices() +//----------------------------------------------------------------- { - if(hostapi < 0) - return -1; - if(hostapi >= Pa_GetHostApiCount()) - return -1; - if(!Pa_GetHostApiInfo(hostapi)) - return -1; - if(hostapioutputdeviceindex < 0) - return -1; - if(hostapioutputdeviceindex >= Pa_GetHostApiInfo(hostapi)->deviceCount) - return -1; - int dev = hostapioutputdeviceindex; - for(int hostapideviceindex=0; hostapideviceindex<Pa_GetHostApiInfo(hostapi)->deviceCount; hostapideviceindex++) + std::vector<SoundDevice::Info> devices; + for(PaDeviceIndex dev = 0; dev < Pa_GetDeviceCount(); ++dev) { - if(!Pa_GetDeviceInfo(Pa_HostApiDeviceIndexToDeviceIndex(hostapi, hostapideviceindex))) + if(!Pa_GetDeviceInfo(dev)) { - dev++; // skip this device continue; } - if(Pa_GetDeviceInfo(Pa_HostApiDeviceIndexToDeviceIndex(hostapi, hostapideviceindex))->maxOutputChannels == 0) + if(Pa_GetDeviceInfo(dev)->hostApi < 0) { - dev++; // skip this device continue; } - if(dev == hostapideviceindex) + if(!Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)) { - break; + continue; } - } - if(dev >= Pa_GetHostApiInfo(hostapi)->deviceCount) - return -1; - return Pa_HostApiDeviceIndexToDeviceIndex(hostapi, dev); -} - - -SoundDevice::Type CPortaudioDevice::HostApiToSndDevType(PaHostApiIndex hostapi) -//--------------------------------------------------------------------------- -{ - if(hostapi == Pa_HostApiTypeIdToHostApiIndex(paWASAPI)) return TypePORTAUDIO_WASAPI; - if(hostapi == Pa_HostApiTypeIdToHostApiIndex(paWDMKS)) return TypePORTAUDIO_WDMKS; - if(hostapi == Pa_HostApiTypeIdToHostApiIndex(paMME)) return TypePORTAUDIO_WMME; - if(hostapi == Pa_HostApiTypeIdToHostApiIndex(paDirectSound)) return TypePORTAUDIO_DS; - if(hostapi == Pa_HostApiTypeIdToHostApiIndex(paASIO)) return TypePORTAUDIO_ASIO; - return TypeINVALID; -} - - -PaHostApiIndex CPortaudioDevice::SndDevTypeToHostApi(SoundDevice::Type snddevtype) -//------------------------------------------------------------------------------ -{ - if(snddevtype == TypePORTAUDIO_WASAPI) return Pa_HostApiTypeIdToHostApiIndex(paWASAPI); - if(snddevtype == TypePORTAUDIO_WDMKS) return Pa_HostApiTypeIdToHostApiIndex(paWDMKS); - if(snddevtype == TypePORTAUDIO_WMME) return Pa_HostApiTypeIdToHostApiIndex(paMME); - if(snddevtype == TypePORTAUDIO_DS) return Pa_HostApiTypeIdToHostApiIndex(paDirectSound); - if(snddevtype == TypePORTAUDIO_ASIO) return Pa_HostApiTypeIdToHostApiIndex(paASIO); - return paInDevelopment; -} - - -mpt::ustring CPortaudioDevice::HostApiToString(PaHostApiIndex hostapi) -//-------------------------------------------------------------------- -{ - SoundDevice::Type type = HostApiToSndDevType(hostapi); - if(type == TypeINVALID) - { - return MPT_USTRING("PortAudio"); - } - return SoundDevice::TypeToString(type); -} - - -bool CPortaudioDevice::EnumerateDevices(SoundDevice::Info &result, SoundDevice::Index index, PaHostApiIndex hostapi) -//-------------------------------------------------------------------------------------------------------------- -{ - result = SoundDevice::Info(); - PaDeviceIndex dev = HostApiOutputIndexToGlobalDeviceIndex(index, hostapi); - if(dev == -1) - return false; - if(!Pa_GetDeviceInfo(dev)) - return false; - result.id = SoundDevice::ID(HostApiToSndDevType(hostapi), index); - result.name = mpt::ToUnicode(mpt::CharsetUTF8, Pa_GetDeviceInfo(dev)->name); - result.apiName = HostApiToString(Pa_GetDeviceInfo(dev)->hostApi); - result.isDefault = (Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == (PaDeviceIndex)dev); - PALOG(mpt::String::Print("PortAudio: %1, %2, %3, %4", result.id.GetIdRaw(), mpt::ToLocale(result.name), mpt::ToLocale(result.apiName), result.isDefault)); - PALOG(mpt::String::Print(" low : %1", Pa_GetDeviceInfo(dev)->defaultLowOutputLatency)); - PALOG(mpt::String::Print(" high : %1", Pa_GetDeviceInfo(dev)->defaultHighOutputLatency)); - return true; -} - - -std::vector<SoundDevice::Info> CPortaudioDevice::EnumerateDevices(SoundDevice::Type type) -//----------------------------------------------------------------------------------- -{ - std::vector<SoundDevice::Info> devices; - for(SoundDevice::Index index = 0; ; ++index) - { - SoundDevice::Info info; - if(!EnumerateDevices(info, index, CPortaudioDevice::SndDevTypeToHostApi(type))) + if(!Pa_GetDeviceInfo(dev)->name) { - break; + continue; } - devices.push_back(info); + if(!Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->name) + { + continue; + } + if(Pa_GetDeviceInfo(dev)->maxOutputChannels <= 0) + { + continue; + } + SoundDevice::Info result = SoundDevice::Info(); + switch((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->type)) + { + case paWASAPI: + result.type = TypePORTAUDIO_WASAPI; + break; + case paWDMKS: + result.type = TypePORTAUDIO_WDMKS; + break; + case paMME: + result.type = TypePORTAUDIO_WMME; + break; + case paDirectSound: + result.type = TypePORTAUDIO_DS; + break; + default: + result.type = MPT_USTRING("PortAudio") + MPT_USTRING("-") + mpt::ufmt::dec(static_cast<int>(Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->type)); + break; + } + result.internalID = mpt::ufmt::dec(dev); + result.name = mpt::ToUnicode(mpt::CharsetUTF8, Pa_GetDeviceInfo(dev)->name); + switch(Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->type) + { + case paWASAPI: + result.apiName = MPT_USTRING("WASAPI"); + break; + case paWDMKS: + if(mpt::Windows::Version::IsAtLeast(mpt::Windows::Version::WinVista)) + { + result.apiName = MPT_USTRING("WaveRT"); + } else + { + result.apiName = MPT_USTRING("WDM-KS"); + } + break; + default: + result.apiName = mpt::ToUnicode(mpt::CharsetUTF8, Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->name); + break; + } + result.apiPath.push_back(MPT_USTRING("PortAudio")); + result.isDefault = (Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == (PaDeviceIndex)dev); + result.useNameAsIdentifier = true; + PALOG(mpt::String::Print("PortAudio: %1, %2, %3, %4", result.id.GetIdRaw(), mpt::ToLocale(result.name), mpt::ToLocale(result.apiName), result.isDefault)); + PALOG(mpt::String::Print(" low : %1", Pa_GetDeviceInfo(dev)->defaultLowOutputLatency)); + PALOG(mpt::String::Print(" high : %1", Pa_GetDeviceInfo(dev)->defaultHighOutputLatency)); + devices.push_back(result); } return devices; } Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-05-05 10:01:42 UTC (rev 5046) @@ -35,7 +35,8 @@ //========================================= { protected: - PaHostApiIndex m_HostApi; + PaDeviceIndex m_DeviceIndex; + PaHostApiTypeId m_HostApiType; PaStreamParameters m_StreamParameters; PaWasapiStreamInfo m_WasapiStreamInfo; PaStream * m_Stream; @@ -81,17 +82,8 @@ void *userData ); - static mpt::ustring HostApiToString(PaHostApiIndex hostapi); + static std::vector<SoundDevice::Info> EnumerateDevices(); - static PaDeviceIndex HostApiOutputIndexToGlobalDeviceIndex(int hostapioutputdeviceindex, PaHostApiIndex hostapi); - static SoundDevice::Type HostApiToSndDevType(PaHostApiIndex hostapi); - static PaHostApiIndex SndDevTypeToHostApi(SoundDevice::Type snddevtype); - - static std::vector<SoundDevice::Info> EnumerateDevices(SoundDevice::Type type); - -private: - static bool EnumerateDevices(SoundDevice::Info &result, SoundDevice::Index index, PaHostApiIndex hostapi); - }; Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-05-05 10:01:42 UTC (rev 5046) @@ -61,6 +61,13 @@ } +int CWaveDevice::GetDeviceIndex() const +//------------------------------------- +{ + return ConvertStrTo<int>(GetDeviceInternalID()); +} + + SoundDevice::Caps CWaveDevice::InternalGetDeviceCaps() //-------------------------------------------------- { @@ -355,13 +362,11 @@ UINT numDevs = waveOutGetNumDevs(); for(UINT index = 0; index <= numDevs; ++index) { - if(!SoundDevice::IndexIsValid(index)) - { - break; - } SoundDevice::Info info; - info.id = SoundDevice::ID(TypeWAVEOUT, static_cast<SoundDevice::Index>(index)); - info.apiName = SoundDevice::TypeToString(TypeWAVEOUT); + info.type = TypeWAVEOUT; + info.internalID = mpt::ufmt::dec(index); + info.apiName = MPT_USTRING("WaveOut"); + info.useNameAsIdentifier = true; WAVEOUTCAPSW woc; MemsetZero(woc); if(index == 0) Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceWaveout.h 2015-05-04 22:41:44 UTC (rev 5045) +++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.h 2015-05-05 10:01:42 UTC (rev 5046) @@ -78,8 +78,11 @@ SoundDevice::DynamicCaps GetDeviceDynamicCaps(const std::vector<uint32> &baseSampleRates); private: + void HandleWaveoutDone(); + int GetDeviceIndex() const; + public: static void CALLBACK WaveOutCallBack(HWAVEOUT, UINT uMsg, DWORD_PTR, DWORD_PTR dw1, DWORD_PTR dw2); static std::vector<SoundDevice::Info> EnumerateDevices(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-06 11:55:49
|
Revision: 5053 http://sourceforge.net/p/modplug/code/5053 Author: manxorist Date: 2015-05-06 11:55:42 +0000 (Wed, 06 May 2015) Log Message: ----------- [Fix] build: Make premake VS2008 OpenMPT projects compile properly. [Fix] MIDI I/O Plugin: #define nullptr in order to make it build with VS2008. Modified Paths: -------------- trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua trunk/OpenMPT/build/premake4.lua trunk/OpenMPT/build/vs2008/OpenMPT.vcproj trunk/OpenMPT/build/vs2008/PluginBridge.vcproj trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h Modified: trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua 2015-05-06 11:55:42 UTC (rev 5053) @@ -61,6 +61,8 @@ "/DELAYLOAD:OpenMPT_SoundTouch_f32.dll", } prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" } + configuration "vs2008" + includedirs { "../../include/msinttypes/stdint" } dofile "../../build/premake4-win/premake4-defaults-EXEGUI.lua" dofile "../../build/premake4-win/premake4-defaults-static.lua" @@ -97,5 +99,7 @@ "winmm", } prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" } + configuration "vs2008" + includedirs { "../../include/msinttypes/stdint" } dofile "../../build/premake4-win/premake4-defaults-DLL.lua" dofile "../../build/premake4-win/premake4-defaults-static.lua" Modified: trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-06 11:55:42 UTC (rev 5053) @@ -24,6 +24,8 @@ targetsuffix "32" configuration { "x64" } targetsuffix "64" + configuration "vs2008" + includedirs { "../../include/msinttypes/stdint" } dofile "../../build/premake4-win/premake4-defaults-EXEGUI.lua" dofile "../../build/premake4-win/premake4-defaults-static.lua" Modified: trunk/OpenMPT/build/premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4.lua 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/build/premake4.lua 2015-05-06 11:55:42 UTC (rev 5053) @@ -42,6 +42,18 @@ replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") end +function postprocess_vs2008_dynamicbase (filename) + replace_in_file(filename, "\t\t\t\tEnableCOMDATFolding=\"2\"", "\t\t\t\tEnableCOMDATFolding=\"2\"\n\t\t\t\tRandomizedBaseAddress=\"2\"") +end + +function postprocess_vs2008_nonxcompat (filename) + replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\DataExecutionPrevention=\"1\"\n") +end + +function postprocess_vs2008_largeaddress (filename) + replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\LargeAddressAware=\"2\"\n") +end + function postprocess_vs2010_mfc (filename) replace_in_file(filename, "<UseOfMfc>Dynamic</UseOfMfc>", "<UseOfMfc>Static</UseOfMfc>") end @@ -72,10 +84,16 @@ execute = function () postprocess_vs2008_main("build/vs2008/libopenmpt_test.vcproj") postprocess_vs2008_main("build/vs2008/openmpt123.vcproj") + postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_dynamicbase("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_nonxcompat("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_largeaddress("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_dynamicbase("build/vs2008/PluginBridge.vcproj") + postprocess_vs2008_nonxcompat("build/vs2008/PluginBridge.vcproj") + postprocess_vs2008_largeaddress("build/vs2008/PluginBridge.vcproj") postprocess_vs2010_main("build/vs2010/libopenmpt_test.vcxproj") postprocess_vs2010_main("build/vs2010/openmpt123.vcxproj") postprocess_vs2010_main("build/vs2010/OpenMPT.vcxproj") - postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj") postprocess_vs2010_mfc("build/vs2010/in_openmpt.vcxproj") postprocess_vs2010_mfc("build/vs2010/xmp-openmpt.vcxproj") postprocess_vs2010_mfc("build/vs2010/OpenMPT.vcxproj") Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-06 11:55:42 UTC (rev 5053) @@ -45,7 +45,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" ExceptionHandling="2" @@ -64,13 +64,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" AdditionalDependencies="..\lib\x32\Debug\UnRAR.lib ..\lib\x32\Debug\zlib.lib ..\lib\x32\Debug\minizip.lib ..\lib\x32\Debug\smbPitchShift.lib ..\lib\x32\Debug\lhasa.lib ..\lib\x32\Debug\flac.lib ..\lib\x32\Debug\ogg.lib ..\lib\x32\Debug\portaudio.lib ..\lib\x32\Debug\r8brain.lib ..\..\bin\Win32-Debug\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" @@ -134,7 +136,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" ExceptionHandling="2" @@ -153,13 +155,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" AdditionalDependencies="..\lib\x64\Debug\UnRAR.lib ..\lib\x64\Debug\zlib.lib ..\lib\x64\Debug\minizip.lib ..\lib\x64\Debug\smbPitchShift.lib ..\lib\x64\Debug\lhasa.lib ..\lib\x64\Debug\flac.lib ..\lib\x64\Debug\ogg.lib ..\lib\x64\Debug\portaudio.lib ..\lib\x64\Debug\r8brain.lib ..\..\bin\x64-Debug\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" @@ -223,7 +227,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -242,13 +246,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" AdditionalDependencies="..\lib\x32\Release\UnRAR.lib ..\lib\x32\Release\zlib.lib ..\lib\x32\Release\minizip.lib ..\lib\x32\Release\smbPitchShift.lib ..\lib\x32\Release\lhasa.lib ..\lib\x32\Release\flac.lib ..\lib\x32\Release\ogg.lib ..\lib\x32\Release\portaudio.lib ..\lib\x32\Release\r8brain.lib ..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" @@ -259,6 +265,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="1" /> <Tool @@ -315,7 +322,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -334,13 +341,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" AdditionalDependencies="..\lib\x64\Release\UnRAR.lib ..\lib\x64\Release\zlib.lib ..\lib\x64\Release\minizip.lib ..\lib\x64\Release\smbPitchShift.lib ..\lib\x64\Release\lhasa.lib ..\lib\x64\Release\flac.lib ..\lib\x64\Release\ogg.lib ..\lib\x64\Release\portaudio.lib ..\lib\x64\Release\r8brain.lib ..\..\bin\x64\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" @@ -351,6 +360,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="17" /> <Tool @@ -406,7 +416,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GL- /MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -425,13 +435,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" AdditionalDependencies="..\lib\x32\ReleaseNoLTCG\UnRAR.lib ..\lib\x32\ReleaseNoLTCG\zlib.lib ..\lib\x32\ReleaseNoLTCG\minizip.lib ..\lib\x32\ReleaseNoLTCG\smbPitchShift.lib ..\lib\x32\ReleaseNoLTCG\lhasa.lib ..\lib\x32\ReleaseNoLTCG\flac.lib ..\lib\x32\ReleaseNoLTCG\ogg.lib ..\lib\x32\ReleaseNoLTCG\portaudio.lib ..\lib\x32\ReleaseNoLTCG\r8brain.lib ..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" @@ -441,6 +453,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="1" /> <Tool @@ -497,7 +510,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GL- /MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -516,13 +529,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" AdditionalDependencies="..\lib\x64\ReleaseNoLTCG\UnRAR.lib ..\lib\x64\ReleaseNoLTCG\zlib.lib ..\lib\x64\ReleaseNoLTCG\minizip.lib ..\lib\x64\ReleaseNoLTCG\smbPitchShift.lib ..\lib\x64\ReleaseNoLTCG\lhasa.lib ..\lib\x64\ReleaseNoLTCG\flac.lib ..\lib\x64\ReleaseNoLTCG\ogg.lib ..\lib\x64\ReleaseNoLTCG\portaudio.lib ..\lib\x64\ReleaseNoLTCG\r8brain.lib ..\..\bin\x64\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" @@ -532,6 +547,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="17" /> <Tool Modified: trunk/OpenMPT/build/vs2008/PluginBridge.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-05-06 11:55:42 UTC (rev 5053) @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" ExceptionHandling="2" @@ -62,13 +62,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge32.exe" LinkIncremental="2" AdditionalLibraryDirectories="" @@ -129,7 +131,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" ExceptionHandling="2" @@ -147,13 +149,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge64.exe" LinkIncremental="2" AdditionalLibraryDirectories="" @@ -214,7 +218,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -232,13 +236,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge32.exe" LinkIncremental="1" AdditionalLibraryDirectories="" @@ -247,6 +253,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="1" /> <Tool @@ -302,7 +309,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -320,13 +327,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge64.exe" LinkIncremental="1" AdditionalLibraryDirectories="" @@ -335,6 +344,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="17" /> <Tool @@ -389,7 +399,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GL- /MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -407,13 +417,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge32.exe" LinkIncremental="1" AdditionalLibraryDirectories="" @@ -421,6 +433,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="1" /> <Tool @@ -476,7 +489,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GL- /MP" Optimization="3" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" ExceptionHandling="2" StringPooling="true" @@ -494,13 +507,15 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version" + AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + LargeAddressAware="2" + DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge64.exe" LinkIncremental="1" AdditionalLibraryDirectories="" @@ -508,6 +523,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="2" TargetMachine="17" /> <Tool Modified: trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj 2015-05-06 11:55:42 UTC (rev 5053) @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -61,7 +61,7 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" @@ -130,7 +130,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -147,7 +147,7 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" @@ -216,7 +216,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="3" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -233,7 +233,7 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" @@ -305,7 +305,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="3" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -322,7 +322,7 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" @@ -393,7 +393,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GL- /MP" Optimization="3" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -410,7 +410,7 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" @@ -481,7 +481,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GL- /MP" Optimization="3" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -498,7 +498,7 @@ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" - AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include" + AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" /> <Tool Name="VCPreLinkEventTool" Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp =================================================================== --- trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp 2015-05-06 11:55:42 UTC (rev 5053) @@ -7,6 +7,17 @@ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. */ +#define MODPLUG_TRACKER +#define OPENMPT_NAMESPACE +#define OPENMPT_NAMESPACE_BEGIN +#define OPENMPT_NAMESPACE_END +#define VC_EXTRALEAN +#define NOMINMAX +#ifdef _MSC_VER +#if (_MSC_VER < 1600) +#define nullptr 0 +#endif +#endif #include "MidiInOut.h" #include "MidiInOutEditor.h" Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h =================================================================== --- trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h 2015-05-06 11:55:42 UTC (rev 5053) @@ -10,10 +10,6 @@ #pragma once -#define MODPLUG_TRACKER -#define OPENMPT_NAMESPACE -#define OPENMPT_NAMESPACE_BEGIN -#define OPENMPT_NAMESPACE_END #include "../common/mutex.h" #include <vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.h> #include <portmidi/pm_common/portmidi.h> Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp =================================================================== --- trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp 2015-05-06 11:55:42 UTC (rev 5053) @@ -7,11 +7,20 @@ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. */ +#define MODPLUG_TRACKER +#define OPENMPT_NAMESPACE +#define OPENMPT_NAMESPACE_BEGIN +#define OPENMPT_NAMESPACE_END +#define VC_EXTRALEAN +#define NOMINMAX +#ifdef _MSC_VER +#if (_MSC_VER < 1600) +#define nullptr 0 +#endif +#endif #include "MidiInOutEditor.h" #include "MidiInOut.h" -#define VC_EXTRALEAN -#define NOMINMAX #include "windows.h" Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h =================================================================== --- trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h 2015-05-06 09:55:35 UTC (rev 5052) +++ trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h 2015-05-06 11:55:42 UTC (rev 5053) @@ -10,10 +10,6 @@ #pragma once -#define MODPLUG_TRACKER -#define OPENMPT_NAMESPACE -#define OPENMPT_NAMESPACE_BEGIN -#define OPENMPT_NAMESPACE_END #include <vstsdk2.4/public.sdk/source/vst2.x/aeffeditor.h> #include <portmidi/pm_common/portmidi.h> #include "../common/Window.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-10 08:24:09
|
Revision: 5065 http://sourceforge.net/p/modplug/code/5065 Author: manxorist Date: 2015-05-10 08:24:02 +0000 (Sun, 10 May 2015) Log Message: ----------- [Mod] build: Expect premake4.exe or premake5.exe in include/premake/ instead of build/. [Ref] build: Move master premake file into premake subdirectory. [Ref] build: Minor cleanups. Modified Paths: -------------- trunk/OpenMPT/build/update_premake4_projects.cmd Added Paths: ----------- trunk/OpenMPT/build/premake4-win/premake.lua trunk/OpenMPT/include/premake/ Removed Paths: ------------- trunk/OpenMPT/build/premake4.lua Property Changed: ---------------- trunk/OpenMPT/build/ trunk/OpenMPT/build/vs2008-ext/ trunk/OpenMPT/build/vs2010-ext/ Index: trunk/OpenMPT/build =================================================================== --- trunk/OpenMPT/build 2015-05-10 08:09:44 UTC (rev 5064) +++ trunk/OpenMPT/build 2015-05-10 08:24:02 UTC (rev 5065) Property changes on: trunk/OpenMPT/build ___________________________________________________________________ Modified: svn:ignore ## -1,10 +1,2 ## -*.opensdf -*.sdf -*.suo -all-externals.sln -all.sln -ipch lib obj -premake4.exe -premake5.exe Copied: trunk/OpenMPT/build/premake4-win/premake.lua (from rev 5064, trunk/OpenMPT/build/premake4.lua) =================================================================== --- trunk/OpenMPT/build/premake4-win/premake.lua (rev 0) +++ trunk/OpenMPT/build/premake4-win/premake.lua 2015-05-10 08:24:02 UTC (rev 5065) @@ -0,0 +1,371 @@ + +-- premake gets a tiny bit confused if the same project appears in multiple +-- solutions in a single run. premake adds a bogus $projectname path to the +-- intermediate objects directory in that case. work-around using multiple +-- invocations of premake and a custom option to distinguish them. + +MPT_PREMAKE_VERSION = "" + +if _PREMAKE_VERSION == "4.3" then + MPT_PREMAKE_VERSION = "4.3" +elseif _PREMAKE_VERSION == "4.4-beta5" then + MPT_PREMAKE_VERSION = "4.4" +elseif _PREMAKE_VERSION == "5.0-alpha3" then + MPT_PREMAKE_VERSION = "5.0" +else + print "Premake 4.3 or 4.4-beta5 or 5.0-alpha3 required" + os.exit(1) +end + +newoption { + trigger = "group", + value = "PROJECTS", + description = "OpenMPT project group", + allowed = { + { "libopenmpt-all", "libopenmpt-all" }, + { "libopenmpt_test", "libopenmpt_test" }, + { "libopenmpt", "libopenmpt" }, + { "foo_openmpt", "foo_openmpt" }, + { "in_openmpt", "in_openmpt" }, + { "xmp-openmpt", "xmp-openmpt" }, + { "openmpt123", "openmpt123" }, + { "PluginBridge", "PluginBridge" }, + { "OpenMPT", "OpenMPT" }, + { "all-externals", "all-externals" } + } +} + +function replace_in_file (filename, from, to) + local text + local infile + local outfile + infile = io.open(filename, "r") + text = infile:read("*all") + infile:close() + text = string.gsub(text, from, to) + outfile = io.open(filename, "w") + outfile:write(text) + outfile:close() +end + +function postprocess_vs2008_mfc (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "UseOfMFC=\"2\"", "UseOfMFC=\"1\"") +end +end + +function postprocess_vs2008_main (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") +elseif MPT_PREMAKE_VERSION == "4.4" then + replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") +elseif MPT_PREMAKE_VERSION == "5.0" then + replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") +end +end + +function postprocess_vs2008_dynamicbase (filename) + replace_in_file(filename, "\t\t\t\tEnableCOMDATFolding=\"2\"", "\t\t\t\tEnableCOMDATFolding=\"2\"\n\t\t\t\tRandomizedBaseAddress=\"2\"") +end + +function postprocess_vs2008_nonxcompat (filename) + replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\DataExecutionPrevention=\"1\"\n") +end + +function postprocess_vs2008_largeaddress (filename) + replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\LargeAddressAware=\"2\"\n") +end + +function postprocess_vs2010_mfc (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "<UseOfMfc>Dynamic</UseOfMfc>", "<UseOfMfc>Static</UseOfMfc>") +end +end + +function postprocess_vs2010_main (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") +elseif MPT_PREMAKE_VERSION == "4.4" then + replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") +elseif MPT_PREMAKE_VERSION == "5.0" then + replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") +end +end + +function postprocess_vs2010_dynamicbase (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "<EnableCOMDATFolding>true</EnableCOMDATFolding>", "<EnableCOMDATFolding>true</EnableCOMDATFolding>\n\t\t\t<RandomizedBaseAddress>true</RandomizedBaseAddress>") +elseif MPT_PREMAKE_VERSION == "4.4" then + replace_in_file(filename, "<EnableCOMDATFolding>true</EnableCOMDATFolding>", "<EnableCOMDATFolding>true</EnableCOMDATFolding>\n <RandomizedBaseAddress>true</RandomizedBaseAddress>") +elseif MPT_PREMAKE_VERSION == "5.0" then + replace_in_file(filename, "<EnableCOMDATFolding>true</EnableCOMDATFolding>", "<EnableCOMDATFolding>true</EnableCOMDATFolding>\n <RandomizedBaseAddress>true</RandomizedBaseAddress>") +end +end + +function postprocess_vs2010_nonxcompat (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<DataExecutionPrevention>false</DataExecutionPrevention>\n\t\t</Link>\n") +elseif MPT_PREMAKE_VERSION == "4.4" then + replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n") +elseif MPT_PREMAKE_VERSION == "5.0" then + replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n") +end +end + +function postprocess_vs2010_largeaddress (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<LargeAddressAware>true</LargeAddressAware>\n\t\t</Link>\n") +elseif MPT_PREMAKE_VERSION == "4.4" then + replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n") +elseif MPT_PREMAKE_VERSION == "5.0" then + replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n") +end +end + +function fixbug_vs2010_pch (filename) +if MPT_PREMAKE_VERSION == "4.3" then + replace_in_file(filename, "</PrecompiledHeader>\n\t\t</ClCompile>", "</PrecompiledHeader>") +end +end + +newaction { + trigger = "postprocess", + description = "OpenMPT postprocess the project files to mitigate premake problems", + execute = function () + postprocess_vs2008_main("build/vs2008/libopenmpt_test.vcproj") + postprocess_vs2008_main("build/vs2008/openmpt123.vcproj") + postprocess_vs2008_main("build/vs2008/libopenmpt_example_c.vcproj") + postprocess_vs2008_main("build/vs2008/libopenmpt_example_c_mem.vcproj") + postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_dynamicbase("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_nonxcompat("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_largeaddress("build/vs2008/OpenMPT.vcproj") + postprocess_vs2008_dynamicbase("build/vs2008/PluginBridge.vcproj") + postprocess_vs2008_nonxcompat("build/vs2008/PluginBridge.vcproj") + postprocess_vs2008_largeaddress("build/vs2008/PluginBridge.vcproj") + postprocess_vs2010_main("build/vs2010/libopenmpt_test.vcxproj") + postprocess_vs2010_main("build/vs2010/openmpt123.vcxproj") + postprocess_vs2010_main("build/vs2010/OpenMPT.vcxproj") + postprocess_vs2010_main("build/vs2010/libopenmpt_example_c.vcxproj") + postprocess_vs2010_main("build/vs2010/libopenmpt_example_c_mem.vcxproj") + postprocess_vs2010_main("build/vs2010/libopenmpt_example_cxx.vcxproj") + postprocess_vs2010_mfc("build/vs2010/in_openmpt.vcxproj") + postprocess_vs2010_mfc("build/vs2010/xmp-openmpt.vcxproj") + postprocess_vs2010_mfc("build/vs2010/OpenMPT.vcxproj") + postprocess_vs2010_dynamicbase("build/vs2010/OpenMPT.vcxproj") + postprocess_vs2010_nonxcompat("build/vs2010/OpenMPT.vcxproj") + postprocess_vs2010_largeaddress("build/vs2010/OpenMPT.vcxproj") + postprocess_vs2010_dynamicbase("build/vs2010/PluginBridge.vcxproj") + postprocess_vs2010_nonxcompat("build/vs2010/PluginBridge.vcxproj") + postprocess_vs2010_largeaddress("build/vs2010/PluginBridge.vcxproj") + fixbug_vs2010_pch("build/vs2010/OpenMPT.vcxproj") + end +} + +if _OPTIONS["group"] == "libopenmpt-all" then + +solution "libopenmpt-all" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86", "x86_64" } +else + platforms { "x32", "x64" } +end + + dofile "../../build/premake4-win/mpt-libopenmpt_test.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt_examples.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmptDLL.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt_modplug.premake4.lua" + dofile "../../build/premake4-win/mpt-foo_openmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-in_openmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-xmp-openmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-openmpt123.premake4.lua" + dofile "../../build/premake4-win/ext-flac.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + dofile "../../build/premake4-win/ext-portaudio.premake4.lua" + +end + +if _OPTIONS["group"] == "libopenmpt_test" then + +solution "libopenmpt_test" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86", "x86_64" } +else + platforms { "x32", "x64" } +end + + dofile "../../build/premake4-win/mpt-libopenmpt_test.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + +end + +if _OPTIONS["group"] == "foo_openmpt" then + +solution "foo_openmpt" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86" } +else + platforms { "x32" } +end + + dofile "../../build/premake4-win/mpt-foo_openmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + +end + +if _OPTIONS["group"] == "in_openmpt" then + +solution "in_openmpt" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86" } +else + platforms { "x32" } +end + + dofile "../../build/premake4-win/mpt-in_openmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + +end + +if _OPTIONS["group"] == "xmp-openmpt" then + +solution "xmp-openmpt" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86" } +else + platforms { "x32" } +end + + dofile "../../build/premake4-win/mpt-xmp-openmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + dofile "../../build/premake4-win/ext-pugixml.premake4.lua" + +end + +-- should stay the last libopenmpt solution in order to overwrite the libopenmpt base project with all possible configurations +if _OPTIONS["group"] == "libopenmpt" then + +solution "libopenmpt" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86", "x86_64" } +else + platforms { "x32", "x64" } +end + + dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt_examples.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmptDLL.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt_modplug.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + dofile "../../build/premake4-win/ext-miniz-shared.premake4.lua" + dofile "../../build/premake4-win/ext-portaudio.premake4.lua" + +end + +if _OPTIONS["group"] == "openmpt123" then + +solution "openmpt123" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86", "x86_64" } +else + platforms { "x32", "x64" } +end + + dofile "../../build/premake4-win/mpt-openmpt123.premake4.lua" + dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" + dofile "../../build/premake4-win/ext-flac.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + dofile "../../build/premake4-win/ext-ogg.premake4.lua" + dofile "../../build/premake4-win/ext-portaudio.premake4.lua" + +end + +if _OPTIONS["group"] == "PluginBridge" then + +solution "PluginBridge" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release", "ReleaseNoLTCG" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86", "x86_64" } +else + platforms { "x32", "x64" } +end + + dofile "../../build/premake4-win/mpt-PluginBridge.premake4.lua" + +end + + +if _OPTIONS["group"] == "OpenMPT" then + +solution "OpenMPT" + location ( "../../build/" .. _ACTION ) + configurations { "Debug", "Release", "ReleaseNoLTCG" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86", "x86_64" } +else + platforms { "x32", "x64" } +end + + dofile "../../build/premake4-win/mpt-OpenMPT.premake4.lua" + dofile "../../build/premake4-win/mpt-PluginBridge.premake4.lua" + dofile "../../build/premake4-win/ext-flac.premake4.lua" + dofile "../../build/premake4-win/ext-lhasa.premake4.lua" + dofile "../../build/premake4-win/ext-minizip.premake4.lua" + dofile "../../build/premake4-win/ext-ogg.premake4.lua" + dofile "../../build/premake4-win/ext-portaudio.premake4.lua" + dofile "../../build/premake4-win/ext-portmidi.premake4.lua" + dofile "../../build/premake4-win/ext-r8brain.premake4.lua" + dofile "../../build/premake4-win/ext-smbPitchShift.premake4.lua" + dofile "../../build/premake4-win/ext-soundtouch.premake4.lua" + dofile "../../build/premake4-win/ext-UnRAR.premake4.lua" + dofile "../../build/premake4-win/ext-zlib.premake4.lua" + +end + +-- overwrite all external projects once again with the full matrix of possible build config combinations +if _OPTIONS["group"] == "all-externals" then + +solution "all-externals" + location ( "../../build/" .. _ACTION .. "-ext" ) + configurations { "Debug", "Release", "ReleaseNoLTCG" } +if MPT_PREMAKE_VERSION == "5.0" then + platforms { "x86", "x86_64" } +else + platforms { "x32", "x64" } +end + + dofile "../../build/premake4-win/ext-flac.premake4.lua" + dofile "../../build/premake4-win/ext-lhasa.premake4.lua" + dofile "../../build/premake4-win/ext-miniz.premake4.lua" + dofile "../../build/premake4-win/ext-miniz-shared.premake4.lua" + dofile "../../build/premake4-win/ext-minizip.premake4.lua" + dofile "../../build/premake4-win/ext-ogg.premake4.lua" + dofile "../../build/premake4-win/ext-portaudio.premake4.lua" + dofile "../../build/premake4-win/ext-portmidi.premake4.lua" + dofile "../../build/premake4-win/ext-pugixml.premake4.lua" + dofile "../../build/premake4-win/ext-r8brain.premake4.lua" + dofile "../../build/premake4-win/ext-smbPitchShift.premake4.lua" + dofile "../../build/premake4-win/ext-soundtouch.premake4.lua" + dofile "../../build/premake4-win/ext-UnRAR.premake4.lua" + dofile "../../build/premake4-win/ext-zlib.premake4.lua" + +end Deleted: trunk/OpenMPT/build/premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4.lua 2015-05-10 08:09:44 UTC (rev 5064) +++ trunk/OpenMPT/build/premake4.lua 2015-05-10 08:24:02 UTC (rev 5065) @@ -1,370 +0,0 @@ - --- premake gets a tiny bit confused if the same project appears in multiple --- solutions in a single run. premake adds a bogus $projectname path to the --- intermediate objects directory in that case. work-around using multiple --- invocations of premake and a custom option to distinguish them. - -MPT_PREMAKE_VERSION = "" - -if _PREMAKE_VERSION == "4.3" then - MPT_PREMAKE_VERSION = "4.3" -elseif _PREMAKE_VERSION == "4.4-beta5" then - MPT_PREMAKE_VERSION = "4.4" -elseif _PREMAKE_VERSION == "5.0-alpha3" then - MPT_PREMAKE_VERSION = "5.0" -else - print "Premake 4.3 or 4.4-beta5 or 5.0-alpha3 required" - os.exit(1) -end - -newoption { - trigger = "group", - value = "PROJECTS", - description = "OpenMPT project group", - allowed = { - { "libopenmpt-all", "libopenmpt-all" }, - { "libopenmpt_test", "libopenmpt_test" }, - { "libopenmpt", "libopenmpt" }, - { "foo_openmpt", "foo_openmpt" }, - { "in_openmpt", "in_openmpt" }, - { "xmp-openmpt", "xmp-openmpt" }, - { "openmpt123", "openmpt123" }, - { "PluginBridge", "PluginBridge" }, - { "OpenMPT", "OpenMPT" }, - { "all-externals", "all-externals" } - } -} - -function replace_in_file (filename, from, to) - local text - local infile - local outfile - infile = io.open(filename, "r") - text = infile:read("*all") - infile:close() - text = string.gsub(text, from, to) - outfile = io.open(filename, "w") - outfile:write(text) - outfile:close() -end - -function postprocess_vs2008_mfc (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "UseOfMFC=\"2\"", "UseOfMFC=\"1\"") -end -end - -function postprocess_vs2008_main (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") -elseif MPT_PREMAKE_VERSION == "4.4" then - replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") -end -end - -function postprocess_vs2008_dynamicbase (filename) - replace_in_file(filename, "\t\t\t\tEnableCOMDATFolding=\"2\"", "\t\t\t\tEnableCOMDATFolding=\"2\"\n\t\t\t\tRandomizedBaseAddress=\"2\"") -end - -function postprocess_vs2008_nonxcompat (filename) - replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\DataExecutionPrevention=\"1\"\n") -end - -function postprocess_vs2008_largeaddress (filename) - replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\LargeAddressAware=\"2\"\n") -end - -function postprocess_vs2010_mfc (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "<UseOfMfc>Dynamic</UseOfMfc>", "<UseOfMfc>Static</UseOfMfc>") -end -end - -function postprocess_vs2010_main (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") -elseif MPT_PREMAKE_VERSION == "4.4" then - replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") -end -end - -function postprocess_vs2010_dynamicbase (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "<EnableCOMDATFolding>true</EnableCOMDATFolding>", "<EnableCOMDATFolding>true</EnableCOMDATFolding>\n\t\t\t<RandomizedBaseAddress>true</RandomizedBaseAddress>") -elseif MPT_PREMAKE_VERSION == "4.4" then - replace_in_file(filename, "<EnableCOMDATFolding>true</EnableCOMDATFolding>", "<EnableCOMDATFolding>true</EnableCOMDATFolding>\n <RandomizedBaseAddress>true</RandomizedBaseAddress>") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, "<EnableCOMDATFolding>true</EnableCOMDATFolding>", "<EnableCOMDATFolding>true</EnableCOMDATFolding>\n <RandomizedBaseAddress>true</RandomizedBaseAddress>") -end -end - -function postprocess_vs2010_nonxcompat (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<DataExecutionPrevention>false</DataExecutionPrevention>\n\t\t</Link>\n") -elseif MPT_PREMAKE_VERSION == "4.4" then - replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n") -end -end - -function postprocess_vs2010_largeaddress (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<LargeAddressAware>true</LargeAddressAware>\n\t\t</Link>\n") -elseif MPT_PREMAKE_VERSION == "4.4" then - replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n") -end -end - -function fixbug_vs2010_pch (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "</PrecompiledHeader>\n\t\t</ClCompile>", "</PrecompiledHeader>") -end -end - -newaction { - trigger = "postprocess", - description = "OpenMPT postprocess the project files to mitigate premake problems", - execute = function () - postprocess_vs2008_main("build/vs2008/libopenmpt_test.vcproj") - postprocess_vs2008_main("build/vs2008/openmpt123.vcproj") - postprocess_vs2008_main("build/vs2008/libopenmpt_example_c.vcproj") - postprocess_vs2008_main("build/vs2008/libopenmpt_example_c_mem.vcproj") - postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj") - postprocess_vs2008_dynamicbase("build/vs2008/OpenMPT.vcproj") - postprocess_vs2008_nonxcompat("build/vs2008/OpenMPT.vcproj") - postprocess_vs2008_largeaddress("build/vs2008/OpenMPT.vcproj") - postprocess_vs2008_dynamicbase("build/vs2008/PluginBridge.vcproj") - postprocess_vs2008_nonxcompat("build/vs2008/PluginBridge.vcproj") - postprocess_vs2008_largeaddress("build/vs2008/PluginBridge.vcproj") - postprocess_vs2010_main("build/vs2010/libopenmpt_test.vcxproj") - postprocess_vs2010_main("build/vs2010/openmpt123.vcxproj") - postprocess_vs2010_main("build/vs2010/OpenMPT.vcxproj") - postprocess_vs2010_main("build/vs2010/libopenmpt_example_c.vcxproj") - postprocess_vs2010_main("build/vs2010/libopenmpt_example_c_mem.vcxproj") - postprocess_vs2010_main("build/vs2010/libopenmpt_example_cxx.vcxproj") - postprocess_vs2010_mfc("build/vs2010/in_openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2010/xmp-openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2010/OpenMPT.vcxproj") - postprocess_vs2010_dynamicbase("build/vs2010/OpenMPT.vcxproj") - postprocess_vs2010_nonxcompat("build/vs2010/OpenMPT.vcxproj") - postprocess_vs2010_largeaddress("build/vs2010/OpenMPT.vcxproj") - postprocess_vs2010_dynamicbase("build/vs2010/PluginBridge.vcxproj") - postprocess_vs2010_nonxcompat("build/vs2010/PluginBridge.vcxproj") - postprocess_vs2010_largeaddress("build/vs2010/PluginBridge.vcxproj") - fixbug_vs2010_pch("build/vs2010/OpenMPT.vcxproj") - end -} - -if _OPTIONS["group"] == "libopenmpt-all" then - -solution "libopenmpt-all" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end - - dofile "../build/premake4-win/mpt-libopenmpt_test.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt_examples.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmptDLL.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt_modplug.premake4.lua" - dofile "../build/premake4-win/mpt-foo_openmpt.premake4.lua" - dofile "../build/premake4-win/mpt-in_openmpt.premake4.lua" - dofile "../build/premake4-win/mpt-xmp-openmpt.premake4.lua" - dofile "../build/premake4-win/mpt-openmpt123.premake4.lua" - dofile "../build/premake4-win/ext-flac.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - dofile "../build/premake4-win/ext-portaudio.premake4.lua" - -end - -if _OPTIONS["group"] == "libopenmpt_test" then - -solution "libopenmpt_test" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end - - dofile "../build/premake4-win/mpt-libopenmpt_test.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - -end - -if _OPTIONS["group"] == "foo_openmpt" then - -solution "foo_openmpt" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86" } -else - platforms { "x32" } -end - - dofile "../build/premake4-win/mpt-foo_openmpt.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - -end - -if _OPTIONS["group"] == "in_openmpt" then - -solution "in_openmpt" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86" } -else - platforms { "x32" } -end - - dofile "../build/premake4-win/mpt-in_openmpt.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - -end - -if _OPTIONS["group"] == "xmp-openmpt" then - -solution "xmp-openmpt" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86" } -else - platforms { "x32" } -end - - dofile "../build/premake4-win/mpt-xmp-openmpt.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - dofile "../build/premake4-win/ext-pugixml.premake4.lua" - -end - --- should stay the last libopenmpt solution in order to overwrite the libopenmpt base project with all possible configurations -if _OPTIONS["group"] == "libopenmpt" then - -solution "libopenmpt" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end - - dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt_examples.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmptDLL.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt_modplug.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - dofile "../build/premake4-win/ext-miniz-shared.premake4.lua" - dofile "../build/premake4-win/ext-portaudio.premake4.lua" - -end - -if _OPTIONS["group"] == "openmpt123" then - -solution "openmpt123" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end - - dofile "../build/premake4-win/mpt-openmpt123.premake4.lua" - dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua" - dofile "../build/premake4-win/ext-flac.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - dofile "../build/premake4-win/ext-ogg.premake4.lua" - dofile "../build/premake4-win/ext-portaudio.premake4.lua" - -end - -if _OPTIONS["group"] == "PluginBridge" then - -solution "PluginBridge" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release", "ReleaseNoLTCG" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end - - dofile "../build/premake4-win/mpt-PluginBridge.premake4.lua" - -end - - -if _OPTIONS["group"] == "OpenMPT" then - -solution "OpenMPT" - location ( "../build/" .. _ACTION ) - configurations { "Debug", "Release", "ReleaseNoLTCG" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end - - dofile "../build/premake4-win/mpt-OpenMPT.premake4.lua" - dofile "../build/premake4-win/mpt-PluginBridge.premake4.lua" - dofile "../build/premake4-win/ext-flac.premake4.lua" - dofile "../build/premake4-win/ext-lhasa.premake4.lua" - dofile "../build/premake4-win/ext-minizip.premake4.lua" - dofile "../build/premake4-win/ext-ogg.premake4.lua" - dofile "../build/premake4-win/ext-portaudio.premake4.lua" - dofile "../build/premake4-win/ext-portmidi.premake4.lua" - dofile "../build/premake4-win/ext-r8brain.premake4.lua" - dofile "../build/premake4-win/ext-smbPitchShift.premake4.lua" - dofile "../build/premake4-win/ext-soundtouch.premake4.lua" - dofile "../build/premake4-win/ext-UnRAR.premake4.lua" - dofile "../build/premake4-win/ext-zlib.premake4.lua" - -end - --- overwrite all external projects once again with the full matrix of possible build config combinations -if _OPTIONS["group"] == "all-externals" then - -solution "all-externals" - configurations { "Debug", "Release", "ReleaseNoLTCG" } -if MPT_PREMAKE_VERSION == "5.0" then - platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end - - dofile "../build/premake4-win/ext-flac.premake4.lua" - dofile "../build/premake4-win/ext-lhasa.premake4.lua" - dofile "../build/premake4-win/ext-miniz.premake4.lua" - dofile "../build/premake4-win/ext-miniz-shared.premake4.lua" - dofile "../build/premake4-win/ext-minizip.premake4.lua" - dofile "../build/premake4-win/ext-ogg.premake4.lua" - dofile "../build/premake4-win/ext-portaudio.premake4.lua" - dofile "../build/premake4-win/ext-portmidi.premake4.lua" - dofile "../build/premake4-win/ext-pugixml.premake4.lua" - dofile "../build/premake4-win/ext-r8brain.premake4.lua" - dofile "../build/premake4-win/ext-smbPitchShift.premake4.lua" - dofile "../build/premake4-win/ext-soundtouch.premake4.lua" - dofile "../build/premake4-win/ext-UnRAR.premake4.lua" - dofile "../build/premake4-win/ext-zlib.premake4.lua" - -end Modified: trunk/OpenMPT/build/update_premake4_projects.cmd =================================================================== --- trunk/OpenMPT/build/update_premake4_projects.cmd 2015-05-10 08:09:44 UTC (rev 5064) +++ trunk/OpenMPT/build/update_premake4_projects.cmd 2015-05-10 08:24:02 UTC (rev 5065) @@ -11,25 +11,25 @@ :premake4 -echo dofile "build/premake4.lua" > premake4.lua || goto err +echo dofile "build/premake4-win/premake.lua" > premake4.lua || goto err -build\premake4.exe --group=libopenmpt_test vs2008 || goto err -build\premake4.exe --group=libopenmpt vs2008 || goto err -build\premake4.exe --group=openmpt123 vs2008 || goto err -build\premake4.exe --group=PluginBridge vs2008 || goto err -build\premake4.exe --group=OpenMPT vs2008 || goto err -build\premake4.exe --group=all-externals vs2008 || goto err +include\premake\premake4.exe --group=libopenmpt_test vs2008 || goto err +include\premake\premake4.exe --group=libopenmpt vs2008 || goto err +include\premake\premake4.exe --group=openmpt123 vs2008 || goto err +include\premake\premake4.exe --group=PluginBridge vs2008 || goto err +include\premake\premake4.exe --group=OpenMPT vs2008 || goto err +include\premake\premake4.exe --group=all-externals vs2008 || goto err -build\premake4.exe --group=libopenmpt_test vs2010 || goto err -build\premake4.exe --group=in_openmpt vs2010 || goto err -build\premake4.exe --group=xmp-openmpt vs2010 || goto err -build\premake4.exe --group=libopenmpt vs2010 || goto err -build\premake4.exe --group=openmpt123 vs2010 || goto err -build\premake4.exe --group=PluginBridge vs2010 || goto err -build\premake4.exe --group=OpenMPT vs2010 || goto err -build\premake4.exe --group=all-externals vs2010 || goto err +include\premake\premake4.exe --group=libopenmpt_test vs2010 || goto err +include\premake\premake4.exe --group=in_openmpt vs2010 || goto err +include\premake\premake4.exe --group=xmp-openmpt vs2010 || goto err +include\premake\premake4.exe --group=libopenmpt vs2010 || goto err +include\premake\premake4.exe --group=openmpt123 vs2010 || goto err +include\premake\premake4.exe --group=PluginBridge vs2010 || goto err +include\premake\premake4.exe --group=OpenMPT vs2010 || goto err +include\premake\premake4.exe --group=all-externals vs2010 || goto err -build\premake4.exe postprocess || goto err +include\premake\premake4.exe postprocess || goto err del premake4.lua || goto err @@ -38,26 +38,26 @@ :premake5 -echo dofile "build/premake4.lua" > premake5.lua || goto err +echo dofile "build/premake4-win/premake.lua" > premake5.lua || goto err -build\premake5.exe --group=libopenmpt_test vs2008 || goto err -build\premake5.exe --group=libopenmpt vs2008 || goto err -build\premake5.exe --group=openmpt123 vs2008 || goto err -build\premake5.exe --group=PluginBridge vs2008 || goto err -build\premake5.exe --group=OpenMPT vs2008 || goto err -build\premake5.exe --group=all-externals vs2008 || goto err +include\premake\premake5.exe --group=libopenmpt_test vs2008 || goto err +include\premake\premake5.exe --group=libopenmpt vs2008 || goto err +include\premake\premake5.exe --group=openmpt123 vs2008 || goto err +include\premake\premake5.exe --group=PluginBridge vs2008 || goto err +include\premake\premake5.exe --group=OpenMPT vs2008 || goto err +include\premake\premake5.exe --group=all-externals vs2008 || goto err -build\premake5.exe --group=libopenmpt_test vs2010 || goto err -build\premake5.exe --group=foo_openmpt vs2010 || goto err -build\premake5.exe --group=in_openmpt vs2010 || goto err -build\premake5.exe --group=xmp-openmpt vs2010 || goto err -build\premake5.exe --group=libopenmpt vs2010 || goto err -build\premake5.exe --group=openmpt123 vs2010 || goto err -build\premake5.exe --group=PluginBridge vs2010 || goto err -build\premake5.exe --group=OpenMPT vs2010 || goto err -build\premake5.exe --group=all-externals vs2010 || goto err +include\premake\premake5.exe --group=libopenmpt_test vs2010 || goto err +include\premake\premake5.exe --group=foo_openmpt vs2010 || goto err +include\premake\premake5.exe --group=in_openmpt vs2010 || goto err +include\premake\premake5.exe --group=xmp-openmpt vs2010 || goto err +include\premake\premake5.exe --group=libopenmpt vs2010 || goto err +include\premake\premake5.exe --group=openmpt123 vs2010 || goto err +include\premake\premake5.exe --group=PluginBridge vs2010 || goto err +include\premake\premake5.exe --group=OpenMPT vs2010 || goto err +include\premake\premake5.exe --group=all-externals vs2010 || goto err -build\premake5.exe postprocess || goto err +include\premake\premake5.exe postprocess || goto err del premake5.lua || goto err Index: trunk/OpenMPT/build/vs2008-ext =================================================================== --- trunk/OpenMPT/build/vs2008-ext 2015-05-10 08:09:44 UTC (rev 5064) +++ trunk/OpenMPT/build/vs2008-ext 2015-05-10 08:24:02 UTC (rev 5065) Property changes on: trunk/OpenMPT/build/vs2008-ext ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *.user +all-externals.sln Index: trunk/OpenMPT/build/vs2010-ext =================================================================== --- trunk/OpenMPT/build/vs2010-ext 2015-05-10 08:09:44 UTC (rev 5064) +++ trunk/OpenMPT/build/vs2010-ext 2015-05-10 08:24:02 UTC (rev 5065) Property changes on: trunk/OpenMPT/build/vs2010-ext ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *.user +all-externals.sln Index: trunk/OpenMPT/include/premake =================================================================== --- trunk/OpenMPT/include/premake 2015-05-10 08:09:44 UTC (rev 5064) +++ trunk/OpenMPT/include/premake 2015-05-10 08:24:02 UTC (rev 5065) Property changes on: trunk/OpenMPT/include/premake ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +premake4.exe +premake5.exe Added: tsvn:logminsize ## -0,0 +1 ## +10 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-10 09:52:10
|
Revision: 5068 http://sourceforge.net/p/modplug/code/5068 Author: manxorist Date: 2015-05-10 09:51:57 +0000 (Sun, 10 May 2015) Log Message: ----------- [Mod] build: Default to premake5. [Mod] build: Update all premake-generated project files to the 5.0-alpha3 version. There should be no functional changes in the generated project files. [Mod] OpenMPT: Version is now 1.25.00.05 Modified Paths: -------------- trunk/OpenMPT/build/regenerate_vs_projects.cmd trunk/OpenMPT/build/vs2008/OpenMPT.sln trunk/OpenMPT/build/vs2008/OpenMPT.vcproj trunk/OpenMPT/build/vs2008/PluginBridge.sln trunk/OpenMPT/build/vs2008/PluginBridge.vcproj trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj trunk/OpenMPT/build/vs2008/libopenmpt.vcproj trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_example_c.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_example_c_mem.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_modplug.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj trunk/OpenMPT/build/vs2008/openmpt123.vcproj trunk/OpenMPT/build/vs2008-ext/UnRAR.vcproj trunk/OpenMPT/build/vs2008-ext/flac.vcproj trunk/OpenMPT/build/vs2008-ext/lhasa.vcproj trunk/OpenMPT/build/vs2008-ext/miniz-shared.vcproj trunk/OpenMPT/build/vs2008-ext/miniz.vcproj trunk/OpenMPT/build/vs2008-ext/minizip.vcproj trunk/OpenMPT/build/vs2008-ext/ogg.vcproj trunk/OpenMPT/build/vs2008-ext/portaudio.vcproj trunk/OpenMPT/build/vs2008-ext/portmidi.vcproj trunk/OpenMPT/build/vs2008-ext/pugixml.vcproj trunk/OpenMPT/build/vs2008-ext/r8brain.vcproj trunk/OpenMPT/build/vs2008-ext/smbPitchShift.vcproj trunk/OpenMPT/build/vs2008-ext/soundtouch.vcproj trunk/OpenMPT/build/vs2008-ext/zlib.vcproj trunk/OpenMPT/build/vs2010/OpenMPT.sln trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2010/PluginBridge.sln trunk/OpenMPT/build/vs2010/PluginBridge.vcxproj trunk/OpenMPT/build/vs2010/VST MIDI Input Output.vcxproj trunk/OpenMPT/build/vs2010/VST MIDI Input Output.vcxproj.filters trunk/OpenMPT/build/vs2010/foo_openmpt.sln trunk/OpenMPT/build/vs2010/foo_openmpt.vcxproj trunk/OpenMPT/build/vs2010/in_openmpt.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters trunk/OpenMPT/build/vs2010/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_modplug.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2010/openmpt123.vcxproj trunk/OpenMPT/build/vs2010/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2010-ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2010-ext/flac.vcxproj trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/lhasa.vcxproj trunk/OpenMPT/build/vs2010-ext/lhasa.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/miniz-shared.vcxproj trunk/OpenMPT/build/vs2010-ext/miniz.vcxproj trunk/OpenMPT/build/vs2010-ext/minizip.vcxproj trunk/OpenMPT/build/vs2010-ext/ogg.vcxproj trunk/OpenMPT/build/vs2010-ext/ogg.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/portaudio.vcxproj trunk/OpenMPT/build/vs2010-ext/portaudio.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/portmidi.vcxproj trunk/OpenMPT/build/vs2010-ext/portmidi.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/pugixml.vcxproj trunk/OpenMPT/build/vs2010-ext/r8brain.vcxproj trunk/OpenMPT/build/vs2010-ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2010-ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2010-ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/zlib.vcxproj trunk/OpenMPT/common/versionNumber.h Removed Paths: ------------- trunk/OpenMPT/build/vs2010/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2010/foo_openmpt.vcxproj.filters trunk/OpenMPT/build/vs2010/in_openmpt.vcxproj.filters trunk/OpenMPT/build/vs2010/libopenmpt_example_c.vcxproj.filters trunk/OpenMPT/build/vs2010/libopenmpt_example_c_mem.vcxproj.filters trunk/OpenMPT/build/vs2010/libopenmpt_example_cxx.vcxproj.filters trunk/OpenMPT/build/vs2010/libopenmpt_modplug.vcxproj.filters trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2010/xmp-openmpt.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/UnRAR.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/miniz-shared.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/miniz.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/minizip.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/pugixml.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/r8brain.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/smbPitchShift.vcxproj.filters trunk/OpenMPT/build/vs2010-ext/zlib.vcxproj.filters Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd =================================================================== --- trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-10 09:33:37 UTC (rev 5067) +++ trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-10 09:51:57 UTC (rev 5068) @@ -6,7 +6,7 @@ cd .. || goto err -goto premake4 +goto premake5 :premake4 Modified: trunk/OpenMPT/build/vs2008/OpenMPT.sln =================================================================== --- trunk/OpenMPT/build/vs2008/OpenMPT.sln 2015-05-10 09:33:37 UTC (rev 5067) +++ trunk/OpenMPT/build/vs2008/OpenMPT.sln 2015-05-10 09:51:57 UTC (rev 5068) @@ -48,180 +48,180 @@ GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + ReleaseNoLTCG|Win32 = ReleaseNoLTCG|Win32 + ReleaseNoLTCG|x64 = ReleaseNoLTCG|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - ReleaseNoLTCG|Win32 = ReleaseNoLTCG|Win32 - ReleaseNoLTCG|x64 = ReleaseNoLTCG|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Debug|Win32.ActiveCfg = Debug|Win32 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Debug|Win32.Build.0 = Debug|Win32 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Debug|x64.ActiveCfg = Debug|x64 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Debug|x64.Build.0 = Debug|x64 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|Win32.ActiveCfg = Release|Win32 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|Win32.Build.0 = Release|Win32 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|x64.ActiveCfg = Release|x64 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|x64.Build.0 = Release|x64 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Debug|Win32.ActiveCfg = Debug|Win32 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Debug|Win32.Build.0 = Debug|Win32 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Debug|x64.ActiveCfg = Debug|x64 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Debug|x64.Build.0 = Debug|x64 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Release|Win32.ActiveCfg = Release|Win32 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Release|Win32.Build.0 = Release|Win32 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Release|x64.ActiveCfg = Release|x64 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Release|x64.Build.0 = Release|x64 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|Win32.ActiveCfg = Debug|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|Win32.Build.0 = Debug|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|x64.ActiveCfg = Debug|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|x64.Build.0 = Debug|x64 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.ActiveCfg = Release|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.Build.0 = Release|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.ActiveCfg = Release|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.Build.0 = Release|x64 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|Win32.ActiveCfg = Debug|Win32 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|Win32.Build.0 = Debug|Win32 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|x64.ActiveCfg = Debug|x64 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|x64.Build.0 = Debug|x64 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.ActiveCfg = Release|Win32 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.Build.0 = Release|Win32 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.ActiveCfg = Release|x64 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.Build.0 = Release|x64 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|Win32.ActiveCfg = Debug|Win32 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|Win32.Build.0 = Debug|Win32 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|x64.ActiveCfg = Debug|x64 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|x64.Build.0 = Debug|x64 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.ActiveCfg = Release|Win32 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.Build.0 = Release|Win32 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.ActiveCfg = Release|x64 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.Build.0 = Release|x64 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|Win32.ActiveCfg = Debug|Win32 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|Win32.Build.0 = Debug|Win32 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|x64.ActiveCfg = Debug|x64 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|x64.Build.0 = Debug|x64 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|Win32.ActiveCfg = Release|Win32 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|Win32.Build.0 = Release|Win32 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.ActiveCfg = Release|x64 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.Build.0 = Release|x64 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.ActiveCfg = Debug|Win32 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.Build.0 = Debug|Win32 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.ActiveCfg = Debug|x64 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.Build.0 = Debug|x64 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.ActiveCfg = Release|Win32 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = Debug|Win32 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = Debug|Win32 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = Debug|x64 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.Build.0 = Debug|x64 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|Win32.ActiveCfg = Release|Win32 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|Win32.Build.0 = Release|Win32 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.ActiveCfg = Release|x64 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.Build.0 = Release|x64 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Debug|Win32.ActiveCfg = Debug|Win32 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Debug|Win32.Build.0 = Debug|Win32 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Debug|x64.ActiveCfg = Debug|x64 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Debug|x64.Build.0 = Debug|x64 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Release|Win32.ActiveCfg = Release|Win32 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Release|Win32.Build.0 = Release|Win32 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Release|x64.ActiveCfg = Release|x64 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Release|x64.Build.0 = Release|x64 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|Win32.ActiveCfg = Debug|Win32 {BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|Win32.Build.0 = Debug|Win32 {BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|x64.ActiveCfg = Debug|x64 {BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|x64.Build.0 = Debug|x64 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.ActiveCfg = Release|Win32 {BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.Build.0 = Release|Win32 {BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.ActiveCfg = Release|x64 {BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.Build.0 = Release|x64 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.ActiveCfg = Debug|Win32 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.Build.0 = Debug|Win32 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.ActiveCfg = Debug|x64 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.Build.0 = Debug|x64 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.ActiveCfg = Release|Win32 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.Build.0 = Release|Win32 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.ActiveCfg = Release|x64 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.Build.0 = Release|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.ActiveCfg = Debug|Win32 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.Build.0 = Debug|Win32 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.ActiveCfg = Debug|x64 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.Build.0 = Debug|x64 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.ActiveCfg = Release|Win32 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.Build.0 = Release|Win32 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.ActiveCfg = Release|x64 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.Build.0 = Release|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|Win32.ActiveCfg = Debug|Win32 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|Win32.Build.0 = Debug|Win32 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|x64.ActiveCfg = Debug|x64 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|x64.Build.0 = Debug|x64 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|Win32.ActiveCfg = Release|Win32 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|Win32.Build.0 = Release|Win32 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.ActiveCfg = Release|x64 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.Build.0 = Release|x64 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.ActiveCfg = Debug|Win32 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.Build.0 = Debug|Win32 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.ActiveCfg = Debug|x64 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.Build.0 = Debug|x64 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.ActiveCfg = Release|Win32 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.Build.0 = Release|Win32 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.ActiveCfg = Release|x64 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.Build.0 = Release|x64 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-10 09:33:37 UTC (rev 5067) +++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-10 09:51:57 UTC (rev 5068) @@ -6,6 +6,7 @@ ProjectGUID="{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}" RootNamespace="OpenMPT" Keyword="Win32Proj" + TargetFrameworkVersion="0" > <Platforms> <Platform @@ -21,7 +22,7 @@ <Configuration Name="Debug|Win32" OutputDirectory="..\..\bin\Win32-Debug" - IntermediateDirectory="..\obj\OpenMPT\x32\Debug" + IntermediateDirectory="..\obj\OpenMPT\x86\Debug" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -48,14 +49,13 @@ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" + BasicRuntimeChecks="3" ExceptionHandling="2" - BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" DebugInformationFormat="4" /> <Tool @@ -74,12 +74,9 @@ LargeAddressAware="2" DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" - AdditionalDependencies="..\lib\x32\Debug\UnRAR.lib ..\lib\x32\Debug\zlib.lib ..\lib\x32\Debug\minizip.lib ..\lib\x32\Debug\smbPitchShift.lib ..\lib\x32\Debug\lhasa.lib ..\lib\x32\Debug\flac.lib ..\lib\x32\Debug\ogg.lib ..\lib\x32\Debug\portaudio.lib ..\lib\x32\Debug\r8brain.lib ..\..\bin\Win32-Debug\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="2" - AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" SubSystem="2" TargetMachine="1" /> @@ -102,16 +99,13 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\bin\x64-Debug" - IntermediateDirectory="..\obj\OpenMPT\x64\Debug" + IntermediateDirectory="..\obj\OpenMPT\x86_64\Debug" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -139,14 +133,13 @@ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="true" + BasicRuntimeChecks="3" ExceptionHandling="2" - BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" DebugInformationFormat="3" /> <Tool @@ -165,12 +158,9 @@ LargeAddressAware="2" DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" - AdditionalDependencies="..\lib\x64\Debug\UnRAR.lib ..\lib\x64\Debug\zlib.lib ..\lib\x64\Debug\minizip.lib ..\lib\x64\Debug\smbPitchShift.lib ..\lib\x64\Debug\lhasa.lib ..\lib\x64\Debug\flac.lib ..\lib\x64\Debug\ogg.lib ..\lib\x64\Debug\portaudio.lib ..\lib\x64\Debug\r8brain.lib ..\..\bin\x64-Debug\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="2" - AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" SubSystem="2" TargetMachine="17" /> @@ -193,16 +183,13 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="..\..\bin\Win32" - IntermediateDirectory="..\obj\OpenMPT\x32\Release" + IntermediateDirectory="..\obj\OpenMPT\x86\Release" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -228,16 +215,16 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" + StringPooling="true" ExceptionHandling="2" - StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" FloatingPointModel="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" DebugInformationFormat="3" /> <Tool @@ -256,12 +243,9 @@ LargeAddressAware="2" DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" - AdditionalDependencies="..\lib\x32\Release\UnRAR.lib ..\lib\x32\Release\zlib.lib ..\lib\x32\Release\minizip.lib ..\lib\x32\Release\smbPitchShift.lib ..\lib\x32\Release\lhasa.lib ..\lib\x32\Release\flac.lib ..\lib\x32\Release\ogg.lib ..\lib\x32\Release\portaudio.lib ..\lib\x32\Release\r8brain.lib ..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="1" - AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -287,16 +271,13 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|x64" OutputDirectory="..\..\bin\x64" - IntermediateDirectory="..\obj\OpenMPT\x64\Release" + IntermediateDirectory="..\obj\OpenMPT\x86_64\Release" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -323,16 +304,16 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" + StringPooling="true" ExceptionHandling="2" - StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" FloatingPointModel="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" DebugInformationFormat="3" /> <Tool @@ -351,12 +332,9 @@ LargeAddressAware="2" DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" - AdditionalDependencies="..\lib\x64\Release\UnRAR.lib ..\lib\x64\Release\zlib.lib ..\lib\x64\Release\minizip.lib ..\lib\x64\Release\smbPitchShift.lib ..\lib\x64\Release\lhasa.lib ..\lib\x64\Release\flac.lib ..\lib\x64\Release\ogg.lib ..\lib\x64\Release\portaudio.lib ..\lib\x64\Release\r8brain.lib ..\..\bin\x64\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="1" - AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -382,16 +360,13 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="ReleaseNoLTCG|Win32" OutputDirectory="..\..\bin\Win32" - IntermediateDirectory="..\obj\OpenMPT\x32\ReleaseNoLTCG" + IntermediateDirectory="..\obj\OpenMPT\x86\ReleaseNoLTCG" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -414,19 +389,18 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" + StringPooling="true" ExceptionHandling="2" - StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" FloatingPointModel="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" DebugInformationFormat="0" /> <Tool @@ -445,10 +419,8 @@ LargeAddressAware="2" DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" - AdditionalDependencies="..\lib\x32\ReleaseNoLTCG\UnRAR.lib ..\lib\x32\ReleaseNoLTCG\zlib.lib ..\lib\x32\ReleaseNoLTCG\minizip.lib ..\lib\x32\ReleaseNoLTCG\smbPitchShift.lib ..\lib\x32\ReleaseNoLTCG\lhasa.lib ..\lib\x32\ReleaseNoLTCG\flac.lib ..\lib\x32\ReleaseNoLTCG\ogg.lib ..\lib\x32\ReleaseNoLTCG\portaudio.lib ..\lib\x32\ReleaseNoLTCG\r8brain.lib ..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="1" - AdditionalLibraryDirectories="" GenerateDebugInformation="false" SubSystem="2" OptimizeReferences="2" @@ -475,16 +447,13 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="ReleaseNoLTCG|x64" OutputDirectory="..\..\bin\x64" - IntermediateDirectory="..\obj\OpenMPT\x64\ReleaseNoLTCG" + IntermediateDirectory="..\obj\OpenMPT\x86_64\ReleaseNoLTCG" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -508,19 +477,18 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" + StringPooling="true" ExceptionHandling="2" - StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" FloatingPointModel="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - ProgramDataBaseFileName="$(OutDir)\OpenMPT.pdb" DebugInformationFormat="0" /> <Tool @@ -539,10 +507,8 @@ LargeAddressAware="2" DataExecutionPrevention="1" AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll" - AdditionalDependencies="..\lib\x64\ReleaseNoLTCG\UnRAR.lib ..\lib\x64\ReleaseNoLTCG\zlib.lib ..\lib\x64\ReleaseNoLTCG\minizip.lib ..\lib\x64\ReleaseNoLTCG\smbPitchShift.lib ..\lib\x64\ReleaseNoLTCG\lhasa.lib ..\lib\x64\ReleaseNoLTCG\flac.lib ..\lib\x64\ReleaseNoLTCG\ogg.lib ..\lib\x64\ReleaseNoLTCG\portaudio.lib ..\lib\x64\ReleaseNoLTCG\r8brain.lib ..\..\bin\x64\OpenMPT_SoundTouch_f32.lib" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="1" - AdditionalLibraryDirectories="" GenerateDebugInformation="false" SubSystem="2" OptimizeReferences="2" @@ -569,61 +535,173 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> + <ProjectReference + ReferencedProjectIdentifier="{95CC809B-03FC-4EDB-BB20-FD07A698C05F}" + RelativePathToProject="..\vs2008-ext\UnRAR.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}" + RelativePathToProject="..\vs2008-ext\zlib.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}" + RelativePathToProject="..\vs2008-ext\minizip.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{89AF16DD-32CC-4A7E-B219-5F117D761F9F}" + RelativePathToProject="..\vs2008-ext\smbPitchShift.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{6B11F6A8-B131-4D2B-80EF-5731A9016436}" + RelativePathToProject="..\vs2008-ext\lhasa.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}" + RelativePathToProject="..\vs2008-ext\flac.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}" + RelativePathToProject="..\vs2008-ext\ogg.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{189B867F-FF4B-45A1-B741-A97492EE69AF}" + RelativePathToProject="..\vs2008-ext\portaudio.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{BC116B29-9958-4389-B294-7529BB7C7D37}" + RelativePathToProject="..\vs2008-ext\r8brain.vcproj" + /> + <ProjectReference + ReferencedProjectIdentifier="{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}" + RelativePathToProject="..\vs2008-ext\soundtouch.vcproj" + /> </References> <Files> <Filter Name="common" - Filter="" > <File RelativePath="..\..\common\AudioCriticalSection.cpp" > </File> <File + RelativePath="..\..\common\AudioCriticalSection.h" + > + </File> + <File + RelativePath="..\..\common\BuildSettings.h" + > + </File> + <File + RelativePath="..\..\common\CompilerDetect.h" + > + </File> + <File RelativePath="..\..\common\ComponentManager.cpp" > </File> <File + RelativePath="..\..\common\ComponentManager.h" + > + </File> + <File + RelativePath="..\..\common\Endianness.h" + > + </File> + <File + RelativePath="..\..\common\FileReader.h" + > + </File> + <File + RelativePath="..\..\common\FlagSet.h" + > + </File> + <File RelativePath="..\..\common\Logging.cpp" > </File> <File + RelativePath="..\..\common\Logging.h" + > + </File> + <File + RelativePath="..\..\common\Profiler.cpp" + > + </File> + <File + RelativePath="..\..\common\Profiler.h" + > + </File> + <File + RelativePath="..\..\common\StringFixer.h" + > + </File> + <File + RelativePath="..\..\common\WriteMemoryDump.h" + > + </File> + <File RelativePath="..\..\common\misc_util.cpp" > </File> <File + RelativePath="..\..\common\misc_util.h" + > + </File> + <File + RelativePath="..\..\common\mptAtomic.h" + > + </File> + <File RelativePath="..\..\common\mptFileIO.cpp" > </File> <File + RelativePath="..\..\common\mptFileIO.h" + > + </File> + <File RelativePath="..\..\common\mptIO.cpp" > </File> <File + RelativePath="..\..\common\mptIO.h" + > + </File> + <File RelativePath="..\..\common\mptPathString.cpp" > </File> <File + RelativePath="..\..\common\mptPathString.h" + > + </File> + <File RelativePath="..\..\common\mptString.cpp" > </File> <File - RelativePath="..\..\common\Profiler.cpp" + RelativePath="..\..\common\mptString.h" > </File> <File + RelativePath="..\..\common\mutex.h" + > + </File> + <File RelativePath="..\..\common\serialization_utils.cpp" > </File> <File + RelativePath="..\..\common\serialization_utils.h" + > + </File> + <File RelativePath="..\..\common\stdafx.cpp" > <FileConfiguration @@ -676,98 +754,26 @@ </FileConfiguration> </File> <File - RelativePath="..\..\common\typedefs.cpp" + RelativePath="..\..\common\stdafx.h" > </File> <File - RelativePath="..\..\common\version.cpp" + RelativePath="..\..\common\thread.h" > </File> <File - RelativePath="..\..\common\AudioCriticalSection.h" + RelativePath="..\..\common\typedefs.cpp" > </File> <File - RelativePath="..\..\common\BuildSettings.h" + RelativePath="..\..\common\typedefs.h" > </File> <File - RelativePath="..\..\common\CompilerDetect.h" + RelativePath="..\..\common\version.cpp" > </File> <File - RelativePath="..\..\common\ComponentManager.h" - > - </File> - <File - RelativePath="..\..\common\Endianness.h" - > - </File> - <File - RelativePath="..\..\common\FileReader.h" - > - </File> - <File - RelativePath="..\..\common\FlagSet.h" - > - </File> - <File - RelativePath="..\..\common\Logging.h" - > - </File> - <File - RelativePath="..\..\common\misc_util.h" - > - </File> - <File - RelativePath="..\..\common\mptAtomic.h" - > - </File> - <File - RelativePath="..\..\common\mptFileIO.h" - > - </File> - <File - RelativePath="..\..\common\mptIO.h" - > - </File> - <File - RelativePath="..\..\common\mptPathString.h" - > - </File> - <File - RelativePath="..\..\common\mptString.h" - > - </File> - <File - RelativePath="..\..\common\mutex.h" - > - </File> - <File - RelativePath="..\..\common\Profiler.h" - > - </File> - <File - RelativePath="..\..\common\serialization_utils.h" - > - </File> - <File - RelativePath="..\..\common\stdafx.h" - > - </File> - <File - RelativePath="..\..\common\StringFixer.h" - > - </File> - <File - RelativePath="..\..\common\thread.h" - > - </File> - <File - RelativePath="..\..\common\typedefs.h" - > - </File> - <File RelativePath="..\..\common\version.h" > </File> @@ -775,1340 +781,1328 @@ RelativePath="..\..\common\versionNumber.h" > </File> - <File - RelativePath="..\..\common\WriteMemoryDump.h" - > - </File> </Filter> <Filter - Name="soundlib" - Filter="" + Name="mptrack" > - <Filter - Name="plugins" - Filter="" - > - <File - RelativePath="..\..\soundlib\plugins\DmoToVst.cpp" - > - </File> - <File - RelativePath="..\..\soundlib\plugins\PluginManager.cpp" - > - </File> - <File - RelativePath="..\..\soundlib\plugins\PluginEventQueue.h" - > - </File> - <File - RelativePath="..\..\soundlib\plugins\PluginMixBuffer.h" - > - </File> - <File - RelativePath="..\..\soundlib\plugins\PlugInterface.h" - > - </File> - </Filter> <File - RelativePath="..\..\soundlib\Dither.cpp" + RelativePath="..\..\mptrack\AboutDialog.cpp" > </File> <File - RelativePath="..\..\soundlib\Dlsbank.cpp" + RelativePath="..\..\mptrack\AboutDialog.h" > </File> <File - RelativePath="..\..\soundlib\Fastmix.cpp" + RelativePath="..\..\mptrack\AbstractVstEditor.cpp" > </File> <File - RelativePath="..\..\soundlib\ITCompression.cpp" + RelativePath="..\..\mptrack\AbstractVstEditor.h" > </File> <File - RelativePath="..\..\soundlib\ITTools.cpp" + RelativePath="..\..\mptrack\AppendModule.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_669.cpp" + RelativePath="..\..\mptrack\AutoSaver.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_amf.cpp" + RelativePath="..\..\mptrack\AutoSaver.h" > </File> <File - RelativePath="..\..\soundlib\Load_ams.cpp" + RelativePath="..\..\mptrack\Autotune.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_dbm.cpp" + RelativePath="..\..\mptrack\Autotune.h" > </File> <File - RelativePath="..\..\soundlib\Load_digi.cpp" + RelativePath="..\..\mptrack\CImageListEx.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_dmf.cpp" + RelativePath="..\..\mptrack\CImageListEx.h" > </File> <File - RelativePath="..\..\soundlib\Load_dsm.cpp" + RelativePath="..\..\mptrack\CListCtrl.h" > </File> <File - RelativePath="..\..\soundlib\Load_far.cpp" + RelativePath="..\..\mptrack\CTreeCtrl.h" > </File> <File - RelativePath="..\..\soundlib\Load_gdm.cpp" + RelativePath="..\..\mptrack\ChannelManagerDlg.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_imf.cpp" + RelativePath="..\..\mptrack\ChannelManagerDlg.h" > </File> <File - RelativePath="..\..\soundlib\Load_it.cpp" + RelativePath="..\..\mptrack\Childfrm.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_itp.cpp" + RelativePath="..\..\mptrack\Childfrm.h" > </File> <File - RelativePath="..\..\soundlib\load_j2b.cpp" + RelativePath="..\..\mptrack\CleanupSong.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_mdl.cpp" + RelativePath="..\..\mptrack\CleanupSong.h" > </File> <File - RelativePath="..\..\soundlib\Load_med.cpp" + RelativePath="..\..\mptrack\CloseMainDialog.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_mid.cpp" + RelativePath="..\..\mptrack\CloseMainDialog.h" > </File> <File - RelativePath="..\..\soundlib\Load_mo3.cpp" + RelativePath="..\..\mptrack\ColourEdit.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_mod.cpp" + RelativePath="..\..\mptrack\ColourEdit.h" > </File> <File - RelativePath="..\..\soundlib\Load_mt2.cpp" + RelativePath="..\..\mptrack\CommandSet.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_mtm.cpp" + RelativePath="..\..\mptrack\CommandSet.h" > </File> <File - RelativePath="..\..\soundlib\Load_okt.cpp" + RelativePath="..\..\mptrack\CreditStatic.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_plm.cpp" + RelativePath="..\..\mptrack\CreditStatic.h" > </File> <File - RelativePath="..\..\soundlib\Load_psm.cpp" + RelativePath="..\..\mptrack\Ctrl_com.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_ptm.cpp" + RelativePath="..\..\mptrack\Ctrl_com.h" > </File> <File - RelativePath="..\..\soundlib\Load_s3m.cpp" + RelativePath="..\..\mptrack\Ctrl_gen.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_stm.cpp" + RelativePath="..\..\mptrack\Ctrl_gen.h" > </File> <File - RelativePath="..\..\soundlib\Load_ult.cpp" + RelativePath="..\..\mptrack\Ctrl_ins.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_umx.cpp" + RelativePath="..\..\mptrack\Ctrl_ins.h" > </File> <File - RelativePath="..\..\soundlib\Load_wav.cpp" + RelativePath="..\..\mptrack\Ctrl_pat.cpp" > </File> <File - RelativePath="..\..\soundlib\Load_xm.cpp" + RelativePath="..\..\mptrack\Ctrl_pat.h" > </File> <File - RelativePath="..\..\soundlib\Message.cpp" + RelativePath="..\..\mptrack\Ctrl_seq.cpp" > </File> <File - RelativePath="..\..\soundlib\MIDIEvents.cpp" + RelativePath="..\..\mptrack\Ctrl_smp.cpp" > </File> <File - RelativePath="..\..\soundlib\MIDIMacros.cpp" + RelativePath="..\..\mptrack\Ctrl_smp.h" > </File> <File - RelativePath="..\..\soundlib\MixerLoops.cpp" + RelativePath="..\..\mptrack\DefaultVstEditor.cpp" > </File> <File - RelativePath="..\..\soundlib\MixerSettings.cpp" + RelativePath="..\..\mptrack\DefaultVstEditor.h" > </File> <File - RelativePath="..\..\soundlib\Mmcmp.cpp" + RelativePath="..\..\mptrack\Draw_pat.cpp" > </File> <File - RelativePath="..\..\soundlib\ModChannel.cpp" + RelativePath="..\..\mptrack\EffectInfo.cpp" > </File> <File - RelativePath="..\..\soundlib\modcommand.cpp" + RelativePath="..\..\mptrack\EffectInfo.h" > </File> <File - RelativePath="..\..\soundlib\ModInstrument.cpp" + RelativePath="..\..\mptrack\EffectVis.cpp" > </File> <File - RelativePath="..\..\soundlib\ModSample.cpp" + RelativePath="..\..\mptrack\EffectVis.h" > </File> <File - RelativePath="..\..\soundlib\ModSequence.cpp" + RelativePath="..\..\mptrack\ExceptionHandler.cpp" > </File> <File - RelativePath="..\..\soundlib\modsmp_ctrl.cpp" + RelativePath="..\..\mptrack\ExceptionHandler.h" > </File> <File - RelativePath="..\..\soundlib\mod_specifications.cpp" + RelativePath="..\..\mptrack\ExternalSamples.cpp" > </File> <File - RelativePath="..\..\soundlib\pattern.cpp" + RelativePath="..\..\mptrack\ExternalSamples.h" > </File> <File - RelativePath="..\..\soundlib\patternContainer.cpp" + RelativePath="..\..\mptrack\FadeLaws.h" > </File> <File - RelativePath="..\..\soundlib\RowVisitor.cpp" + RelativePath="..\..\mptrack\FileDialog.cpp" > </File> <File - RelativePath="..\..\soundlib\S3MTools.cpp" + RelativePath="..\..\mptrack\FileDialog.h" > </File> <File - RelativePath="..\..\soundlib\SampleFormats.cpp" + RelativePath="..\..\mptrack\FolderScanner.cpp" > </File> <File - RelativePath="..\..\soundlib\SampleIO.cpp" + RelativePath="..\..\mptrack\FolderScanner.h" > </File> <File - RelativePath="..\..\soundlib\Sndfile.cpp" + RelativePath="..\..\mptrack\Globals.cpp" > </File> <File - RelativePath="..\..\soundlib\Sndmix.cpp" + RelativePath="..\..\mptrack\Globals.h" > </File> <File - RelativePath="..\..\soundlib\Snd_flt.cpp" + RelativePath="..\..\mptrack\InputHandler.cpp" > </File> <File - RelativePath="..\..\soundlib\Snd_fx.cpp" + RelativePath="..\..\mptrack\InputHandler.h" > </File> <File - RelativePath="..\..\soundlib\SoundFilePlayConfig.cpp" + RelativePath="..\..\mptrack\KeyConfigDlg.cpp" > </File> <File - RelativePath="..\..\soundlib\Tables.cpp" + RelativePath="..\..\mptrack\KeyConfigDlg.h" > </File> <File - RelativePath="..\..\soundlib\Tagging.cpp" + RelativePath="..\..\mptrack\MIDIMacroDialog.cpp" > </File> <File - RelativePath="..\..\soundlib\tuning.cpp" + RelativePath="..\..\mptrack\MIDIMacroDialog.h" > </File> <File - RelativePath="..\..\soundlib\tuningbase.cpp" + RelativePath="..\..\mptrack\MIDIMapping.cpp" > </File> <File - RelativePath="..\..\soundlib\tuningCollection.cpp" + RelativePath="..\..\mptrack\MIDIMapping.h" > </File> <File - RelativePath="..\..\soundlib\UpgradeModule.cpp" + RelativePath="..\..\mptrack\MIDIMappingDialog.cpp" > </File> <File - RelativePath="..\..\soundlib\WAVTools.cpp" + RelativePath="..\..\mptrack\MIDIMappingDialog.h" > </File> <File - RelativePath="..\..\soundlib\WindowedFIR.cpp" + RelativePath="..\..\mptrack\MPTHacks.cpp" > </File> <File - RelativePath="..\..\soundlib\XMTools.cpp" + RelativePath="..\..\mptrack\MPTrackLink.cpp" > </File> <File - RelativePath="..\..\soundlib\AudioReadTarget.h" + RelativePath="..\..\mptrack\MPTrackUtil.cpp" > </File> <File - RelativePath="..\..\soundlib\ChunkReader.h" + RelativePath="..\..\mptrack\MPTrackUtil.h" > </File> <File - RelativePath="..\..\soundlib\Dither.h" + RelativePath="..\..\mptrack\MainFrm.cpp" > </File> <File - RelativePath="..\..\soundlib\Dlsbank.h" + RelativePath="..\..\mptrack\Mainbar.cpp" > </File> <File - RelativePath="..\..\soundlib\FloatMixer.h" + RelativePath="..\..\mptrack\Mainbar.h" > </File> <File - RelativePath="..\..\soundlib\IntMixer.h" + RelativePath="..\..\mptrack\Mainfrm.h" > </File> <File - RelativePath="..\..\soundlib\ITCompression.h" + RelativePath="..\..\mptrack\Mod2wave.cpp" > </File> <File - RelativePath="..\..\soundlib\ITTools.h" + RelativePath="..\..\mptrack\ModConvert.cpp" > </File> <File - RelativePath="..\..\soundlib\Loaders.h" + RelativePath="..\..\mptrack\ModConvert.h" > </File> <File - RelativePath="..\..\soundlib\Message.h" + RelativePath="..\..\mptrack\Moddoc.cpp" > </File> <File - RelativePath="..\..\soundlib\MIDIEvents.h" + RelativePath="..\..\mptrack\Moddoc.h" > </File> <File - RelativePath="..\..\soundlib\MIDIMacros.h" + RelativePath="..\..\mptrack\Modedit.cpp" > </File> <File - RelativePath="..\..\soundlib\Mixer.h" + RelativePath="..\..\mptrack\Moptions.cpp" > </File> <File - RelativePath="..\..\soundlib\MixerInterface.h" + RelativePath="..\..\mptrack\Moptions.h" > </File> <File - RelativePath="..\..\soundlib\MixerLoops.h" + RelativePath="..\..\mptrack\MoveFXSlotDialog.cpp" > </File> <File - RelativePath="..\..\soundlib\MixerSettings.h" + RelativePath="..\..\mptrack\MoveFXSlotDialog.h" > </File> <File - RelativePath="..\..\soundlib\ModChannel.h" + RelativePath="..\..\mptrack\Mpdlgs.cpp" > </File> <File - RelativePath="..\..\soundlib\modcommand.h" + RelativePath="..\..\mptrack\Mpdlgs.h" > </File> <File - RelativePath="..\..\soundlib\ModInstrument.h" + RelativePath="..\..\mptrack\Mpt_midi.cpp" > </File> <File - RelativePath="..\..\soundlib\ModSample.h" + RelativePath="..\..\mptrack\Mptrack.cpp" > </File> <File - RelativePath="..\..\soundlib\ModSequence.h" + RelativePath="..\..\mptrack\Mptrack.h" > </File> <File - RelativePath="..\..\soundlib\modsmp_ctrl.h" + RelativePath="..\..\mptrack\Notification.h" > </File> <File - RelativePath="..\..\soundlib\mod_specifications.h" + RelativePath="..\..\mptrack\PNG.cpp" > </File> <File - RelativePath="..\..\soundlib\pattern.h" + RelativePath="..\..\mptrack\PNG.h" > </File> <File - RelativePath="..\..\soundlib\patternContainer.h" + RelativePath="..\..\mptrack\PSRatioCalc.cpp" > </File> <File - RelativePath="..\..\soundlib\Resampler.h" + RelativePath="..\..\mptrack\PSRatioCalc.h" > </File> <File - RelativePath="..\..\soundlib\RowVisitor.h" + RelativePath="..\..\mptrack\PatternClipboard.cpp" > </File> <File - RelativePath="..\..\soundlib\S3MTools.h" + RelativePath="..\..\mptrack\PatternClipboard.h" > </File> <File - RelativePath="..\..\soundlib\SampleFormat.h" + RelativePath="..\..\mptrack\PatternCursor.h" > </File> <File - RelativePath="..\..\soundlib\SampleFormatConverters.h" + RelativePath="..\..\mptrack\PatternEditorDialogs.cpp" > </File> <File - RelativePath="..\..\soundlib\SampleIO.h" + RelativePath="..\..\mptrack\PatternEditorDialogs.h" > </File> <File - RelativePath="..\..\soundlib\Sndfile.h" + RelativePath="..\..\mptrack\PatternFont.cpp" > </File> <File - RelativePath="..\..\soundlib\Snd_defs.h" + RelativePath="..\..\mptrack\PatternFont.h" > </File> <File - RelativePath="..\..\soundlib\SoundFilePlayConfig.h" + RelativePath="..\..\mptrack\PatternGotoDialog.cpp" > </File> <File - RelativePath="..\..\soundlib\Tables.h" + RelativePath="..\..\mptrack\PatternGotoDialog.h" > </File> <File - RelativePath="..\..\soundlib\Tagging.h" + RelativePath="..\..\mptrack\Reporting.cpp" > </File> <File - RelativePath="..\..\soundlib\tuning.h" + RelativePath="..\..\mptrack\Reporting.h" > </File> <File - RelativePath="..\..\soundlib\tuningbase.h" + RelativePath="..\..\mptrack\SampleEditorDialogs.cpp" > </File> <File - RelativePath="..\..\soundlib\tuningcollection.h" + RelativePath="..\..\mptrack\SampleEditorDialogs.h" > </File> <File - RelativePath="..\..\soundlib\Wav.h" + RelativePath="..\..\mptrack\SampleGenerator.cpp" > </File> <File - RelativePath="..\..\soundlib\WAVTools.h" + RelativePath="..\..\mptrack\SampleGenerator.h" > </File> <File - RelativePath="..\..\soundlib\WindowedFIR.h" + RelativePath="..\..\mptrack\ScaleEnvPointsDlg.cpp" > </File> <File - RelativePath="..\..\soundlib\XMTools.h" + RelativePath="..\..\mptrack\ScaleEnvPointsDlg.h" > </File> - </Filter> - <Filter - Name="sounddsp" - Filter="" - > <File - RelativePath="..\..\sounddsp\AGC.cpp" + RelativePath="..\..\mptrack\SelectPluginDialog.cpp" > </File> <File - RelativePath="..\..\sounddsp\DSP.cpp" + RelativePath="..\..\mptrack\SelectPluginDialog.h" > </File> <File - RelativePath="..\..\sounddsp\EQ.cpp" + RelativePath="..\..\mptrack\Settings.cpp" > </File> <File - RelativePath="..\..\sounddsp\Reverb.cpp" + RelativePath="..\..\mptrack\Settings.h" > </File> <File - RelativePath="..\..\sounddsp\AGC.h" + RelativePath="..\..\mptrack\StreamEncoder.cpp" > </File> <File - RelativePath="..\..\sounddsp\DSP.h" + RelativePath="..\..\mptrack\StreamEncoder.h" > </File> <File - RelativePath="..\..\sounddsp\EQ.h" + RelativePath="..\..\mptrack\StreamEncoderFLAC.cpp" > </File> <File - RelativePath="..\..\sounddsp\Reverb.h" + RelativePath="..\..\mptrack\StreamEncoderFLAC.h" > </File> - </Filter> - <Filter - Name="sounddev" - Filter="" - > <File - RelativePath="..\..\sounddev\SoundDevice.cpp" + RelativePath="..\..\mptrack\StreamEncoderMP3.cpp" > </File> <File - RelativePath="..\..\sounddev\SoundDeviceASIO.cpp" + RelativePath="..\..\mptrack\StreamEncoderMP3.h" > </File> <File - Relat... [truncated message content] |
From: <man...@us...> - 2015-05-10 11:49:37
|
Revision: 5069 http://sourceforge.net/p/modplug/code/5069 Author: manxorist Date: 2015-05-10 11:49:30 +0000 (Sun, 10 May 2015) Log Message: ----------- [Fix] build: Premake5 should also generate in_openmpt and xmp-openmpt projects for VS > VS2010. [Doc] libopenmpt: Update docs to new MSVC build system. [Doc] libopenmpt: libopenmpt_Settings.dll is long gone. Modified Paths: -------------- trunk/OpenMPT/README.md trunk/OpenMPT/build/premake4-win/premake.lua trunk/OpenMPT/build/regenerate_vs_projects.cmd trunk/OpenMPT/libopenmpt/dox/changelog.md trunk/OpenMPT/libopenmpt/dox/dependencies.md trunk/OpenMPT/libopenmpt/dox/quickstart.md Modified: trunk/OpenMPT/README.md =================================================================== --- trunk/OpenMPT/README.md 2015-05-10 09:51:57 UTC (rev 5068) +++ trunk/OpenMPT/README.md 2015-05-10 11:49:30 UTC (rev 5069) @@ -96,10 +96,23 @@ make check sudo make install - - Visual Studio 2010 (express version should work, but this is not tested): + - Visual Studio: - - The libopenmpt solution is in `libopenmpt/libopenmpt.sln`. - You will need the Winamp 5 SDK and the xmplay SDK if you want to + - You will find solutions for Visual Studio 2008 to 2015 in the + corresponding `build/vsVERSION/` folder. + Most projects are supported with any of the mentioned Visual Studio + verions, with the following exceptions: + + - libopenmpt_example_cxx: Requires VS2010 because it makes use of + C++11 features that VS2008 does not support.. + + - foo_openmpt: Requires VS2010 because the foobar2000 SDK uses VS2010. + + - in_openmpt: Requires VS2010 or later with MFC. + + - xmp-openmpt: Requires VS2010 or later with MFC. + + - You will need the Winamp 5 SDK and the xmplay SDK if you want to compile the plugins for these 2 players: - Winamp 5 SDK: @@ -121,8 +134,6 @@ download to SDK. You can disable xmp-openmpt in the solution configuration. - - The openmpt123 solution is in `openmpt123/openmpt123.sln`. - - Makefile The makefile supports different build environments and targets via the Modified: trunk/OpenMPT/build/premake4-win/premake.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/premake.lua 2015-05-10 09:51:57 UTC (rev 5068) +++ trunk/OpenMPT/build/premake4-win/premake.lua 2015-05-10 11:49:30 UTC (rev 5069) @@ -176,6 +176,8 @@ postprocess_vs2010_main("build/vs2012/libopenmpt_example_c.vcxproj") postprocess_vs2010_main("build/vs2012/libopenmpt_example_c_mem.vcxproj") postprocess_vs2010_main("build/vs2012/libopenmpt_example_cxx.vcxproj") + postprocess_vs2010_mfc("build/vs2012/in_openmpt.vcxproj") + postprocess_vs2010_mfc("build/vs2012/xmp-openmpt.vcxproj") postprocess_vs2010_mfc("build/vs2012/OpenMPT.vcxproj") postprocess_vs2010_dynamicbase("build/vs2012/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2012/OpenMPT.vcxproj") @@ -189,6 +191,8 @@ postprocess_vs2010_main("build/vs2013/libopenmpt_example_c.vcxproj") postprocess_vs2010_main("build/vs2013/libopenmpt_example_c_mem.vcxproj") postprocess_vs2010_main("build/vs2013/libopenmpt_example_cxx.vcxproj") + postprocess_vs2010_mfc("build/vs2013/in_openmpt.vcxproj") + postprocess_vs2010_mfc("build/vs2013/xmp-openmpt.vcxproj") postprocess_vs2010_mfc("build/vs2013/OpenMPT.vcxproj") postprocess_vs2010_dynamicbase("build/vs2013/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2013/OpenMPT.vcxproj") @@ -202,6 +206,8 @@ postprocess_vs2010_main("build/vs2015/libopenmpt_example_c.vcxproj") postprocess_vs2010_main("build/vs2015/libopenmpt_example_c_mem.vcxproj") postprocess_vs2010_main("build/vs2015/libopenmpt_example_cxx.vcxproj") + postprocess_vs2010_mfc("build/vs2015/in_openmpt.vcxproj") + postprocess_vs2010_mfc("build/vs2015/xmp-openmpt.vcxproj") postprocess_vs2010_mfc("build/vs2015/OpenMPT.vcxproj") postprocess_vs2010_dynamicbase("build/vs2015/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2015/OpenMPT.vcxproj") Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd =================================================================== --- trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-10 09:51:57 UTC (rev 5068) +++ trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-10 11:49:30 UTC (rev 5069) @@ -58,6 +58,8 @@ include\premake\premake5.exe --group=all-externals vs2010 || goto err include\premake\premake5.exe --group=libopenmpt_test vs2012 || goto err +include\premake\premake5.exe --group=in_openmpt vs2012 || goto err +include\premake\premake5.exe --group=xmp-openmpt vs2012 || goto err include\premake\premake5.exe --group=libopenmpt vs2012 || goto err include\premake\premake5.exe --group=openmpt123 vs2012 || goto err include\premake\premake5.exe --group=PluginBridge vs2012 || goto err @@ -65,6 +67,8 @@ include\premake\premake5.exe --group=all-externals vs2012 || goto err include\premake\premake5.exe --group=libopenmpt_test vs2013 || goto err +include\premake\premake5.exe --group=in_openmpt vs2013 || goto err +include\premake\premake5.exe --group=xmp-openmpt vs2013 || goto err include\premake\premake5.exe --group=libopenmpt vs2013 || goto err include\premake\premake5.exe --group=openmpt123 vs2013 || goto err include\premake\premake5.exe --group=PluginBridge vs2013 || goto err @@ -72,6 +76,8 @@ include\premake\premake5.exe --group=all-externals vs2013 || goto err include\premake\premake5.exe --group=libopenmpt_test vs2015 || goto err +include\premake\premake5.exe --group=in_openmpt vs2015 || goto err +include\premake\premake5.exe --group=xmp-openmpt vs2015 || goto err include\premake\premake5.exe --group=libopenmpt vs2015 || goto err include\premake\premake5.exe --group=openmpt123 vs2015 || goto err include\premake\premake5.exe --group=PluginBridge vs2015 || goto err Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md =================================================================== --- trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-05-10 09:51:57 UTC (rev 5068) +++ trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-05-10 11:49:30 UTC (rev 5069) @@ -5,6 +5,11 @@ For fully detailed change log, please see the source repository directly. This is just a high-level summary. +### libopenmpt svn + + * [**Change**] The MSVC build system has been redone. Solutions are now + located in `build/vsVERSION/`. + ### libopenmpt 0.2-beta12 (2015-04-19) * Playback fix when row delay effect is used together with offset command. Modified: trunk/OpenMPT/libopenmpt/dox/dependencies.md =================================================================== --- trunk/OpenMPT/libopenmpt/dox/dependencies.md 2015-05-10 09:51:57 UTC (rev 5068) +++ trunk/OpenMPT/libopenmpt/dox/dependencies.md 2015-05-10 11:49:30 UTC (rev 5069) @@ -9,7 +9,7 @@ ### libopenmpt * Supported compilers for building libopenmpt: - * **Microsoft Visual Studio 2010** or higher (2008 is partially supported) + * **Microsoft Visual Studio 2008** or higher * **GCC 4.3** or higher (4.1 to 4.2 are partially supported) * **Clang 3.0** or higher * **MinGW-W64 4.6** or higher @@ -34,7 +34,7 @@ ### openmpt123 * Supported compilers for building openmpt: - * **Microsoft Visual Studio 2010** or higher (2008 is partially supported) + * **Microsoft Visual Studio 2008** or higher * **GCC 4.3** or higher (4.1 to 4.2 are partially supported) * **Clang 3.0** or higher * **MinGW-W64 4.6** or higher Modified: trunk/OpenMPT/libopenmpt/dox/quickstart.md =================================================================== --- trunk/OpenMPT/libopenmpt/dox/quickstart.md 2015-05-10 09:51:57 UTC (rev 5068) +++ trunk/OpenMPT/libopenmpt/dox/quickstart.md 2015-05-10 11:49:30 UTC (rev 5069) @@ -32,9 +32,9 @@ - **Winamp SDK** - **XMPlay SDK** 3. Checkout `http://svn.code.sf.net/p/modplug/code/trunk/OpenMPT/` . - 4. Open `openmpt123\openmpt123.sln` or `libopenmpt\libopenmpt.sln` in *Microsoft Visual Studio 2010*. + 4. Open `build\vs2010\openmpt123.sln` or `build\vs2010\libopenmpt.sln` or `build\vs2010\xmp-openmpt.sln` or `build\vs2010\in_openmpt.sln` or `build\vs2010\foo_openmpt.sln` in *Microsoft Visual Studio 2010*. 5. Select appropriate configuration and build. Binaries are generated in `bin\` - 6. Drag a module onto `openmpt123.exe` or copy the player plugin DLLs (`in_openmpt.dll`, `xmp-openmpt.dll` or `foo_openmpt.dll`) and `libopenmpt_settings.dll` into the respective player directory. + 6. Drag a module onto `openmpt123.exe` or copy the player plugin DLLs (`in_openmpt.dll`, `xmp-openmpt.dll` or `foo_openmpt.dll`) into the respective player directory. ### Unix-like This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-10 11:58:41
|
Revision: 5070 http://sourceforge.net/p/modplug/code/5070 Author: manxorist Date: 2015-05-10 11:58:29 +0000 (Sun, 10 May 2015) Log Message: ----------- [Mod] libopenmpt: Kill off the old MSVC build system. The premake build system supports all features of the old build system (and more). Removed Paths: ------------- trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj.filters trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters trunk/OpenMPT/libopenmpt/libopenmpt.sln trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj.filters trunk/OpenMPT/libopenmpt/libopenmpt_modplug.vcxproj trunk/OpenMPT/libopenmpt/libopenmpt_modplug.vcxproj.filters trunk/OpenMPT/libopenmpt/libopenmpt_test.sln trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj.filters trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj.filters trunk/OpenMPT/openmpt123/openmpt123.sln trunk/OpenMPT/openmpt123/openmpt123.vcxproj trunk/OpenMPT/openmpt123/openmpt123.vcxproj.filters Property Changed: ---------------- trunk/OpenMPT/libopenmpt/ trunk/OpenMPT/openmpt123/ Index: trunk/OpenMPT/libopenmpt =================================================================== --- trunk/OpenMPT/libopenmpt 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt 2015-05-10 11:58:29 UTC (rev 5070) Property changes on: trunk/OpenMPT/libopenmpt ___________________________________________________________________ Modified: svn:ignore ## -1,10 +1,2 ## *.d *.o -*.aps -*.user -*.suo -*.sdf -*.opensdf -ipch -Debug -Release Deleted: trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj =================================================================== --- trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj 2015-05-10 11:58:29 UTC (rev 5070) @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{3F14BF17-016A-44C3-9B8D-C875C2EC8A18}</ProjectGuid> - <RootNamespace>foo_openmpt</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <TargetName>foo_openmpt</TargetName> - <OutDir>..\bin\$(Platform)-Debug\</OutDir> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <TargetName>foo_openmpt</TargetName> - <OutDir>..\bin\$(Platform)\</OutDir> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../include/foobar2000sdk</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>../include/foobar2000sdk</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="foo_openmpt.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\include\foobar2000sdk\foobar2000\foobar2000_component_client\foobar2000_component_client.vcxproj"> - <Project>{71ad2674-065b-48f5-b8b0-e1f9d3892081}</Project> - </ProjectReference> - <ProjectReference Include="..\include\foobar2000sdk\foobar2000\helpers\foobar2000_sdk_helpers.vcxproj"> - <Project>{ee47764e-a202-4f85-a767-abdab4aff35f}</Project> - </ProjectReference> - <ProjectReference Include="..\include\foobar2000sdk\foobar2000\SDK\foobar2000_SDK.vcxproj"> - <Project>{e8091321-d79d-4575-86ef-064ea1a4a20d}</Project> - </ProjectReference> - <ProjectReference Include="..\include\foobar2000sdk\pfc\pfc.vcxproj"> - <Project>{ebfffb4e-261d-44d3-b89c-957b31a0bf9c}</Project> - </ProjectReference> - <ProjectReference Include="libopenmpt.vcxproj"> - <Project>{812a654d-99be-4d13-b97f-86332ad3e363}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file Deleted: trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj.filters =================================================================== --- trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj.filters 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt/foo_openmpt.vcxproj.filters 2015-05-10 11:58:29 UTC (rev 5070) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="foo_openmpt.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project> \ No newline at end of file Deleted: trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj =================================================================== --- trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj 2015-05-10 11:58:29 UTC (rev 5070) @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{268A016B-2468-4849-8444-782752F555FC}</ProjectGuid> - <RootNamespace>in_openmpt</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <UseOfMfc>Static</UseOfMfc> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <UseOfMfc>Static</UseOfMfc> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>..\bin\$(Platform)-Debug\</OutDir> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>..\bin\$(Platform)\</OutDir> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <PreBuildEvent> - <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <PreBuildEvent> - <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="in_openmpt.cpp" /> - <ClCompile Include="libopenmpt_settings.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libopenmpt.vcxproj"> - <Project>{812a654d-99be-4d13-b97f-86332ad3e363}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <ClInclude Include="libopenmpt_settings.hpp" /> - <ClInclude Include="resource.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="libopenmpt_settings.rc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file Deleted: trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters =================================================================== --- trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters 2015-05-10 11:58:29 UTC (rev 5070) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{F74CB4B5-0FDC-4427-AC76-4589DE18576E}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{0588F881-3987-43B4-B20B-4220D6A7E875}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{748B109D-6712-492C-9A0D-DAF6AA780CC0}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="in_openmpt.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="libopenmpt_settings.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="libopenmpt_settings.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="resource.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="libopenmpt_settings.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> -</Project> \ No newline at end of file Deleted: trunk/OpenMPT/libopenmpt/libopenmpt.sln =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt.sln 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt/libopenmpt.sln 2015-05-10 11:58:29 UTC (rev 5070) @@ -1,110 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt", "libopenmpt.vcxproj", "{812A654D-99BE-4D13-B97F-86332AD3E363}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmptDLL", "libopenmptDLL.vcxproj", "{A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_openmpt", "in_openmpt.vcxproj", "{268A016B-2468-4849-8444-782752F555FC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmp-openmpt", "xmp-openmpt.vcxproj", "{6E0BF509-12E3-413D-88FF-4EE4AB0019F1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt_modplug", "libopenmpt_modplug.vcxproj", "{78C5DE5D-62BA-41EB-9A70-AE9C20536450}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pfc", "..\include\foobar2000sdk\pfc\pfc.vcxproj", "{EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_SDK", "..\include\foobar2000sdk\foobar2000\SDK\foobar2000_SDK.vcxproj", "{E8091321-D79D-4575-86EF-064EA1A4A20D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_sdk_helpers", "..\include\foobar2000sdk\foobar2000\helpers\foobar2000_sdk_helpers.vcxproj", "{EE47764E-A202-4F85-A767-ABDAB4AFF35F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_component_client", "..\include\foobar2000sdk\foobar2000\foobar2000_component_client\foobar2000_component_client.vcxproj", "{71AD2674-065B-48F5-B8B0-E1F9D3892081}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo_openmpt", "foo_openmpt.vcxproj", "{3F14BF17-016A-44C3-9B8D-C875C2EC8A18}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml", "..\build\vs2010-ext\pugixml.vcxproj", "{07B89124-7C71-42CC-81AB-62B09BB61F9B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {812A654D-99BE-4D13-B97F-86332AD3E363}.Debug|Win32.ActiveCfg = Debug|Win32 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Debug|Win32.Build.0 = Debug|Win32 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Debug|x64.ActiveCfg = Debug|x64 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Debug|x64.Build.0 = Debug|x64 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Release|Win32.ActiveCfg = Release|Win32 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Release|Win32.Build.0 = Release|Win32 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Release|x64.ActiveCfg = Release|x64 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Release|x64.Build.0 = Release|x64 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|Win32.Build.0 = Debug|Win32 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|x64.ActiveCfg = Debug|x64 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|x64.Build.0 = Debug|x64 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|Win32.ActiveCfg = Release|Win32 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|Win32.Build.0 = Release|Win32 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|x64.ActiveCfg = Release|x64 - {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|x64.Build.0 = Release|x64 - {268A016B-2468-4849-8444-782752F555FC}.Debug|Win32.ActiveCfg = Debug|Win32 - {268A016B-2468-4849-8444-782752F555FC}.Debug|Win32.Build.0 = Debug|Win32 - {268A016B-2468-4849-8444-782752F555FC}.Debug|x64.ActiveCfg = Debug|Win32 - {268A016B-2468-4849-8444-782752F555FC}.Release|Win32.ActiveCfg = Release|Win32 - {268A016B-2468-4849-8444-782752F555FC}.Release|Win32.Build.0 = Release|Win32 - {268A016B-2468-4849-8444-782752F555FC}.Release|x64.ActiveCfg = Release|Win32 - {6E0BF509-12E3-413D-88FF-4EE4AB0019F1}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E0BF509-12E3-413D-88FF-4EE4AB0019F1}.Debug|Win32.Build.0 = Debug|Win32 - {6E0BF509-12E3-413D-88FF-4EE4AB0019F1}.Debug|x64.ActiveCfg = Debug|Win32 - {6E0BF509-12E3-413D-88FF-4EE4AB0019F1}.Release|Win32.ActiveCfg = Release|Win32 - {6E0BF509-12E3-413D-88FF-4EE4AB0019F1}.Release|Win32.Build.0 = Release|Win32 - {6E0BF509-12E3-413D-88FF-4EE4AB0019F1}.Release|x64.ActiveCfg = Release|Win32 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Debug|Win32.ActiveCfg = Debug|Win32 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Debug|Win32.Build.0 = Debug|Win32 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Debug|x64.ActiveCfg = Debug|x64 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Debug|x64.Build.0 = Debug|x64 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Release|Win32.ActiveCfg = Release|Win32 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Release|Win32.Build.0 = Release|Win32 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Release|x64.ActiveCfg = Release|x64 - {78C5DE5D-62BA-41EB-9A70-AE9C20536450}.Release|x64.Build.0 = Release|x64 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Debug|Win32.ActiveCfg = Debug|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Debug|Win32.Build.0 = Debug|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Debug|x64.ActiveCfg = Debug|x64 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Release|Win32.ActiveCfg = Release|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Release|Win32.Build.0 = Release|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Release|x64.ActiveCfg = Release|x64 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Debug|Win32.ActiveCfg = Debug|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Debug|Win32.Build.0 = Debug|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Debug|x64.ActiveCfg = Debug|x64 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Release|Win32.ActiveCfg = Release|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Release|Win32.Build.0 = Release|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Release|x64.ActiveCfg = Release|x64 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Debug|Win32.Build.0 = Debug|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Debug|x64.ActiveCfg = Debug|x64 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Release|Win32.ActiveCfg = Release|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Release|Win32.Build.0 = Release|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Release|x64.ActiveCfg = Release|x64 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Debug|Win32.ActiveCfg = Debug|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Debug|Win32.Build.0 = Debug|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Debug|x64.ActiveCfg = Debug|x64 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Release|Win32.ActiveCfg = Release|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Release|Win32.Build.0 = Release|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Release|x64.ActiveCfg = Release|x64 - {3F14BF17-016A-44C3-9B8D-C875C2EC8A18}.Debug|Win32.ActiveCfg = Debug|Win32 - {3F14BF17-016A-44C3-9B8D-C875C2EC8A18}.Debug|Win32.Build.0 = Debug|Win32 - {3F14BF17-016A-44C3-9B8D-C875C2EC8A18}.Debug|x64.ActiveCfg = Debug|Win32 - {3F14BF17-016A-44C3-9B8D-C875C2EC8A18}.Release|Win32.ActiveCfg = Release|Win32 - {3F14BF17-016A-44C3-9B8D-C875C2EC8A18}.Release|Win32.Build.0 = Release|Win32 - {3F14BF17-016A-44C3-9B8D-C875C2EC8A18}.Release|x64.ActiveCfg = Release|Win32 - {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Debug|Win32.ActiveCfg = Debug|Win32 - {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Debug|Win32.Build.0 = Debug|Win32 - {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Debug|x64.ActiveCfg = Debug|x64 - {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Release|Win32.ActiveCfg = Release|Win32 - {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Release|Win32.Build.0 = Release|Win32 - {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Deleted: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2015-05-10 11:58:29 UTC (rev 5070) @@ -1,352 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{812A654D-99BE-4D13-B97F-86332AD3E363}</ProjectGuid> - <RootNamespace>libopenmpt</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories> - <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <PreBuildEvent> - <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command> - </PreBuildEvent> - <Lib> - <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories> - <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <PreBuildEvent> - <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command> - </PreBuildEvent> - <Lib> - <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <FloatingPointModel>Fast</FloatingPointModel> - <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <StringPooling>true</StringPooling> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command> - </PreBuildEvent> - <Lib> - <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <FloatingPointModel>Fast</FloatingPointModel> - <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <StringPooling>true</StringPooling> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command> - </PreBuildEvent> - <Lib> - <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> - </Lib> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="..\common\AudioCriticalSection.h" /> - <ClInclude Include="..\common\BuildSettings.h" /> - <ClInclude Include="..\common\CompilerDetect.h" /> - <ClInclude Include="..\common\ComponentManager.h" /> - <ClInclude Include="..\common\Endianness.h" /> - <ClInclude Include="..\common\FileReader.h" /> - <ClInclude Include="..\common\FlagSet.h" /> - <ClInclude Include="..\common\Logging.h" /> - <ClInclude Include="..\common\misc_util.h" /> - <ClInclude Include="..\common\mptAtomic.h" /> - <ClInclude Include="..\common\mptFileIO.h" /> - <ClInclude Include="..\common\mptIO.h" /> - <ClInclude Include="..\common\mptPathString.h" /> - <ClInclude Include="..\common\mptString.h" /> - <ClInclude Include="..\common\mutex.h" /> - <ClInclude Include="..\common\Profiler.h" /> - <ClInclude Include="..\common\serialization_utils.h" /> - <ClInclude Include="..\common\stdafx.h" /> - <ClInclude Include="..\common\StringFixer.h" /> - <ClInclude Include="..\common\thread.h" /> - <ClInclude Include="..\common\typedefs.h" /> - <ClInclude Include="..\common\version.h" /> - <ClInclude Include="..\common\versionNumber.h" /> - <ClInclude Include="..\soundlib\AudioReadTarget.h" /> - <ClInclude Include="..\soundlib\ChunkReader.h" /> - <ClInclude Include="..\soundlib\Dither.h" /> - <ClInclude Include="..\soundlib\Dlsbank.h" /> - <ClInclude Include="..\soundlib\FloatMixer.h" /> - <ClInclude Include="..\soundlib\IntMixer.h" /> - <ClInclude Include="..\soundlib\ITCompression.h" /> - <ClInclude Include="..\soundlib\ITTools.h" /> - <ClInclude Include="..\soundlib\Loaders.h" /> - <ClInclude Include="..\soundlib\Message.h" /> - <ClInclude Include="..\soundlib\MIDIEvents.h" /> - <ClInclude Include="..\soundlib\MIDIMacros.h" /> - <ClInclude Include="..\soundlib\Mixer.h" /> - <ClInclude Include="..\soundlib\MixerInterface.h" /> - <ClInclude Include="..\soundlib\MixerLoops.h" /> - <ClInclude Include="..\soundlib\MixerSettings.h" /> - <ClInclude Include="..\soundlib\ModChannel.h" /> - <ClInclude Include="..\soundlib\modcommand.h" /> - <ClInclude Include="..\soundlib\ModInstrument.h" /> - <ClInclude Include="..\soundlib\ModSample.h" /> - <ClInclude Include="..\soundlib\ModSequence.h" /> - <ClInclude Include="..\soundlib\modsmp_ctrl.h" /> - <ClInclude Include="..\soundlib\mod_specifications.h" /> - <ClInclude Include="..\soundlib\pattern.h" /> - <ClInclude Include="..\soundlib\patternContainer.h" /> - <ClInclude Include="..\soundlib\Resampler.h" /> - <ClInclude Include="..\soundlib\RowVisitor.h" /> - <ClInclude Include="..\soundlib\S3MTools.h" /> - <ClInclude Include="..\soundlib\SampleFormat.h" /> - <ClInclude Include="..\soundlib\SampleFormatConverters.h" /> - <ClInclude Include="..\soundlib\SampleIO.h" /> - <ClInclude Include="..\soundlib\Sndfile.h" /> - <ClInclude Include="..\soundlib\Snd_defs.h" /> - <ClInclude Include="..\soundlib\SoundFilePlayConfig.h" /> - <ClInclude Include="..\soundlib\Tables.h" /> - <ClInclude Include="..\soundlib\Tagging.h" /> - <ClInclude Include="..\soundlib\tuning.h" /> - <ClInclude Include="..\soundlib\tuningbase.h" /> - <ClInclude Include="..\soundlib\tuningcollection.h" /> - <ClInclude Include="..\soundlib\Wav.h" /> - <ClInclude Include="..\soundlib\WAVTools.h" /> - <ClInclude Include="..\soundlib\WindowedFIR.h" /> - <ClInclude Include="..\soundlib\XMTools.h" /> - <ClInclude Include="..\test\test.h" /> - <ClInclude Include="..\test\TestTools.h" /> - <ClInclude Include="..\test\TestToolsLib.h" /> - <ClInclude Include="..\test\TestToolsTracker.h" /> - <ClInclude Include="libopenmpt.h" /> - <ClInclude Include="libopenmpt.hpp" /> - <ClInclude Include="libopenmpt_config.h" /> - <ClInclude Include="libopenmpt_ext.hpp" /> - <ClInclude Include="libopenmpt_impl.hpp" /> - <ClInclude Include="libopenmpt_internal.h" /> - <ClInclude Include="libopenmpt_stream_callbacks_fd.h" /> - <ClInclude Include="libopenmpt_stream_callbacks_file.h" /> - <ClInclude Include="libopenmpt_version.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\common\AudioCriticalSection.cpp" /> - <ClCompile Include="..\common\ComponentManager.cpp" /> - <ClCompile Include="..\common\Logging.cpp" /> - <ClCompile Include="..\common\misc_util.cpp" /> - <ClCompile Include="..\common\mptFileIO.cpp" /> - <ClCompile Include="..\common\mptIO.cpp" /> - <ClCompile Include="..\common\mptPathString.cpp" /> - <ClCompile Include="..\common\mptString.cpp" /> - <ClCompile Include="..\common\Profiler.cpp" /> - <ClCompile Include="..\common\serialization_utils.cpp" /> - <ClCompile Include="..\common\stdafx.cpp" /> - <ClCompile Include="..\common\typedefs.cpp" /> - <ClCompile Include="..\common\version.cpp" /> - <ClCompile Include="..\include\miniz\miniz.c" /> - <ClCompile Include="..\soundlib\Dither.cpp" /> - <ClCompile Include="..\soundlib\Dlsbank.cpp" /> - <ClCompile Include="..\soundlib\Fastmix.cpp" /> - <ClCompile Include="..\soundlib\ITCompression.cpp" /> - <ClCompile Include="..\soundlib\ITTools.cpp" /> - <ClCompile Include="..\soundlib\Load_669.cpp" /> - <ClCompile Include="..\soundlib\Load_amf.cpp" /> - <ClCompile Include="..\soundlib\Load_ams.cpp" /> - <ClCompile Include="..\soundlib\Load_dbm.cpp" /> - <ClCompile Include="..\soundlib\Load_digi.cpp" /> - <ClCompile Include="..\soundlib\Load_dmf.cpp" /> - <ClCompile Include="..\soundlib\Load_dsm.cpp" /> - <ClCompile Include="..\soundlib\Load_far.cpp" /> - <ClCompile Include="..\soundlib\Load_gdm.cpp" /> - <ClCompile Include="..\soundlib\Load_imf.cpp" /> - <ClCompile Include="..\soundlib\Load_it.cpp" /> - <ClCompile Include="..\soundlib\Load_itp.cpp" /> - <ClCompile Include="..\soundlib\load_j2b.cpp" /> - <ClCompile Include="..\soundlib\Load_mdl.cpp" /> - <ClCompile Include="..\soundlib\Load_med.cpp" /> - <ClCompile Include="..\soundlib\Load_mid.cpp" /> - <ClCompile Include="..\soundlib\Load_mo3.cpp" /> - <ClCompile Include="..\soundlib\Load_mod.cpp" /> - <ClCompile Include="..\soundlib\Load_mt2.cpp" /> - <ClCompile Include="..\soundlib\Load_mtm.cpp" /> - <ClCompile Include="..\soundlib\Load_okt.cpp" /> - <ClCompile Include="..\soundlib\Load_psm.cpp" /> - <ClCompile Include="..\soundlib\Load_plm.cpp" /> - <ClCompile Include="..\soundlib\Load_ptm.cpp" /> - <ClCompile Include="..\soundlib\Load_s3m.cpp" /> - <ClCompile Include="..\soundlib\Load_stm.cpp" /> - <ClCompile Include="..\soundlib\Load_ult.cpp" /> - <ClCompile Include="..\soundlib\Load_umx.cpp" /> - <ClCompile Include="..\soundlib\Load_wav.cpp" /> - <ClCompile Include="..\soundlib\Load_xm.cpp" /> - <ClCompile Include="..\soundlib\Message.cpp" /> - <ClCompile Include="..\soundlib\MIDIEvents.cpp" /> - <ClCompile Include="..\soundlib\MIDIMacros.cpp" /> - <ClCompile Include="..\soundlib\MixerLoops.cpp" /> - <ClCompile Include="..\soundlib\MixerSettings.cpp" /> - <ClCompile Include="..\soundlib\Mmcmp.cpp" /> - <ClCompile Include="..\soundlib\ModChannel.cpp" /> - <ClCompile Include="..\soundlib\modcommand.cpp" /> - <ClCompile Include="..\soundlib\ModInstrument.cpp" /> - <ClCompile Include="..\soundlib\ModSample.cpp" /> - <ClCompile Include="..\soundlib\ModSequence.cpp" /> - <ClCompile Include="..\soundlib\modsmp_ctrl.cpp" /> - <ClCompile Include="..\soundlib\mod_specifications.cpp" /> - <ClCompile Include="..\soundlib\pattern.cpp" /> - <ClCompile Include="..\soundlib\patternContainer.cpp" /> - <ClCompile Include="..\soundlib\RowVisitor.cpp" /> - <ClCompile Include="..\soundlib\S3MTools.cpp" /> - <ClCompile Include="..\soundlib\SampleFormats.cpp" /> - <ClCompile Include="..\soundlib\SampleIO.cpp" /> - <ClCompile Include="..\soundlib\Sndfile.cpp" /> - <ClCompile Include="..\soundlib\Sndmix.cpp" /> - <ClCompile Include="..\soundlib\Snd_flt.cpp" /> - <ClCompile Include="..\soundlib\Snd_fx.cpp" /> - <ClCompile Include="..\soundlib\SoundFilePlayConfig.cpp" /> - <ClCompile Include="..\soundlib\Tables.cpp" /> - <ClCompile Include="..\soundlib\Tagging.cpp" /> - <ClCompile Include="..\soundlib\tuning.cpp" /> - <ClCompile Include="..\soundlib\tuningbase.cpp" /> - <ClCompile Include="..\soundlib\tuningCollection.cpp" /> - <ClCompile Include="..\soundlib\UpgradeModule.cpp" /> - <ClCompile Include="..\soundlib\WAVTools.cpp" /> - <ClCompile Include="..\soundlib\WindowedFIR.cpp" /> - <ClCompile Include="..\soundlib\XMTools.cpp" /> - <ClCompile Include="..\test\test.cpp" /> - <ClCompile Include="..\test\TestToolsLib.cpp" /> - <ClCompile Include="libopenmpt_c.cpp" /> - <ClCompile Include="libopenmpt_cxx.cpp" /> - <ClCompile Include="libopenmpt_ext.cpp" /> - <ClCompile Include="libopenmpt_impl.cpp" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file Deleted: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2015-05-10 11:49:30 UTC (rev 5069) +++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2015-05-10 11:58:29 UTC (rev 5070) @@ -1,539 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Source Files\soundlib"> - <UniqueIdentifier>{31765892-63ca-4ab1-8fba-cd7a44e7b6cc}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\soundlib"> - <UniqueIdentifier>{89063439-f7da-443d-bd44-9640b86240f2}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\common"> - <UniqueIdentifier>{57743edd-00bc-4281-9c59-e4d785df03a4}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\common"> - <UniqueIdentifier>{308f7ed3-af26-4d69-8925-7203894ef468}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\test"> - <UniqueIdentifier>{d7ef920e-4335-4ea9-96f3-e4721d61b5b5}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\test"> - <UniqueIdentifier>{7e476eee-06d3-440e-89c1-29c78a21daa9}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\miniz"> - <UniqueIdentifier>{3800b9bf-c28e-489f-8792-64b1b5a58b40}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\common\AudioCriticalSection.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\typedefs.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\FlagSet.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\misc_util.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\mptString.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\mutex.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\Profiler.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\serialization_utils.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\stdafx.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\StringFixer.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="libopenmpt.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\ChunkReader.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\ITTools.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Dlsbank.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\ITCompression.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Loaders.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\XMTools.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Message.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\MIDIEvents.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\MIDIMacros.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\MixerSettings.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\mod_specifications.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\ModChannel.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\modcommand.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\ModInstrument.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\ModSample.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\ModSequence.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\modsmp_ctrl.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\pattern.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\patternContainer.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Resampler.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\RowVisitor.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\SampleFormatConverters.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\SampleIO.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Snd_defs.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Sndfile.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\SoundFilePlayConfig.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Tables.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\tuning.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\tuningbase.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\tuningcollection.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Wav.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\WAVTools.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\WindowedFIR.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="libopenmpt.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_internal.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_version.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\common\version.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_impl.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\common\BuildSettings.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\versionNumber.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\CompilerDetect.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\test\test.h"> - <Filter>Header Files\test</Filter> - </ClInclude> - <ClInclude Include="..\common\Logging.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\S3MTools.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Dither.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\AudioReadTarget.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\MixerLoops.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\SampleFormat.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Tagging.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_stream_callbacks_fd.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_stream_callbacks_file.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\common\mptPathString.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\thread.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_ext.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\FloatMixer.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\IntMixer.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\Mixer.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\soundlib\MixerInterface.h"> - <Filter>Header Files\soundlib</Filter> - </ClInclude> - <ClInclude Include="..\test\TestTools.h"> - <Filter>Header Files\test</Filter> - </ClInclude> - <ClInclude Include="..\test\TestToolsLib.h"> - <Filter>Header Files\test</Filter> - </ClInclude> - <ClInclude Include="..\test\TestToolsTracker.h"> - <Filter>Header Files\test</Filter> - </ClInclude> - <ClInclude Include="..\common\Endianness.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\mptAtomic.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\mptIO.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\ComponentManager.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\mptFileIO.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - <ClInclude Include="..\common\FileReader.h"> - <Filter>Header Files\common</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\common\AudioCriticalSection.cpp"> - <Filter>Source Files\common</Filter> - </ClCompile> - <ClCompile Include="..\common\typedefs.cpp"> - <Filter>Source Files\common</Filter> - </ClCompile> - <ClCompile Include="..\common\misc_util.cpp"> - <Filter>Source Files\common</Filter> - </ClCompile> - <ClCompile Include="..\common\mptString.cpp"> - <Filter>Source Files\common</Filter> - </ClCompile> - <ClCompile Include="..\common\Profiler.cpp"> - <Filter>Source Files\common</Filter> - </ClCompile> - <ClCompile Include="..\common\serialization_utils.cpp"> - <Filter>Source Files\common</Filter> - </ClCompile> - <ClCompile Include="..\common\stdafx.cpp"> - <Filter>Source Files\common</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\ITTools.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Dlsbank.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Fastmix.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\ITCompression.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_669.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\XMTools.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_amf.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_ams.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_dbm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_dmf.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_dsm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_far.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_gdm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_imf.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_it.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_itp.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\load_j2b.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_mdl.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_med.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_mid.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_mo3.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_mod.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_mt2.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_mtm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_okt.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_psm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_plm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_ptm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_s3m.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_stm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_ult.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_umx.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_wav.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Load_xm.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Message.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\MIDIEvents.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\MIDIMacros.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\MixerSettings.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\Mmcmp.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\mod_specifications.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\ModChannel.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\modcommand.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\ModInstrument.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\ModSample.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\ModSequence.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\modsmp_ctrl.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\pattern.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\patternContainer.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include="..\soundlib\RowVisitor.cpp"> - <Filter>Source Files\soundlib</Filter> - </ClCompile> - <ClCompile Include... [truncated message content] |
From: <man...@us...> - 2015-05-11 10:23:48
|
Revision: 5077 http://sourceforge.net/p/modplug/code/5077 Author: manxorist Date: 2015-05-11 10:23:41 +0000 (Mon, 11 May 2015) Log Message: ----------- [Ref] build: Kill premake 4.3 and 4.4 support. Modified Paths: -------------- trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua trunk/OpenMPT/build/premake4-win/premake.lua trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua trunk/OpenMPT/build/premake4-win/premake4-defaults.lua trunk/OpenMPT/build/regenerate_vs_projects.cmd Property Changed: ---------------- trunk/OpenMPT/include/premake/ Modified: trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -78,19 +78,11 @@ } buildoptions { "/wd4244", "/wd4267", "/wd4334" } defines { "FLAC__NO_DLL", "FLAC__HAS_OGG=1" } -if MPT_PREMAKE_VERSION == "5.0" then filter { "action:vs2008" } defines { "VERSION=\\\"1.3.1\\\"" } filter { "action:not vs2008" } defines { "VERSION=\"1.3.1\"" } filter {} -else - configuration "vs2008" - defines { "VERSION=\\\"1.3.1\\\"" } - configuration "not vs2008" - defines { "VERSION=\"1.3.1\"" } - configuration "*" -end dofile "../../build/premake4-win/premake4-defaults-LIB.lua" dofile "../../build/premake4-win/premake4-defaults.lua" flags { "StaticRuntime" } Modified: trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -69,15 +69,9 @@ "../../include/portaudio/include/portaudio.h", } buildoptions { "/wd4018", "/wd4267" } -if MPT_PREMAKE_VERSION == "5.0" then filter { "configurations:Debug" } defines { "PA_ENABLE_DEBUG_OUTPUT" } filter {} -else - configuration "Debug" - defines { "PA_ENABLE_DEBUG_OUTPUT" } - configuration "*" -end dofile "../../build/premake4-win/premake4-defaults-LIB.lua" dofile "../../build/premake4-win/premake4-defaults.lua" flags { "StaticRuntime" } Modified: trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -20,19 +20,11 @@ defines { "MODPLUG_TRACKER" } flags { "SEH", "Unicode", "WinMain", "ExtraWarnings" } prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" } -if MPT_PREMAKE_VERSION == "5.0" then filter { "architecture:x86" } targetsuffix "32" filter { "architecture:x86_64" } targetsuffix "64" filter {} -else - configuration { "x32" } - targetsuffix "32" - configuration { "x64" } - targetsuffix "64" - configuration "*" -end dofile "../../build/premake4-win/premake4-defaults-EXEGUI.lua" dofile "../../build/premake4-win/premake4-defaults.lua" flags { "StaticRuntime" } Modified: trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -1,5 +1,4 @@ -if MPT_PREMAKE_VERSION == "5.0" then if _ACTION == "vs2010" then project "foo_openmpt" @@ -49,4 +48,3 @@ language "C++" end -end Modified: trunk/OpenMPT/build/premake4-win/premake.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/premake.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/premake.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -6,14 +6,10 @@ MPT_PREMAKE_VERSION = "" -if _PREMAKE_VERSION == "4.3" then - MPT_PREMAKE_VERSION = "4.3" -elseif _PREMAKE_VERSION == "4.4-beta5" then - MPT_PREMAKE_VERSION = "4.4" -elseif _PREMAKE_VERSION == "5.0-alpha3" then +if _PREMAKE_VERSION == "5.0-alpha3" then MPT_PREMAKE_VERSION = "5.0" else - print "Premake 4.3 or 4.4-beta5 or 5.0-alpha3 required" + print "Premake 5.0-alpha3 required" os.exit(1) end @@ -56,21 +52,9 @@ outfile:close() end -function postprocess_vs2008_mfc (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "UseOfMFC=\"2\"", "UseOfMFC=\"1\"") -end -end - function postprocess_vs2008_main (filename) -if MPT_PREMAKE_VERSION == "4.3" then replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") -elseif MPT_PREMAKE_VERSION == "4.4" then - replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "") end -end function postprocess_vs2008_nonxcompat (filename) replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\DataExecutionPrevention=\"1\"\n") @@ -80,48 +64,18 @@ replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\LargeAddressAware=\"2\"\n") end -function postprocess_vs2010_mfc (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "<UseOfMfc>Dynamic</UseOfMfc>", "<UseOfMfc>Static</UseOfMfc>") -end -end - function postprocess_vs2010_main (filename) -if MPT_PREMAKE_VERSION == "4.3" then replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") -elseif MPT_PREMAKE_VERSION == "4.4" then - replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "") end -end function postprocess_vs2010_nonxcompat (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<DataExecutionPrevention>false</DataExecutionPrevention>\n\t\t</Link>\n") -elseif MPT_PREMAKE_VERSION == "4.4" then replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n") end -end function postprocess_vs2010_largeaddress (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<LargeAddressAware>true</LargeAddressAware>\n\t\t</Link>\n") -elseif MPT_PREMAKE_VERSION == "4.4" then replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n") -elseif MPT_PREMAKE_VERSION == "5.0" then - replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n") end -end -function fixbug_vs2010_pch (filename) -if MPT_PREMAKE_VERSION == "4.3" then - replace_in_file(filename, "</PrecompiledHeader>\n\t\t</ClCompile>", "</PrecompiledHeader>") -end -end - newaction { trigger = "postprocess", description = "OpenMPT postprocess the project files to mitigate premake problems", @@ -131,7 +85,6 @@ postprocess_vs2008_main("build/vs2008/openmpt123.vcproj") postprocess_vs2008_main("build/vs2008/libopenmpt_example_c.vcproj") postprocess_vs2008_main("build/vs2008/libopenmpt_example_c_mem.vcproj") - postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj") postprocess_vs2008_nonxcompat("build/vs2008/OpenMPT.vcproj") postprocess_vs2008_largeaddress("build/vs2008/OpenMPT.vcproj") postprocess_vs2008_nonxcompat("build/vs2008/PluginBridge.vcproj") @@ -142,25 +95,16 @@ postprocess_vs2010_main("build/vs2010/libopenmpt_example_c.vcxproj") postprocess_vs2010_main("build/vs2010/libopenmpt_example_c_mem.vcxproj") postprocess_vs2010_main("build/vs2010/libopenmpt_example_cxx.vcxproj") - postprocess_vs2010_mfc("build/vs2010/in_openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2010/xmp-openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2010/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2010/OpenMPT.vcxproj") postprocess_vs2010_largeaddress("build/vs2010/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2010/PluginBridge.vcxproj") postprocess_vs2010_largeaddress("build/vs2010/PluginBridge.vcxproj") - fixbug_vs2010_pch("build/vs2010/OpenMPT.vcxproj") - -if MPT_PREMAKE_VERSION == "5.0" then postprocess_vs2010_main("build/vs2012/libopenmpt_test.vcxproj") postprocess_vs2010_main("build/vs2012/openmpt123.vcxproj") postprocess_vs2010_main("build/vs2012/libopenmpt_example_c.vcxproj") postprocess_vs2010_main("build/vs2012/libopenmpt_example_c_mem.vcxproj") postprocess_vs2010_main("build/vs2012/libopenmpt_example_cxx.vcxproj") - postprocess_vs2010_mfc("build/vs2012/in_openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2012/xmp-openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2012/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2012/OpenMPT.vcxproj") postprocess_vs2010_largeaddress("build/vs2012/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2012/PluginBridge.vcxproj") @@ -171,9 +115,6 @@ postprocess_vs2010_main("build/vs2013/libopenmpt_example_c.vcxproj") postprocess_vs2010_main("build/vs2013/libopenmpt_example_c_mem.vcxproj") postprocess_vs2010_main("build/vs2013/libopenmpt_example_cxx.vcxproj") - postprocess_vs2010_mfc("build/vs2013/in_openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2013/xmp-openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2013/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2013/OpenMPT.vcxproj") postprocess_vs2010_largeaddress("build/vs2013/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2013/PluginBridge.vcxproj") @@ -184,16 +125,11 @@ postprocess_vs2010_main("build/vs2015/libopenmpt_example_c.vcxproj") postprocess_vs2010_main("build/vs2015/libopenmpt_example_c_mem.vcxproj") postprocess_vs2010_main("build/vs2015/libopenmpt_example_cxx.vcxproj") - postprocess_vs2010_mfc("build/vs2015/in_openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2015/xmp-openmpt.vcxproj") - postprocess_vs2010_mfc("build/vs2015/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2015/OpenMPT.vcxproj") postprocess_vs2010_largeaddress("build/vs2015/OpenMPT.vcxproj") postprocess_vs2010_nonxcompat("build/vs2015/PluginBridge.vcxproj") postprocess_vs2010_largeaddress("build/vs2015/PluginBridge.vcxproj") -end - end } @@ -202,11 +138,7 @@ solution "libopenmpt-all" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end dofile "../../build/premake4-win/mpt-libopenmpt_test.premake4.lua" dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" @@ -228,11 +160,7 @@ solution "libopenmpt_test" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end dofile "../../build/premake4-win/mpt-libopenmpt_test.premake4.lua" dofile "../../build/premake4-win/ext-miniz.premake4.lua" @@ -244,11 +172,7 @@ solution "foo_openmpt" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86" } -else - platforms { "x32" } -end dofile "../../build/premake4-win/mpt-foo_openmpt.premake4.lua" dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" @@ -261,11 +185,7 @@ solution "in_openmpt" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86" } -else - platforms { "x32" } -end dofile "../../build/premake4-win/mpt-in_openmpt.premake4.lua" dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" @@ -278,11 +198,7 @@ solution "xmp-openmpt" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86" } -else - platforms { "x32" } -end dofile "../../build/premake4-win/mpt-xmp-openmpt.premake4.lua" dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" @@ -297,11 +213,7 @@ solution "libopenmpt" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" dofile "../../build/premake4-win/mpt-libopenmpt_examples.premake4.lua" @@ -318,11 +230,7 @@ solution "openmpt123" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end dofile "../../build/premake4-win/mpt-openmpt123.premake4.lua" dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua" @@ -338,11 +246,7 @@ solution "PluginBridge" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release", "ReleaseNoLTCG" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end dofile "../../build/premake4-win/mpt-PluginBridge.premake4.lua" @@ -354,11 +258,7 @@ solution "OpenMPT" location ( "../../build/" .. _ACTION ) configurations { "Debug", "Release", "ReleaseNoLTCG" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end dofile "../../build/premake4-win/mpt-OpenMPT.premake4.lua" dofile "../../build/premake4-win/mpt-PluginBridge.premake4.lua" @@ -382,11 +282,7 @@ solution "all-externals" location ( "../../build/" .. _ACTION .. "-ext" ) configurations { "Debug", "Release", "ReleaseNoLTCG" } -if MPT_PREMAKE_VERSION == "5.0" then platforms { "x86", "x86_64" } -else - platforms { "x32", "x64" } -end dofile "../../build/premake4-win/ext-flac.premake4.lua" dofile "../../build/premake4-win/ext-lhasa.premake4.lua" Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -1,30 +1,3 @@ -if MPT_PREMAKE_VERSION == "5.0" then - filter {} kind "SharedLib" - -else - - configuration { "Debug", "x32" } - targetdir "../../bin/Win32-Debug" - - configuration { "Release", "x32" } - targetdir "../../bin/Win32" - - configuration { "ReleaseNoLTCG", "x32" } - targetdir "../../bin/Win32" - - configuration { "Debug", "x64" } - targetdir "../../bin/x64-Debug" - - configuration { "Release", "x64" } - targetdir "../../bin/x64" - - configuration { "ReleaseNoLTCG", "x64" } - targetdir "../../bin/x64" - - configuration "*" - kind "SharedLib" - -end Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -1,30 +1,3 @@ -if MPT_PREMAKE_VERSION == "5.0" then - filter {} kind "ConsoleApp" - -else - - configuration { "Debug", "x32" } - targetdir "../../bin/Win32-Debug" - - configuration { "Release", "x32" } - targetdir "../../bin/Win32" - - configuration { "ReleaseNoLTCG", "x32" } - targetdir "../../bin/Win32" - - configuration { "Debug", "x64" } - targetdir "../../bin/x64-Debug" - - configuration { "Release", "x64" } - targetdir "../../bin/x64" - - configuration { "ReleaseNoLTCG", "x64" } - targetdir "../../bin/x64" - - configuration "*" - kind "ConsoleApp" - -end Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -1,32 +1,4 @@ -if MPT_PREMAKE_VERSION == "5.0" then - filter {} kind "WindowedApp" flags { "WinMain" } - -else - - configuration { "Debug", "x32" } - targetdir "../../bin/Win32-Debug" - - configuration { "Release", "x32" } - targetdir "../../bin/Win32" - - configuration { "ReleaseNoLTCG", "x32" } - targetdir "../../bin/Win32" - - configuration { "Debug", "x64" } - targetdir "../../bin/x64-Debug" - - configuration { "Release", "x64" } - targetdir "../../bin/x64" - - configuration { "ReleaseNoLTCG", "x64" } - targetdir "../../bin/x64" - - configuration "*" - kind "WindowedApp" - flags { "WinMain" } - -end Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -1,30 +1,3 @@ -if MPT_PREMAKE_VERSION == "5.0" then - filter {} kind "StaticLib" - -else - - configuration { "Debug", "x32" } - targetdir "../../build/lib/x32/Debug" - - configuration { "Release", "x32" } - targetdir "../../build/lib/x32/Release" - - configuration { "ReleaseNoLTCG", "x32" } - targetdir "../../build/lib/x32/ReleaseNoLTCG" - - configuration { "Debug", "x64" } - targetdir "../../build/lib/x64/Debug" - - configuration { "Release", "x64" } - targetdir "../../build/lib/x64/Release" - - configuration { "ReleaseNoLTCG", "x64" } - targetdir "../../build/lib/x64/ReleaseNoLTCG" - - configuration "*" - kind "StaticLib" - -end Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults.lua =================================================================== --- trunk/OpenMPT/build/premake4-win/premake4-defaults.lua 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/premake4-win/premake4-defaults.lua 2015-05-11 10:23:41 UTC (rev 5077) @@ -1,6 +1,4 @@ -if MPT_PREMAKE_VERSION == "5.0" then - filter {} filter { "kind:StaticLib", "configurations:Debug", "architecture:x86" } @@ -55,46 +53,3 @@ defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" } filter {} - -else - - configuration "*" - - configuration "vs2008" - includedirs { "../../include/msinttypes/stdint" } - - configuration "Debug" - defines { "DEBUG" } -if MPT_PREMAKE_VERSION == "4.3" then - flags { "Symbols" } -elseif MPT_PREMAKE_VERSION == "4.4" then - flags { "Symbols" } -end - - configuration "Release" - defines { "NDEBUG" } -if MPT_PREMAKE_VERSION == "4.3" then - flags { "Symbols", "Optimize", "FloatFast" } - buildoptions { "/MP" } -elseif MPT_PREMAKE_VERSION == "4.4" then - flags { "Symbols", "Optimize", "FloatFast" } - buildoptions { "/GL /MP" } - linkoptions { "/LTCG" } -end - - configuration "ReleaseNoLTCG" - defines { "NDEBUG" } -if MPT_PREMAKE_VERSION == "4.3" then - flags { "Optimize", "FloatFast" } - buildoptions { "/GL- /MP" } -elseif MPT_PREMAKE_VERSION == "4.4" then - flags { "Optimize", "FloatFast" } - buildoptions { "/MP" } -end - - configuration "*" - defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" } - - configuration "*" - -end Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd =================================================================== --- trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-11 10:23:41 UTC (rev 5077) @@ -6,38 +6,6 @@ cd .. || goto err -goto premake5 - - -:premake4 - -echo dofile "build/premake4-win/premake.lua" > premake4.lua || goto err - -include\premake\premake4.exe --group=libopenmpt_test vs2008 || goto err -include\premake\premake4.exe --group=libopenmpt vs2008 || goto err -include\premake\premake4.exe --group=openmpt123 vs2008 || goto err -include\premake\premake4.exe --group=PluginBridge vs2008 || goto err -include\premake\premake4.exe --group=OpenMPT vs2008 || goto err -include\premake\premake4.exe --group=all-externals vs2008 || goto err - -include\premake\premake4.exe --group=libopenmpt_test vs2010 || goto err -include\premake\premake4.exe --group=in_openmpt vs2010 || goto err -include\premake\premake4.exe --group=xmp-openmpt vs2010 || goto err -include\premake\premake4.exe --group=libopenmpt vs2010 || goto err -include\premake\premake4.exe --group=openmpt123 vs2010 || goto err -include\premake\premake4.exe --group=PluginBridge vs2010 || goto err -include\premake\premake4.exe --group=OpenMPT vs2010 || goto err -include\premake\premake4.exe --group=all-externals vs2010 || goto err - -include\premake\premake4.exe postprocess || goto err - -del premake4.lua || goto err - -goto premakedone - - -:premake5 - echo dofile "build/premake4-win/premake.lua" > premake5.lua || goto err include\premake\premake5.exe --group=libopenmpt_test vs2008 || goto err @@ -88,11 +56,7 @@ del premake5.lua || goto err -goto premakedone - -:premakedone - cd %MY_DIR% || goto err goto end Index: trunk/OpenMPT/include/premake =================================================================== --- trunk/OpenMPT/include/premake 2015-05-11 10:11:30 UTC (rev 5076) +++ trunk/OpenMPT/include/premake 2015-05-11 10:23:41 UTC (rev 5077) Property changes on: trunk/OpenMPT/include/premake ___________________________________________________________________ Modified: svn:ignore ## -1,2 +1 ## -premake4.exe premake5.exe This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-13 16:15:02
|
Revision: 5088 http://sourceforge.net/p/modplug/code/5088 Author: manxorist Date: 2015-05-13 16:14:47 +0000 (Wed, 13 May 2015) Log Message: ----------- [Mod] build: Depending on the hardware used, compiling OpenMPT or libopenmpt can take about twice as long when using link time code generation. When building libopenmpt, the whole of libopenmpt gets optimized several times when linking the static library into the different player plugins or example projects. As using noLTCG for libopenmpt "Release" configuration and LTCG for OpenMPT "Release" configuration would complicate the premake script (i.e. mixing different solution and project configuration names in a single build for the dependent libraries that both OpenMPT and libopenmpt require), the default in the "Release" configurations is changed to noLTCG. For OpenMPT, a new "ReleaseLTCG" configuration is added which does the whole deal. Adjust the old VS2010 solution in mptrack/MPTRACK_10.* accordingly (i.e. flip/rename the configurations of the dependencies). [Mod] build: Generate debug symbols when compiling with noLTCG. [Mod] build: In "Release" configurations, change the optimization level from /Ox to /O2. The latter is recommended by MSDN. Modified Paths: -------------- trunk/OpenMPT/build/premake/premake-defaults.lua trunk/OpenMPT/build/premake/premake.lua trunk/OpenMPT/build/vs2008/OpenMPT.sln trunk/OpenMPT/build/vs2008/OpenMPT.vcproj trunk/OpenMPT/build/vs2008/PluginBridge.sln trunk/OpenMPT/build/vs2008/PluginBridge.vcproj trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj trunk/OpenMPT/build/vs2008/libopenmpt.vcproj trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_example_c.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_example_c_mem.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_modplug.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj trunk/OpenMPT/build/vs2008/openmpt123.vcproj trunk/OpenMPT/build/vs2008-ext/UnRAR.vcproj trunk/OpenMPT/build/vs2008-ext/flac.vcproj trunk/OpenMPT/build/vs2008-ext/lhasa.vcproj trunk/OpenMPT/build/vs2008-ext/miniz-shared.vcproj trunk/OpenMPT/build/vs2008-ext/miniz.vcproj trunk/OpenMPT/build/vs2008-ext/minizip.vcproj trunk/OpenMPT/build/vs2008-ext/ogg.vcproj trunk/OpenMPT/build/vs2008-ext/portaudio.vcproj trunk/OpenMPT/build/vs2008-ext/portmidi.vcproj trunk/OpenMPT/build/vs2008-ext/pugixml.vcproj trunk/OpenMPT/build/vs2008-ext/r8brain.vcproj trunk/OpenMPT/build/vs2008-ext/smbPitchShift.vcproj trunk/OpenMPT/build/vs2008-ext/soundtouch.vcproj trunk/OpenMPT/build/vs2008-ext/zlib.vcproj trunk/OpenMPT/build/vs2010/OpenMPT.sln trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj trunk/OpenMPT/build/vs2010/PluginBridge.sln trunk/OpenMPT/build/vs2010/PluginBridge.vcxproj trunk/OpenMPT/build/vs2010/VST MIDI Input Output.vcxproj trunk/OpenMPT/build/vs2010/foo_openmpt.vcxproj trunk/OpenMPT/build/vs2010/in_openmpt.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_modplug.vcxproj trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2010/openmpt123.vcxproj trunk/OpenMPT/build/vs2010/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2010-ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2010-ext/flac.vcxproj trunk/OpenMPT/build/vs2010-ext/lhasa.vcxproj trunk/OpenMPT/build/vs2010-ext/miniz-shared.vcxproj trunk/OpenMPT/build/vs2010-ext/miniz.vcxproj trunk/OpenMPT/build/vs2010-ext/minizip.vcxproj trunk/OpenMPT/build/vs2010-ext/ogg.vcxproj trunk/OpenMPT/build/vs2010-ext/portaudio.vcxproj trunk/OpenMPT/build/vs2010-ext/portmidi.vcxproj trunk/OpenMPT/build/vs2010-ext/pugixml.vcxproj trunk/OpenMPT/build/vs2010-ext/r8brain.vcxproj trunk/OpenMPT/build/vs2010-ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2010-ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2010-ext/zlib.vcxproj trunk/OpenMPT/build/vs2012/OpenMPT.sln trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj trunk/OpenMPT/build/vs2012/PluginBridge.sln trunk/OpenMPT/build/vs2012/PluginBridge.vcxproj trunk/OpenMPT/build/vs2012/VST MIDI Input Output.vcxproj trunk/OpenMPT/build/vs2012/in_openmpt.vcxproj trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj trunk/OpenMPT/build/vs2012/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2012/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2012/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2012/libopenmpt_modplug.vcxproj trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2012/openmpt123.vcxproj trunk/OpenMPT/build/vs2012/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2012-ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2012-ext/flac.vcxproj trunk/OpenMPT/build/vs2012-ext/lhasa.vcxproj trunk/OpenMPT/build/vs2012-ext/miniz-shared.vcxproj trunk/OpenMPT/build/vs2012-ext/miniz.vcxproj trunk/OpenMPT/build/vs2012-ext/minizip.vcxproj trunk/OpenMPT/build/vs2012-ext/ogg.vcxproj trunk/OpenMPT/build/vs2012-ext/portaudio.vcxproj trunk/OpenMPT/build/vs2012-ext/portmidi.vcxproj trunk/OpenMPT/build/vs2012-ext/pugixml.vcxproj trunk/OpenMPT/build/vs2012-ext/r8brain.vcxproj trunk/OpenMPT/build/vs2012-ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2012-ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2012-ext/zlib.vcxproj trunk/OpenMPT/build/vs2013/OpenMPT.sln trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj trunk/OpenMPT/build/vs2013/PluginBridge.sln trunk/OpenMPT/build/vs2013/PluginBridge.vcxproj trunk/OpenMPT/build/vs2013/VST MIDI Input Output.vcxproj trunk/OpenMPT/build/vs2013/in_openmpt.vcxproj trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj trunk/OpenMPT/build/vs2013/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2013/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2013/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2013/libopenmpt_modplug.vcxproj trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2013/openmpt123.vcxproj trunk/OpenMPT/build/vs2013/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2013-ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2013-ext/flac.vcxproj trunk/OpenMPT/build/vs2013-ext/lhasa.vcxproj trunk/OpenMPT/build/vs2013-ext/miniz-shared.vcxproj trunk/OpenMPT/build/vs2013-ext/miniz.vcxproj trunk/OpenMPT/build/vs2013-ext/minizip.vcxproj trunk/OpenMPT/build/vs2013-ext/ogg.vcxproj trunk/OpenMPT/build/vs2013-ext/portaudio.vcxproj trunk/OpenMPT/build/vs2013-ext/portmidi.vcxproj trunk/OpenMPT/build/vs2013-ext/pugixml.vcxproj trunk/OpenMPT/build/vs2013-ext/r8brain.vcxproj trunk/OpenMPT/build/vs2013-ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2013-ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2013-ext/zlib.vcxproj trunk/OpenMPT/build/vs2015/OpenMPT.sln trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj trunk/OpenMPT/build/vs2015/PluginBridge.sln trunk/OpenMPT/build/vs2015/PluginBridge.vcxproj trunk/OpenMPT/build/vs2015/VST MIDI Input Output.vcxproj trunk/OpenMPT/build/vs2015/in_openmpt.vcxproj trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj trunk/OpenMPT/build/vs2015/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2015/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2015/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2015/libopenmpt_modplug.vcxproj trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2015/openmpt123.vcxproj trunk/OpenMPT/build/vs2015/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2015-ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2015-ext/flac.vcxproj trunk/OpenMPT/build/vs2015-ext/lhasa.vcxproj trunk/OpenMPT/build/vs2015-ext/miniz-shared.vcxproj trunk/OpenMPT/build/vs2015-ext/miniz.vcxproj trunk/OpenMPT/build/vs2015-ext/minizip.vcxproj trunk/OpenMPT/build/vs2015-ext/ogg.vcxproj trunk/OpenMPT/build/vs2015-ext/portaudio.vcxproj trunk/OpenMPT/build/vs2015-ext/portmidi.vcxproj trunk/OpenMPT/build/vs2015-ext/pugixml.vcxproj trunk/OpenMPT/build/vs2015-ext/r8brain.vcxproj trunk/OpenMPT/build/vs2015-ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2015-ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2015-ext/zlib.vcxproj trunk/OpenMPT/mptrack/MPTRACK_10.sln Modified: trunk/OpenMPT/build/premake/premake-defaults.lua =================================================================== --- trunk/OpenMPT/build/premake/premake-defaults.lua 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/premake/premake-defaults.lua 2015-05-13 16:14:47 UTC (rev 5088) @@ -5,26 +5,26 @@ targetdir "../../build/lib/x86/Debug" filter { "kind:StaticLib", "configurations:Release", "architecture:x86" } targetdir "../../build/lib/x86/Release" - filter { "kind:StaticLib", "configurations:ReleaseNoLTCG", "architecture:x86" } - targetdir "../../build/lib/x86/ReleaseNoLTCG" + filter { "kind:StaticLib", "configurations:ReleaseLTCG", "architecture:x86" } + targetdir "../../build/lib/x86/ReleaseLTCG" filter { "kind:StaticLib", "configurations:Debug", "architecture:x86_64" } targetdir "../../build/lib/x86_64/Debug" filter { "kind:StaticLib", "configurations:Release", "architecture:x86_64" } targetdir "../../build/lib/x86_64/Release" - filter { "kind:StaticLib", "configurations:ReleaseNoLTCG", "architecture:x86_64" } - targetdir "../../build/lib/x86_64/ReleaseNoLTCG" + filter { "kind:StaticLib", "configurations:ReleaseLTCG", "architecture:x86_64" } + targetdir "../../build/lib/x86_64/ReleaseLTCG" filter { "kind:not StaticLib", "configurations:Debug", "architecture:x86" } targetdir "../../bin/Win32-Debug" filter { "kind:not StaticLib", "configurations:Release", "architecture:x86" } targetdir "../../bin/Win32" - filter { "kind:not StaticLib", "configurations:ReleaseNoLTCG", "architecture:x86" } + filter { "kind:not StaticLib", "configurations:ReleaseLTCG", "architecture:x86" } targetdir "../../bin/Win32" filter { "kind:not StaticLib", "configurations:Debug", "architecture:x86_64" } targetdir "../../bin/x64-Debug" filter { "kind:not StaticLib", "configurations:Release", "architecture:x86_64" } targetdir "../../bin/x64" - filter { "kind:not StaticLib", "configurations:ReleaseNoLTCG", "architecture:x86_64" } + filter { "kind:not StaticLib", "configurations:ReleaseLTCG", "architecture:x86_64" } targetdir "../../bin/x64" filter { "action:vs2008" } @@ -39,13 +39,13 @@ filter { "configurations:Release" } configuration "Release" defines { "NDEBUG" } - flags { "Symbols", "LinkTimeOptimization", "MultiProcessorCompile" } - optimize "Full" + flags { "Symbols", "MultiProcessorCompile" } + optimize "Speed" floatingpoint "Fast" - filter { "configurations:ReleaseNoLTCG" } + filter { "configurations:ReleaseLTCG" } defines { "NDEBUG" } - flags { "MultiProcessorCompile" } + flags { "Symbols", "MultiProcessorCompile", "LinkTimeOptimization" } optimize "Full" floatingpoint "Fast" Modified: trunk/OpenMPT/build/premake/premake.lua =================================================================== --- trunk/OpenMPT/build/premake/premake.lua 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/premake/premake.lua 2015-05-13 16:14:47 UTC (rev 5088) @@ -245,7 +245,7 @@ solution "PluginBridge" location ( "../../build/" .. _ACTION ) - configurations { "Debug", "Release", "ReleaseNoLTCG" } + configurations { "Debug", "Release", "ReleaseLTCG" } platforms { "x86", "x86_64" } dofile "../../build/premake/mpt-PluginBridge.lua" @@ -257,7 +257,7 @@ solution "OpenMPT" location ( "../../build/" .. _ACTION ) - configurations { "Debug", "Release", "ReleaseNoLTCG" } + configurations { "Debug", "Release", "ReleaseLTCG" } platforms { "x86", "x86_64" } dofile "../../build/premake/mpt-OpenMPT.lua" @@ -281,7 +281,7 @@ solution "all-externals" location ( "../../build/" .. _ACTION .. "-ext" ) - configurations { "Debug", "Release", "ReleaseNoLTCG" } + configurations { "Debug", "Release", "ReleaseLTCG" } platforms { "x86", "x86_64" } dofile "../../build/premake/ext-flac.lua" Modified: trunk/OpenMPT/build/vs2008/OpenMPT.sln =================================================================== --- trunk/OpenMPT/build/vs2008/OpenMPT.sln 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/OpenMPT.sln 2015-05-13 16:14:47 UTC (rev 5088) @@ -48,8 +48,8 @@ GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - ReleaseNoLTCG|Win32 = ReleaseNoLTCG|Win32 - ReleaseNoLTCG|x64 = ReleaseNoLTCG|x64 + ReleaseLTCG|Win32 = ReleaseLTCG|Win32 + ReleaseLTCG|x64 = ReleaseLTCG|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -58,10 +58,10 @@ {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Debug|Win32.Build.0 = Debug|Win32 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Debug|x64.ActiveCfg = Debug|x64 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Debug|x64.Build.0 = Debug|x64 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|Win32.ActiveCfg = Release|Win32 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|Win32.Build.0 = Release|Win32 {37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|x64.ActiveCfg = Release|x64 @@ -70,10 +70,10 @@ {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Debug|Win32.Build.0 = Debug|Win32 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Debug|x64.ActiveCfg = Debug|x64 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Debug|x64.Build.0 = Debug|x64 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Release|Win32.ActiveCfg = Release|Win32 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Release|Win32.Build.0 = Release|Win32 {A181B7D5-54DD-42B6-9CC3-8AB8DE2394BE}.Release|x64.ActiveCfg = Release|x64 @@ -82,10 +82,10 @@ {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|Win32.Build.0 = Debug|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|x64.ActiveCfg = Debug|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|x64.Build.0 = Debug|x64 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.ActiveCfg = Release|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.Build.0 = Release|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.ActiveCfg = Release|x64 @@ -94,10 +94,10 @@ {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|Win32.Build.0 = Debug|Win32 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|x64.ActiveCfg = Debug|x64 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|x64.Build.0 = Debug|x64 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.ActiveCfg = Release|Win32 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.Build.0 = Release|Win32 {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.ActiveCfg = Release|x64 @@ -106,10 +106,10 @@ {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|Win32.Build.0 = Debug|Win32 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|x64.ActiveCfg = Debug|x64 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|x64.Build.0 = Debug|x64 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.ActiveCfg = Release|Win32 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.Build.0 = Release|Win32 {6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.ActiveCfg = Release|x64 @@ -118,10 +118,10 @@ {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|Win32.Build.0 = Debug|Win32 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|x64.ActiveCfg = Debug|x64 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|x64.Build.0 = Debug|x64 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|Win32.ActiveCfg = Release|Win32 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|Win32.Build.0 = Release|Win32 {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.ActiveCfg = Release|x64 @@ -130,10 +130,10 @@ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.Build.0 = Debug|Win32 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.ActiveCfg = Debug|x64 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.Build.0 = Debug|x64 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.ActiveCfg = Release|Win32 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32 {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64 @@ -142,10 +142,10 @@ {189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = Debug|Win32 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = Debug|x64 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.Build.0 = Debug|x64 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|Win32.ActiveCfg = Release|Win32 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|Win32.Build.0 = Release|Win32 {189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.ActiveCfg = Release|x64 @@ -154,10 +154,10 @@ {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Debug|Win32.Build.0 = Debug|Win32 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Debug|x64.ActiveCfg = Debug|x64 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Debug|x64.Build.0 = Debug|x64 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Release|Win32.ActiveCfg = Release|Win32 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Release|Win32.Build.0 = Release|Win32 {2512E2CA-578A-4F10-9363-4BFC9A5EF960}.Release|x64.ActiveCfg = Release|x64 @@ -166,10 +166,10 @@ {BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|Win32.Build.0 = Debug|Win32 {BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|x64.ActiveCfg = Debug|x64 {BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|x64.Build.0 = Debug|x64 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.ActiveCfg = Release|Win32 {BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.Build.0 = Release|Win32 {BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.ActiveCfg = Release|x64 @@ -178,10 +178,10 @@ {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.Build.0 = Debug|Win32 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.ActiveCfg = Debug|x64 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.Build.0 = Debug|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.ActiveCfg = Release|Win32 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.Build.0 = Release|Win32 {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.ActiveCfg = Release|x64 @@ -190,10 +190,10 @@ {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.Build.0 = Debug|Win32 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.ActiveCfg = Debug|x64 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.Build.0 = Debug|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.ActiveCfg = Release|Win32 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.Build.0 = Release|Win32 {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.ActiveCfg = Release|x64 @@ -202,10 +202,10 @@ {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|Win32.Build.0 = Debug|Win32 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|x64.ActiveCfg = Debug|x64 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|x64.Build.0 = Debug|x64 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|Win32.ActiveCfg = Release|Win32 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|Win32.Build.0 = Release|Win32 {95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.ActiveCfg = Release|x64 @@ -214,10 +214,10 @@ {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.Build.0 = Debug|Win32 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.ActiveCfg = Debug|x64 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.Build.0 = Debug|x64 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.ActiveCfg = Release|Win32 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.Build.0 = Release|Win32 {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.ActiveCfg = Release|x64 Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -213,9 +213,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -301,9 +300,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -362,9 +360,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|Win32" + Name="ReleaseLTCG|Win32" OutputDirectory="..\..\bin\Win32" - IntermediateDirectory="..\obj\OpenMPT\x86\ReleaseNoLTCG" + IntermediateDirectory="..\obj\OpenMPT\x86\ReleaseLTCG" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -390,6 +388,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -399,7 +398,7 @@ UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -419,7 +418,7 @@ AdditionalOptions="/DELAYLOAD:uxtheme.dll /DELAYLOAD:OpenMPT_SoundTouch_f32.dll" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="1" - GenerateDebugInformation="false" + GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -448,9 +447,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|x64" + Name="ReleaseLTCG|x64" OutputDirectory="..\..\bin\x64" - IntermediateDirectory="..\obj\OpenMPT\x86_64\ReleaseNoLTCG" + IntermediateDirectory="..\obj\OpenMPT\x86_64\ReleaseLTCG" ConfigurationType="1" UseOfMFC="1" CharacterSet="2" @@ -477,6 +476,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -486,7 +486,7 @@ UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" WarningLevel="4" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -506,7 +506,7 @@ AdditionalOptions="/DELAYLOAD:uxtheme.dll /DELAYLOAD:OpenMPT_SoundTouch_f32.dll" OutputFile="$(OutDir)\OpenMPT.exe" LinkIncremental="1" - GenerateDebugInformation="false" + GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -733,7 +733,7 @@ /> </FileConfiguration> <FileConfiguration - Name="ReleaseNoLTCG|Win32" + Name="ReleaseLTCG|Win32" > <Tool Name="VCCLCompilerTool" @@ -741,7 +741,7 @@ /> </FileConfiguration> <FileConfiguration - Name="ReleaseNoLTCG|x64" + Name="ReleaseLTCG|x64" > <Tool Name="VCCLCompilerTool" Modified: trunk/OpenMPT/build/vs2008/PluginBridge.sln =================================================================== --- trunk/OpenMPT/build/vs2008/PluginBridge.sln 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/PluginBridge.sln 2015-05-13 16:14:47 UTC (rev 5088) @@ -7,8 +7,8 @@ GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - ReleaseNoLTCG|Win32 = ReleaseNoLTCG|Win32 - ReleaseNoLTCG|x64 = ReleaseNoLTCG|x64 + ReleaseLTCG|Win32 = ReleaseLTCG|Win32 + ReleaseLTCG|x64 = ReleaseLTCG|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -17,10 +17,10 @@ {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|Win32.Build.0 = Debug|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|x64.ActiveCfg = Debug|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Debug|x64.Build.0 = Debug|x64 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|x64 - {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseNoLTCG|x64.Build.0 = ReleaseNoLTCG|x64 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|Win32.ActiveCfg = ReleaseLTCG|Win32 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {1A147336-891E-49AC-9EAD-A750599A224C}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.ActiveCfg = Release|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.Build.0 = Release|Win32 {1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.ActiveCfg = Release|x64 Modified: trunk/OpenMPT/build/vs2008/PluginBridge.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -206,9 +206,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -291,9 +290,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -350,9 +348,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|Win32" + Name="ReleaseLTCG|Win32" OutputDirectory="..\..\bin\Win32" - IntermediateDirectory="..\obj\PluginBridge\x86\ReleaseNoLTCG" + IntermediateDirectory="..\obj\PluginBridge\x86\ReleaseLTCG" ConfigurationType="1" CharacterSet="1" > @@ -377,6 +375,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -385,7 +384,7 @@ FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="4" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -404,7 +403,7 @@ DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge32.exe" LinkIncremental="1" - GenerateDebugInformation="false" + GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -433,9 +432,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|x64" + Name="ReleaseLTCG|x64" OutputDirectory="..\..\bin\x64" - IntermediateDirectory="..\obj\PluginBridge\x86_64\ReleaseNoLTCG" + IntermediateDirectory="..\obj\PluginBridge\x86_64\ReleaseLTCG" ConfigurationType="1" CharacterSet="1" > @@ -461,6 +460,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" ExceptionHandling="2" @@ -469,7 +469,7 @@ FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="4" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -488,7 +488,7 @@ DataExecutionPrevention="1" OutputFile="$(OutDir)\PluginBridge64.exe" LinkIncremental="1" - GenerateDebugInformation="false" + GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" Modified: trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -204,9 +204,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -288,9 +287,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -346,9 +344,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|Win32" + Name="ReleaseLTCG|Win32" OutputDirectory="..\..\bin\Win32" - IntermediateDirectory="..\obj\PluginMidiInputOutput\x86\ReleaseNoLTCG" + IntermediateDirectory="..\obj\PluginMidiInputOutput\x86\ReleaseLTCG" ConfigurationType="2" CharacterSet="2" > @@ -373,6 +371,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -380,7 +379,7 @@ FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -398,7 +397,7 @@ AdditionalDependencies="winmm.lib" OutputFile="$(OutDir)\MIDI Input Output.dll" LinkIncremental="1" - GenerateDebugInformation="false" + GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -428,9 +427,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|x64" + Name="ReleaseLTCG|x64" OutputDirectory="..\..\bin\x64" - IntermediateDirectory="..\obj\PluginMidiInputOutput\x86_64\ReleaseNoLTCG" + IntermediateDirectory="..\obj\PluginMidiInputOutput\x86_64\ReleaseLTCG" ConfigurationType="2" CharacterSet="2" > @@ -456,6 +455,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -463,7 +463,7 @@ FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -481,7 +481,7 @@ AdditionalDependencies="winmm.lib" OutputFile="$(OutDir)\MIDI Input Output.dll" LinkIncremental="1" - GenerateDebugInformation="false" + GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" Modified: trunk/OpenMPT/build/vs2008/libopenmpt.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/libopenmpt.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -180,9 +180,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\common;..\..\soundlib;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="LIBOPENMPT_BUILD;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -250,9 +249,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\common;..\..\soundlib;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="LIBOPENMPT_BUILD;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" Modified: trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -202,9 +202,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\common;..\..\soundlib;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" @@ -285,9 +284,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\common;..\..\soundlib;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" Modified: trunk/OpenMPT/build/vs2008/libopenmpt_example_c.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt_example_c.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/libopenmpt_example_c.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -201,9 +201,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\include\portaudio\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -284,9 +283,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\include\portaudio\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" Modified: trunk/OpenMPT/build/vs2008/libopenmpt_example_c_mem.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt_example_c_mem.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/libopenmpt_example_c_mem.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -201,9 +201,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\include\portaudio\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -284,9 +283,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\include\portaudio\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" Modified: trunk/OpenMPT/build/vs2008/libopenmpt_modplug.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt_modplug.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/libopenmpt_modplug.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -202,9 +202,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\include\modplug\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" @@ -285,9 +284,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\include\modplug\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" Modified: trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -200,9 +200,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\common;..\..\soundlib;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -282,9 +281,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\common;..\..\soundlib;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" Modified: trunk/OpenMPT/build/vs2008/openmpt123.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/openmpt123.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008/openmpt123.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -202,9 +202,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -285,9 +284,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" Modified: trunk/OpenMPT/build/vs2008-ext/UnRAR.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008-ext/UnRAR.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008-ext/UnRAR.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -177,9 +177,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\include\unrar;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -246,9 +245,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\include\unrar;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -290,9 +288,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|Win32" - OutputDirectory="..\lib\x86\ReleaseNoLTCG" - IntermediateDirectory="..\obj\unrar\x86\ReleaseNoLTCG" + Name="ReleaseLTCG|Win32" + OutputDirectory="..\lib\x86\ReleaseLTCG" + IntermediateDirectory="..\obj\unrar\x86\ReleaseLTCG" ConfigurationType="4" CharacterSet="2" > @@ -316,6 +314,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\include\unrar;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -323,7 +322,7 @@ FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -357,9 +356,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|x64" - OutputDirectory="..\lib\x86_64\ReleaseNoLTCG" - IntermediateDirectory="..\obj\unrar\x86_64\ReleaseNoLTCG" + Name="ReleaseLTCG|x64" + OutputDirectory="..\lib\x86_64\ReleaseLTCG" + IntermediateDirectory="..\obj\unrar\x86_64\ReleaseLTCG" ConfigurationType="4" CharacterSet="2" > @@ -384,6 +383,7 @@ AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\..\include\unrar;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -391,7 +391,7 @@ FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: trunk/OpenMPT/build/vs2008-ext/flac.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008-ext/flac.vcproj 2015-05-13 15:13:57 UTC (rev 5087) +++ trunk/OpenMPT/build/vs2008-ext/flac.vcproj 2015-05-13 16:14:47 UTC (rev 5088) @@ -181,9 +181,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -251,9 +250,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP" - Optimization="3" + Optimization="2" AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;..\..\include\msinttypes\stdint" - WholeProgramOptimization="true" PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -296,9 +294,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|Win32" - OutputDirectory="..\lib\x86\ReleaseNoLTCG" - IntermediateDirectory="..\obj\flac\x86\ReleaseNoLTCG" + Name="ReleaseLTCG|Win32" + OutputDirectory="..\lib\x86\ReleaseLTCG" + IntermediateDirectory="..\obj\flac\x86\ReleaseLTCG" ConfigurationType="4" CharacterSet="2" > @@ -322,6 +320,7 @@ AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP" Optimization="3" AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;..\..\include\msinttypes\stdint" + WholeProgramOptimization="true" PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -329,7 +328,7 @@ FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="1" /> <Tool @@ -364,9 +363,9 @@ /> </Configuration> <Configuration - Name="ReleaseNoLTCG|x64" - OutputDirectory="..\lib\x86_64\ReleaseNoLTCG" - IntermediateDirectory="..\obj\flac\x86_64\ReleaseNoLTCG" + Name="ReleaseLTCG|x64" + OutputDirectory="..\lib\x86_64\ReleaseLTCG" + IntermediateDirectory="..\obj\flac\x86_64\ReleaseLTCG" ConfigurationType="4" CharacterSet="2" > @@ -391,6 +390,7 @@ AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP" Optimization="3" AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libF... [truncated message content] |
From: <sag...@us...> - 2015-05-13 20:28:03
|
Revision: 5089 http://sourceforge.net/p/modplug/code/5089 Author: saga-games Date: 2015-05-13 20:27:57 +0000 (Wed, 13 May 2015) Log Message: ----------- [Fix] Some VST plugins (e.g. SmartElektronix Ambience) write directly to the memory chunk that is passed to them when loading preset files. This memory block was not writable since OpenMPT 1.22. [Imp] When a plugin dispatch call causes an exception, show the name of the opcode that caused the exception. Modified Paths: -------------- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters trunk/OpenMPT/mptrack/VstPresets.cpp trunk/OpenMPT/mptrack/VstPresets.h trunk/OpenMPT/mptrack/Vstplug.cpp trunk/OpenMPT/mptrack/mptrack_10.vcxproj trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters Added Paths: ----------- trunk/OpenMPT/soundlib/plugins/OpCodes.h Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-13 20:27:57 UTC (rev 5089) @@ -2009,6 +2009,10 @@ > </File> <File + RelativePath="..\..\soundlib\plugins\OpCodes.h" + > + </File> + <File RelativePath="..\..\soundlib\plugins\PlugInterface.h" > </File> Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-05-13 20:27:57 UTC (rev 5089) @@ -488,6 +488,7 @@ <ClInclude Include="..\..\soundlib\modsmp_ctrl.h" /> <ClInclude Include="..\..\soundlib\pattern.h" /> <ClInclude Include="..\..\soundlib\patternContainer.h" /> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h" /> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginEventQueue.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginMixBuffer.h" /> Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-05-13 20:27:57 UTC (rev 5089) @@ -507,6 +507,9 @@ <ClInclude Include="..\..\soundlib\patternContainer.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h"> + <Filter>soundlib\plugins</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h"> <Filter>soundlib\plugins</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-05-13 20:27:57 UTC (rev 5089) @@ -494,6 +494,7 @@ <ClInclude Include="..\..\soundlib\modsmp_ctrl.h" /> <ClInclude Include="..\..\soundlib\pattern.h" /> <ClInclude Include="..\..\soundlib\patternContainer.h" /> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h" /> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginEventQueue.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginMixBuffer.h" /> Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-05-13 20:27:57 UTC (rev 5089) @@ -507,6 +507,9 @@ <ClInclude Include="..\..\soundlib\patternContainer.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h"> + <Filter>soundlib\plugins</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h"> <Filter>soundlib\plugins</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-05-13 20:27:57 UTC (rev 5089) @@ -495,6 +495,7 @@ <ClInclude Include="..\..\soundlib\modsmp_ctrl.h" /> <ClInclude Include="..\..\soundlib\pattern.h" /> <ClInclude Include="..\..\soundlib\patternContainer.h" /> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h" /> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginEventQueue.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginMixBuffer.h" /> Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-05-13 20:27:57 UTC (rev 5089) @@ -507,6 +507,9 @@ <ClInclude Include="..\..\soundlib\patternContainer.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h"> + <Filter>soundlib\plugins</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h"> <Filter>soundlib\plugins</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-05-13 20:27:57 UTC (rev 5089) @@ -495,6 +495,7 @@ <ClInclude Include="..\..\soundlib\modsmp_ctrl.h" /> <ClInclude Include="..\..\soundlib\pattern.h" /> <ClInclude Include="..\..\soundlib\patternContainer.h" /> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h" /> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginEventQueue.h" /> <ClInclude Include="..\..\soundlib\plugins\PluginMixBuffer.h" /> Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-05-13 20:27:57 UTC (rev 5089) @@ -507,6 +507,9 @@ <ClInclude Include="..\..\soundlib\patternContainer.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\plugins\OpCodes.h"> + <Filter>soundlib\plugins</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\plugins\PlugInterface.h"> <Filter>soundlib\plugins</Filter> </ClInclude> Modified: trunk/OpenMPT/mptrack/VstPresets.cpp =================================================================== --- trunk/OpenMPT/mptrack/VstPresets.cpp 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/mptrack/VstPresets.cpp 2015-05-13 20:27:57 UTC (rev 5089) @@ -90,8 +90,19 @@ } } else { - FileReader chunk = file.ReadChunk(file.ReadUint32BE()); - plugin.Dispatch(effSetChunk, 1, chunk.GetLength(), const_cast<char *>(chunk.GetRawData()), 0); + uint32 chunkSize = file.ReadUint32BE(); + // Some nasty plugins (e.g. SmartElectronix Ambience) write to our memory block. + // Directly writing to a memory-mapped file block results in a crash... + char *chunkData = new (std::nothrow) char[chunkSize]; + if(chunkData) + { + file.ReadRaw(chunkData, chunkSize); + plugin.Dispatch(effSetChunk, 1, chunkSize, chunkData, 0); + delete[] chunkData; + } else + { + return outOfMemory; + } } plugin.Dispatch(effEndSetProgram, 0, 0, nullptr, 0.0f); } else if((header.fxMagic == bankMagic || header.fxMagic == chunkBankMagic) && firstChunk) @@ -126,8 +137,19 @@ plugin.SetCurrentProgram(oldCurrentProgram); } else { - FileReader chunk = file.ReadChunk(file.ReadUint32BE()); - plugin.Dispatch(effSetChunk, 0, chunk.GetLength(), const_cast<char *>(chunk.GetRawData()), 0); + uint32 chunkSize = file.ReadUint32BE(); + // Some nasty plugins (e.g. SmartElectronix Ambience) write to our memory block. + // Directly writing to a memory-mapped file block results in a crash... + char *chunkData = new (std::nothrow) char[chunkSize]; + if(chunkData) + { + file.ReadRaw(chunkData, chunkSize); + plugin.Dispatch(effSetChunk, 0, chunkSize, chunkData, 0); + delete[] chunkData; + } else + { + return outOfMemory; + } } if(header.version >= 2) { @@ -282,6 +304,8 @@ return "This file appears to be for a different plugin."; case VSTPresets::wrongParameters: return "The number of parameters in this file is incompatible with the current plugin."; + case VSTPresets::outOfMemory: + return "Not enough memory to load preset data."; } return nullptr; } Modified: trunk/OpenMPT/mptrack/VstPresets.h =================================================================== --- trunk/OpenMPT/mptrack/VstPresets.h 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/mptrack/VstPresets.h 2015-05-13 20:27:57 UTC (rev 5089) @@ -26,6 +26,7 @@ invalidFile, wrongPlugin, wrongParameters, + outOfMemory, }; #ifndef NO_VST Modified: trunk/OpenMPT/mptrack/Vstplug.cpp =================================================================== --- trunk/OpenMPT/mptrack/Vstplug.cpp 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/mptrack/Vstplug.cpp 2015-05-13 20:27:57 UTC (rev 5089) @@ -26,6 +26,7 @@ #include "../common/mptFileIO.h" #include "../common/FileReader.h" #include "FileDialog.h" +#include "../soundlib/plugins/OpCodes.h" OPENMPT_NAMESPACE_BEGIN @@ -1088,7 +1089,15 @@ } } catch (...) { - ReportPlugException(mpt::String::Print(L"Exception in Dispatch(%1)!", opCode)); + std::string codeStr; + if(opCode < CountOf(VstOpCodes)) + { + codeStr = VstOpCodes[opCode]; + } else + { + codeStr = mpt::ToString(opCode); + } + ReportPlugException(mpt::String::Print(L"Exception in Dispatch(%1)!", codeStr)); } return result; @@ -1982,13 +1991,11 @@ SetParameter(nParam, fValue); } -//rewbs.smoothVST UINT CVstPlugin::GetZxxParameter(UINT nParam) //------------------------------------------- { return (UINT) (GetParameter(nParam) * 127.0f + 0.5f); } -//end rewbs.smoothVST // Automate a parameter from the plugin GUI (both custom and default plugin GUI) @@ -2002,6 +2009,8 @@ return; } + // TODO: Check if any params are actually automatable, and if there are but this one isn't, chicken out + if (m_bRecordAutomation) { // Record parameter change @@ -2129,7 +2138,7 @@ { UINT nParams = (m_Effect.numParams > 0) ? m_Effect.numParams : 0; UINT nLen = nParams * sizeof(float); - ULONG nType = *(ULONG *)m_pMixStruct->pPluginData; + uint32_t nType = *(uint32_t *)m_pMixStruct->pPluginData; if ((Dispatch(effIdentify, 0, 0, nullptr, 0) == 'NvEf') && (nType == 'NvEf')) { Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj =================================================================== --- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2015-05-13 20:27:57 UTC (rev 5089) @@ -1001,6 +1001,7 @@ <ClInclude Include="..\soundlib\mod_specifications.h" /> <ClInclude Include="..\soundlib\pattern.h" /> <ClInclude Include="..\soundlib\patternContainer.h" /> + <ClInclude Include="..\soundlib\plugins\OpCodes.h" /> <ClInclude Include="..\soundlib\plugins\PluginEventQueue.h" /> <ClInclude Include="..\soundlib\plugins\PluginMixBuffer.h" /> <ClInclude Include="..\soundlib\plugins\PlugInterface.h" /> Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters =================================================================== --- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2015-05-13 16:14:47 UTC (rev 5088) +++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2015-05-13 20:27:57 UTC (rev 5089) @@ -1077,6 +1077,9 @@ <ClInclude Include="FadeLaws.h"> <Filter>Header Files\mptrack</Filter> </ClInclude> + <ClInclude Include="..\soundlib\plugins\OpCodes.h"> + <Filter>Header Files\soundlib\plugins</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="res\bitmap1.bmp"> Added: trunk/OpenMPT/soundlib/plugins/OpCodes.h =================================================================== --- trunk/OpenMPT/soundlib/plugins/OpCodes.h (rev 0) +++ trunk/OpenMPT/soundlib/plugins/OpCodes.h 2015-05-13 20:27:57 UTC (rev 5089) @@ -0,0 +1,97 @@ +/* + * OpCodes.h + * --------- + * Purpose: A human-readable list of VST opcodes, for error reporting purposes. + * Notes : (currently none) + * Authors: OpenMPT Devs + * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. + */ + + +#pragma once + +#ifndef NO_VST +static const char *VstOpCodes[] = +{ + "effOpen", + "effClose," + "effSetProgram", + "effGetProgram", + "effSetProgramName", + "effGetProgramName", + "effGetParamLabel", + "effGetParamDisplay", + "effGetParamName", + "effGetVu", + "effSetSampleRate" + "effSetBlockSize" + "effMainsChanged" + "effEditGetRect," + "effEditOpen," + "effEditClose," + "effEditDraw", + "effEditMouse", + "effEditKey", + "effEditIdle", + "effEditTop", + "effEditSleep", + "effIdentify", + "effGetChunk", + "effSetChunk", + "effProcessEvents", + "effCanBeAutomated", + "effString2Parameter", + "effGetNumProgramCategories", + "effGetProgramNameIndexed", + "effCopyProgram", + "effConnectInput", + "effConnectOutput", + "effGetInputProperties", + "effGetOutputProperties", + "effGetPlugCategory", + "effGetCurrentPosition", + "effGetDestinationBuffer", + "effOfflineNotify", + "effOfflinePrepare", + "effOfflineRun", + "effProcessVarIo", + "effSetSpeakerArrangement", + "effSetBlockSizeAndSampleRate", + "effSetBypass", + "effGetEffectName", + "effGetErrorText", + "effGetVendorString", + "effGetProductString", + "effGetVendorVersion", + "effVendorSpecific", + "effCanDo", + "effGetTailSize", + "effIdle", + "effGetIcon", + "effSetViewPosition", + "effGetParameterProperties", + "effKeysRequired", + "effGetVstVersion", + "effEditKeyDown", + "effEditKeyUp", + "effSetEditKnobMode", + "effGetMidiProgramName", + "effGetCurrentMidiProgram", + "effGetMidiProgramCategory", + "effHasMidiProgramsChanged", + "effGetMidiKeyName", + "effBeginSetProgram", + "effEndSetProgram", + "effGetSpeakerArrangement", + "effShellGetNextPlugin", + "effStartProcess", + "effStopProcess", + "effSetTotalSampleToProcess", + "effSetPanLaw", + "effBeginLoadBank", + "effBeginLoadProgram", + "effSetProcessPrecision", + "effGetNumMidiInputChannels", + "effGetNumMidiOutputChannels" +}; +#endif \ No newline at end of file Property changes on: trunk/OpenMPT/soundlib/plugins/OpCodes.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/x-chdr \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-13 20:45:13
|
Revision: 5090 http://sourceforge.net/p/modplug/code/5090 Author: manxorist Date: 2015-05-13 20:45:07 +0000 (Wed, 13 May 2015) Log Message: ----------- [Fix] Fix namespaced compilation. Modified Paths: -------------- trunk/OpenMPT/mptrack/UpdateHints.h trunk/OpenMPT/soundlib/plugins/OpCodes.h Modified: trunk/OpenMPT/mptrack/UpdateHints.h =================================================================== --- trunk/OpenMPT/mptrack/UpdateHints.h 2015-05-13 20:27:57 UTC (rev 5089) +++ trunk/OpenMPT/mptrack/UpdateHints.h 2015-05-13 20:45:07 UTC (rev 5090) @@ -13,6 +13,8 @@ #include "../common/FlagSet.h" #include "../soundlib/Snd_defs.h" +OPENMPT_NAMESPACE_BEGIN + // Mutually exclusive hint categories enum HintCategory { @@ -201,3 +203,5 @@ static const HintCategory classCategory = HINTCAT_COMMENTS; CommentHint() : UpdateHint(classCategory) { type = HINT_MODCOMMENTS; } }; + +OPENMPT_NAMESPACE_END Modified: trunk/OpenMPT/soundlib/plugins/OpCodes.h =================================================================== --- trunk/OpenMPT/soundlib/plugins/OpCodes.h 2015-05-13 20:27:57 UTC (rev 5089) +++ trunk/OpenMPT/soundlib/plugins/OpCodes.h 2015-05-13 20:45:07 UTC (rev 5090) @@ -10,6 +10,8 @@ #pragma once +OPENMPT_NAMESPACE_BEGIN + #ifndef NO_VST static const char *VstOpCodes[] = { @@ -94,4 +96,6 @@ "effGetNumMidiInputChannels", "effGetNumMidiOutputChannels" }; -#endif \ No newline at end of file +#endif + +OPENMPT_NAMESPACE_END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-14 09:11:56
|
Revision: 5094 http://sourceforge.net/p/modplug/code/5094 Author: manxorist Date: 2015-05-14 09:11:50 +0000 (Thu, 14 May 2015) Log Message: ----------- [Var] Change spelling of my name from ASCII transcription to proper Unicode. Modified Paths: -------------- trunk/OpenMPT/common/version.cpp trunk/OpenMPT/packageTemplate/History.txt Modified: trunk/OpenMPT/common/version.cpp =================================================================== --- trunk/OpenMPT/common/version.cpp 2015-05-14 08:22:47 UTC (rev 5093) +++ trunk/OpenMPT/common/version.cpp 2015-05-14 09:11:50 UTC (rev 5094) @@ -402,7 +402,7 @@ "\n" "Contributors:\n" "Johannes Schultz (2008-2015)\n" - "Joern Heusipp (2012-2015)\n" + "J\xC3\xB6rn Heusipp (2012-2015)\n" "Ahti Lepp\xC3\xA4nen (2005-2011)\n" "Robin Fernandes (2004-2007)\n" "Sergiy Pylypenko (2007)\n" Modified: trunk/OpenMPT/packageTemplate/History.txt =================================================================== --- trunk/OpenMPT/packageTemplate/History.txt 2015-05-14 08:22:47 UTC (rev 5093) +++ trunk/OpenMPT/packageTemplate/History.txt 2015-05-14 09:11:50 UTC (rev 5094) @@ -14,7 +14,7 @@ <initials> nick name / real name [email @openmpt.org] <al> Relabs / Ahti Leppänen [relabs] <ec> Ericus / Eric Chavanon [ericus] - <jh> manx / Joern Heusipp [manx] + <jh> manx / Jörn Heusipp [manx] <js> Saga Musix / Johannes Schultz [sagamusix] <rf> rewbs / Robin Fernandes [rewbs] <sp> pelya / Sergiy Pylypenko [pelya] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-15 06:35:16
|
Revision: 5097 http://sourceforge.net/p/modplug/code/5097 Author: manxorist Date: 2015-05-15 06:35:09 +0000 (Fri, 15 May 2015) Log Message: ----------- [Ref] build: Add a proper application manifest aseembly identity to the premake build of OpenMPT. Even though things work without any problem without it, MSDN says this is required. Write 1.0.0.0 as required version field there, as determining the proper OpenMPT version would result in yet another build step that would generate the manifest dynamically. As the version does not matter at all for executables (it matters only for libraries), the old build system did not bother to write the OpenMPT version there either. Use a new file, OpenMPT.manifest and leave the old rt_manif.bin for the old build system alone. Modified Paths: -------------- trunk/OpenMPT/build/premake/mpt-OpenMPT.lua trunk/OpenMPT/build/vs2008/OpenMPT.vcproj trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters Added Paths: ----------- trunk/OpenMPT/mptrack/res/OpenMPT.manifest Modified: trunk/OpenMPT/build/premake/mpt-OpenMPT.lua =================================================================== --- trunk/OpenMPT/build/premake/mpt-OpenMPT.lua 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/premake/mpt-OpenMPT.lua 2015-05-15 06:35:09 UTC (rev 5097) @@ -18,6 +18,9 @@ "../../build/svn_version", } files { + "../../mptrack/res/OpenMPT.manifest", + } + files { "../../common/*.cpp", "../../common/*.h", "../../soundlib/*.cpp", Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-15 06:35:09 UTC (rev 5097) @@ -85,6 +85,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="../../mptrack/res/OpenMPT.manifest" /> <Tool Name="VCXDCMakeTool" @@ -169,6 +170,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="../../mptrack/res/OpenMPT.manifest" /> <Tool Name="VCXDCMakeTool" @@ -255,6 +257,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="../../mptrack/res/OpenMPT.manifest" /> <Tool Name="VCXDCMakeTool" @@ -342,6 +345,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="../../mptrack/res/OpenMPT.manifest" /> <Tool Name="VCXDCMakeTool" @@ -429,6 +433,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="../../mptrack/res/OpenMPT.manifest" /> <Tool Name="VCXDCMakeTool" @@ -517,6 +522,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="../../mptrack/res/OpenMPT.manifest" /> <Tool Name="VCXDCMakeTool" @@ -1441,6 +1447,14 @@ RelativePath="..\..\mptrack\view_com.h" > </File> + <Filter + Name="res" + > + <File + RelativePath="..\..\mptrack\res\OpenMPT.manifest" + > + </File> + </Filter> </Filter> <Filter Name="pluginBridge" Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-05-15 06:35:09 UTC (rev 5097) @@ -157,6 +157,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -184,6 +187,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -219,6 +225,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -254,6 +263,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -289,6 +301,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -324,6 +339,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -700,6 +718,9 @@ <ClCompile Include="..\..\unarchiver\unzip.cpp" /> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest" /> + </ItemGroup> + <ItemGroup> <ResourceCompile Include="..\..\mptrack\mptrack.rc" /> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-05-15 06:35:09 UTC (rev 5097) @@ -7,6 +7,9 @@ <Filter Include="mptrack"> <UniqueIdentifier>{778900D8-E368-7F73-EC80-0A4A58DFE5D4}</UniqueIdentifier> </Filter> + <Filter Include="mptrack\res"> + <UniqueIdentifier>{3025A28F-9CDA-1A85-25CF-145C91831189}</UniqueIdentifier> + </Filter> <Filter Include="pluginBridge"> <UniqueIdentifier>{E1FAE259-CD5D-72FE-76E3-AAB462253E81}</UniqueIdentifier> </Filter> @@ -30,6 +33,11 @@ </Filter> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest"> + <Filter>mptrack\res</Filter> + </None> + </ItemGroup> + <ItemGroup> <ClInclude Include="..\..\common\AudioCriticalSection.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-05-15 06:35:09 UTC (rev 5097) @@ -163,6 +163,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -190,6 +193,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -225,6 +231,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -260,6 +269,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -295,6 +307,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -330,6 +345,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -706,6 +724,9 @@ <ClCompile Include="..\..\unarchiver\unzip.cpp" /> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest" /> + </ItemGroup> + <ItemGroup> <ResourceCompile Include="..\..\mptrack\mptrack.rc" /> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-05-15 06:35:09 UTC (rev 5097) @@ -7,6 +7,9 @@ <Filter Include="mptrack"> <UniqueIdentifier>{778900D8-E368-7F73-EC80-0A4A58DFE5D4}</UniqueIdentifier> </Filter> + <Filter Include="mptrack\res"> + <UniqueIdentifier>{3025A28F-9CDA-1A85-25CF-145C91831189}</UniqueIdentifier> + </Filter> <Filter Include="pluginBridge"> <UniqueIdentifier>{E1FAE259-CD5D-72FE-76E3-AAB462253E81}</UniqueIdentifier> </Filter> @@ -30,6 +33,11 @@ </Filter> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest"> + <Filter>mptrack\res</Filter> + </None> + </ItemGroup> + <ItemGroup> <ClInclude Include="..\..\common\AudioCriticalSection.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-05-15 06:35:09 UTC (rev 5097) @@ -164,6 +164,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -191,6 +194,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -226,6 +232,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -261,6 +270,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -296,6 +308,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -331,6 +346,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -707,6 +725,9 @@ <ClCompile Include="..\..\unarchiver\unzip.cpp" /> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest" /> + </ItemGroup> + <ItemGroup> <ResourceCompile Include="..\..\mptrack\mptrack.rc" /> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-05-15 06:35:09 UTC (rev 5097) @@ -7,6 +7,9 @@ <Filter Include="mptrack"> <UniqueIdentifier>{778900D8-E368-7F73-EC80-0A4A58DFE5D4}</UniqueIdentifier> </Filter> + <Filter Include="mptrack\res"> + <UniqueIdentifier>{3025A28F-9CDA-1A85-25CF-145C91831189}</UniqueIdentifier> + </Filter> <Filter Include="pluginBridge"> <UniqueIdentifier>{E1FAE259-CD5D-72FE-76E3-AAB462253E81}</UniqueIdentifier> </Filter> @@ -30,6 +33,11 @@ </Filter> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest"> + <Filter>mptrack\res</Filter> + </None> + </ItemGroup> + <ItemGroup> <ClInclude Include="..\..\common\AudioCriticalSection.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj =================================================================== --- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-05-15 06:35:09 UTC (rev 5097) @@ -164,6 +164,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -191,6 +194,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -226,6 +232,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -261,6 +270,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -296,6 +308,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -331,6 +346,9 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <LargeAddressAware>true</LargeAddressAware> </Link> + <Manifest> + <AdditionalManifestFiles>../../mptrack/res/OpenMPT.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> <PreBuildEvent> <Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command> </PreBuildEvent> @@ -707,6 +725,9 @@ <ClCompile Include="..\..\unarchiver\unzip.cpp" /> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest" /> + </ItemGroup> + <ItemGroup> <ResourceCompile Include="..\..\mptrack\mptrack.rc" /> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-05-15 06:17:44 UTC (rev 5096) +++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-05-15 06:35:09 UTC (rev 5097) @@ -7,6 +7,9 @@ <Filter Include="mptrack"> <UniqueIdentifier>{778900D8-E368-7F73-EC80-0A4A58DFE5D4}</UniqueIdentifier> </Filter> + <Filter Include="mptrack\res"> + <UniqueIdentifier>{3025A28F-9CDA-1A85-25CF-145C91831189}</UniqueIdentifier> + </Filter> <Filter Include="pluginBridge"> <UniqueIdentifier>{E1FAE259-CD5D-72FE-76E3-AAB462253E81}</UniqueIdentifier> </Filter> @@ -30,6 +33,11 @@ </Filter> </ItemGroup> <ItemGroup> + <None Include="..\..\mptrack\res\OpenMPT.manifest"> + <Filter>mptrack\res</Filter> + </None> + </ItemGroup> + <ItemGroup> <ClInclude Include="..\..\common\AudioCriticalSection.h"> <Filter>common</Filter> </ClInclude> Added: trunk/OpenMPT/mptrack/res/OpenMPT.manifest =================================================================== --- trunk/OpenMPT/mptrack/res/OpenMPT.manifest (rev 0) +++ trunk/OpenMPT/mptrack/res/OpenMPT.manifest 2015-05-15 06:35:09 UTC (rev 5097) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="OpenMPT.OpenMPT" + version="1.0.0.0" + /> + <description>OpenMPT / Open ModPlug Tracker</description> +</assembly> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-15 07:34:50
|
Revision: 5101 http://sourceforge.net/p/modplug/code/5101 Author: manxorist Date: 2015-05-15 07:34:44 +0000 (Fri, 15 May 2015) Log Message: ----------- [Ref] build: Make svn_version.h usable in C code. Modified Paths: -------------- trunk/OpenMPT/build/svn_version/svn_version.h trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h trunk/OpenMPT/common/version.cpp Modified: trunk/OpenMPT/build/svn_version/svn_version.h =================================================================== --- trunk/OpenMPT/build/svn_version/svn_version.h 2015-05-15 07:18:57 UTC (rev 5100) +++ trunk/OpenMPT/build/svn_version/svn_version.h 2015-05-15 07:34:44 UTC (rev 5101) @@ -2,9 +2,9 @@ #pragma once #if defined(MPT_PACKAGE) -#define OPENMPT_VERSION_IS_PACKAGE true +#define OPENMPT_VERSION_IS_PACKAGE 1 #else -#define OPENMPT_VERSION_IS_PACKAGE false +#define OPENMPT_VERSION_IS_PACKAGE 0 #endif #if defined(MPT_SVNVERSION) Modified: trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h =================================================================== --- trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h 2015-05-15 07:18:57 UTC (rev 5100) +++ trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h 2015-05-15 07:34:44 UTC (rev 5101) @@ -4,9 +4,9 @@ #define OPENMPT_VERSION_URL "$WCURL$" #define OPENMPT_VERSION_REVISION $WCREV$ -#define OPENMPT_VERSION_DIRTY $WCMODS?true:false$ -#define OPENMPT_VERSION_MIXEDREVISIONS $WCMIXED?true:false$ +#define OPENMPT_VERSION_DIRTY $WCMODS?1:0$ +#define OPENMPT_VERSION_MIXEDREVISIONS $WCMIXED?1:0$ -#define OPENMPT_VERSION_IS_PACKAGE false +#define OPENMPT_VERSION_IS_PACKAGE 0 #define OPENMPT_VERSION_DATE "$WCNOW=%Y-%m-%d %H:%M:%S$" Modified: trunk/OpenMPT/common/version.cpp =================================================================== --- trunk/OpenMPT/common/version.cpp 2015-05-15 07:18:57 UTC (rev 5100) +++ trunk/OpenMPT/common/version.cpp 2015-05-15 07:34:44 UTC (rev 5101) @@ -166,7 +166,7 @@ bool IsDirty() { #if defined(OPENMPT_VERSION_DIRTY) - return OPENMPT_VERSION_DIRTY; + return OPENMPT_VERSION_DIRTY ? true : false; #elif defined(OPENMPT_VERSION_SVNVERSION) std::string svnversion = OPENMPT_VERSION_SVNVERSION; if(svnversion.length() == 0) @@ -186,7 +186,7 @@ bool HasMixedRevisions() { #if defined(OPENMPT_VERSION_MIXEDREVISIONS) - return OPENMPT_VERSION_MIXEDREVISIONS; + return OPENMPT_VERSION_MIXEDREVISIONS ? true : false; #elif defined(OPENMPT_VERSION_SVNVERSION) std::string svnversion = OPENMPT_VERSION_SVNVERSION; if(svnversion.length() == 0) @@ -218,7 +218,7 @@ bool IsPackage() { #if defined(OPENMPT_VERSION_IS_PACKAGE) - return OPENMPT_VERSION_IS_PACKAGE; + return OPENMPT_VERSION_IS_PACKAGE ? true : false; #else return false; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-15 13:14:56
|
Revision: 5106 http://sourceforge.net/p/modplug/code/5106 Author: manxorist Date: 2015-05-15 13:14:50 +0000 (Fri, 15 May 2015) Log Message: ----------- [Ref] Support VS2015 in CompilerDetect.h. [Ref] Silence class member shadowing warning with VS2015. Modified Paths: -------------- trunk/OpenMPT/common/CompilerDetect.h trunk/OpenMPT/mptrack/Settings.h Modified: trunk/OpenMPT/common/CompilerDetect.h =================================================================== --- trunk/OpenMPT/common/CompilerDetect.h 2015-05-15 09:00:30 UTC (rev 5105) +++ trunk/OpenMPT/common/CompilerDetect.h 2015-05-15 13:14:50 UTC (rev 5106) @@ -47,7 +47,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1800) +#if (_MSC_VER >= 1900) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2015,0) +#elif (_MSC_VER >= 1800) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2013,0) #elif (_MSC_VER >= 1700) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2012,0) Modified: trunk/OpenMPT/mptrack/Settings.h =================================================================== --- trunk/OpenMPT/mptrack/Settings.h 2015-05-15 09:00:30 UTC (rev 5105) +++ trunk/OpenMPT/mptrack/Settings.h 2015-05-15 13:14:50 UTC (rev 5106) @@ -472,7 +472,7 @@ class ISettingChanged { public: - virtual void SettingChanged(const SettingPath &path) = 0; + virtual void SettingChanged(const SettingPath &changedPath) = 0; }; enum SettingFlushMode @@ -699,9 +699,9 @@ value = conf.Read<T>(path); return *this; } - void SettingChanged(const SettingPath &path) + void SettingChanged(const SettingPath &changedPath) { - MPT_UNREFERENCED_PARAMETER(path); + MPT_UNREFERENCED_PARAMETER(changedPath); Update(); } template<typename Trhs> CachedSetting & operator += (const Trhs &rhs) { T tmp = *this; tmp += rhs; *this = tmp; return *this; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-15 13:23:30
|
Revision: 5107 http://sourceforge.net/p/modplug/code/5107 Author: manxorist Date: 2015-05-15 13:23:25 +0000 (Fri, 15 May 2015) Log Message: ----------- [Ref] Silence some more VS2015 warnings. Modified Paths: -------------- trunk/OpenMPT/common/version.cpp trunk/OpenMPT/common/version.h trunk/OpenMPT/soundlib/Dither.h Modified: trunk/OpenMPT/common/version.cpp =================================================================== --- trunk/OpenMPT/common/version.cpp 2015-05-15 13:14:50 UTC (rev 5106) +++ trunk/OpenMPT/common/version.cpp 2015-05-15 13:23:25 UTC (rev 5107) @@ -80,19 +80,19 @@ } } -VersionNum RemoveBuildNumber(const VersionNum num) +VersionNum RemoveBuildNumber(const VersionNum num_) { - return (num & 0xFFFFFF00); + return (num_ & 0xFFFFFF00); } -bool IsTestBuild(const VersionNum num) +bool IsTestBuild(const VersionNum num_) { return ( // Legacy - (num > MAKE_VERSION_NUMERIC(1,17,02,54) && num < MAKE_VERSION_NUMERIC(1,18,02,00) && num != MAKE_VERSION_NUMERIC(1,18,00,00)) + (num_ > MAKE_VERSION_NUMERIC(1,17,02,54) && num_ < MAKE_VERSION_NUMERIC(1,18,02,00) && num_ != MAKE_VERSION_NUMERIC(1,18,00,00)) || // Test builds have non-zero VER_MINORMINOR - (num > MAKE_VERSION_NUMERIC(1,18,02,00) && RemoveBuildNumber(num) != num) + (num_ > MAKE_VERSION_NUMERIC(1,18,02,00) && RemoveBuildNumber(num) != num_) ); } Modified: trunk/OpenMPT/common/version.h =================================================================== --- trunk/OpenMPT/common/version.h 2015-05-15 13:14:50 UTC (rev 5106) +++ trunk/OpenMPT/common/version.h 2015-05-15 13:23:25 UTC (rev 5107) @@ -43,10 +43,10 @@ // Return a version without build number (the last number in the version). // The current versioning scheme uses this number only for test builds, and it should be 00 for official builds, // So sometimes it might be wanted to do comparisons without the build number. - VersionNum RemoveBuildNumber(const VersionNum num); + VersionNum RemoveBuildNumber(const VersionNum num_); // Returns true if a given version number is from a test build, false if it's a release build. - bool IsTestBuild(const VersionNum num = MptVersion::num); + bool IsTestBuild(const VersionNum num_ = MptVersion::num); // Return true if this is a debug build with no optimizations bool IsDebugBuild(); Modified: trunk/OpenMPT/soundlib/Dither.h =================================================================== --- trunk/OpenMPT/soundlib/Dither.h 2015-05-15 13:14:50 UTC (rev 5106) +++ trunk/OpenMPT/soundlib/Dither.h 2015-05-15 13:23:25 UTC (rev 5107) @@ -61,7 +61,7 @@ DitherMode mode; public: Dither(); - void SetMode(DitherMode mode); + void SetMode(DitherMode mode_); DitherMode GetMode() const; void Reset(); void Process(int *mixbuffer, std::size_t count, std::size_t channels, int bits); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-15 14:21:59
|
Revision: 5109 http://sourceforge.net/p/modplug/code/5109 Author: manxorist Date: 2015-05-15 14:21:53 +0000 (Fri, 15 May 2015) Log Message: ----------- [Fix] build: For some odd reason, VS2015 install directory has version number 14.0 instead of 13.0. [Fix] Fix syntax error caused by invalid mutable. Spotted by VS2015RC. [Fix] Do not expect unavailable C++14 implicit conversions to be supported. Spotted with VS2015RC. [Fix] Remove unsatisfiable forceinline. Spotted with VS2015RC. [Ref] Silence the most annoying of the remaining variable shadowing warnings with VS2015. [Imp] OpenMPT now builds and runs successfully with VS2015RC. [Ref] build: Ignore VS2015 temporary directory. Modified Paths: -------------- trunk/OpenMPT/build/auto/setup_vs2015.cmd trunk/OpenMPT/common/version.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/Vstplug.h trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h Property Changed: ---------------- trunk/OpenMPT/build/vs2015/ Modified: trunk/OpenMPT/build/auto/setup_vs2015.cmd =================================================================== --- trunk/OpenMPT/build/auto/setup_vs2015.cmd 2015-05-15 13:39:50 UTC (rev 5108) +++ trunk/OpenMPT/build/auto/setup_vs2015.cmd 2015-05-15 14:21:53 UTC (rev 5109) @@ -1,16 +1,16 @@ @echo off -if exist "C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" goto win64 -if exist "C:\Program Files\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" goto win32 +if exist "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" goto win64 +if exist "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" goto win32 goto setupdone :win32 -call "C:\Program Files\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" x86 +call "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 goto setupdone :win64 -call "C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" x86 +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 goto setupdone :setupdone Index: trunk/OpenMPT/build/vs2015 =================================================================== --- trunk/OpenMPT/build/vs2015 2015-05-15 13:39:50 UTC (rev 5108) +++ trunk/OpenMPT/build/vs2015 2015-05-15 14:21:53 UTC (rev 5109) Property changes on: trunk/OpenMPT/build/vs2015 ___________________________________________________________________ Modified: svn:ignore ## -3,3 +3,4 ## *.suo *.user ipch +.vs Modified: trunk/OpenMPT/common/version.cpp =================================================================== --- trunk/OpenMPT/common/version.cpp 2015-05-15 13:39:50 UTC (rev 5108) +++ trunk/OpenMPT/common/version.cpp 2015-05-15 14:21:53 UTC (rev 5109) @@ -320,25 +320,25 @@ std::string GetRevisionString() { - std::string str; + std::string result; if(GetRevision() == 0) { - return str; + return result; } - str = std::string("-r") + mpt::ToString(GetRevision()); + result = std::string("-r") + mpt::ToString(GetRevision()); if(HasMixedRevisions()) { - str += "!"; + result += "!"; } if(IsDirty()) { - str += "+"; + result += "+"; } if(IsPackage()) { - str += "p"; + result += "p"; } - return str; + return result; } std::string GetVersionStringExtended() Modified: trunk/OpenMPT/mptrack/Mptrack.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-15 13:39:50 UTC (rev 5108) +++ trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-15 14:21:53 UTC (rev 5109) @@ -723,7 +723,7 @@ : public IComponentManagerSettings { private: - mutable TrackerSettings &conf; + TrackerSettings &conf; public: ComponentManagerSettings(TrackerSettings &conf) : conf(conf) Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-15 13:39:50 UTC (rev 5108) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-15 14:21:53 UTC (rev 5109) @@ -443,7 +443,7 @@ if(m_BufferLength_DEPRECATED > 1000) m_BufferLength_DEPRECATED = 1000; // 1sec if((m_SoundDeviceID_DEPRECATED & SoundDevice::Legacy::MaskType) == SoundDevice::Legacy::TypeASIO) { - m_LatencyMS = m_BufferLength_DEPRECATED; + m_LatencyMS = m_BufferLength_DEPRECATED * 1; m_UpdateIntervalMS = m_BufferLength_DEPRECATED / 8; } else { Modified: trunk/OpenMPT/mptrack/Vstplug.h =================================================================== --- trunk/OpenMPT/mptrack/Vstplug.h 2015-05-15 13:39:50 UTC (rev 5108) +++ trunk/OpenMPT/mptrack/Vstplug.h 2015-05-15 14:21:53 UTC (rev 5109) @@ -212,8 +212,8 @@ bool ShouldProcessSilence() { return isInstrument() || ((m_Effect.flags & effFlagsNoSoundInStop) == 0 && Dispatch(effGetTailSize, 0, 0, nullptr, 0.0f) != 1); } void ResetSilence() { m_MixState.ResetSilence(); } #ifdef MODPLUG_TRACKER - forceinline CModDoc *GetModDoc(); - forceinline const CModDoc *GetModDoc() const; + CModDoc *GetModDoc(); + const CModDoc *GetModDoc() const; #endif // MODPLUG_TRACKER inline CSoundFile &GetSoundFile() { return m_SndFile; } inline const CSoundFile &GetSoundFile() const { return m_SndFile; } Modified: trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h =================================================================== --- trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h 2015-05-15 13:39:50 UTC (rev 5108) +++ trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h 2015-05-15 14:21:53 UTC (rev 5109) @@ -46,19 +46,19 @@ public: // Allocate input and output buffers - bool Initialize(size_t inputs, size_t outputs) - //-------------------------------------------- + bool Initialize(size_t inputs_, size_t outputs_) + //---------------------------------------------- { // Short cut - we do not need to recreate the buffers. - if(this->inputs == inputs && this->outputs == outputs) + if(inputs == inputs_ && outputs == outputs_) { return true; } Free(); - this->inputs = inputs; - this->outputs = outputs; + inputs = inputs_; + outputs = outputs_; try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-16 11:18:32
|
Revision: 5111 http://sourceforge.net/p/modplug/code/5111 Author: manxorist Date: 2015-05-16 11:18:26 +0000 (Sat, 16 May 2015) Log Message: ----------- [Var] build: Add build/download_externals.cmd script which downloads and builds premake (using the most modern Visual Studio it can find) and downloads and unpacks all other dependencies that we cannot redistribute (ASIO SDK, VST SDK, XMPlay SDK, Winamp SDK). This is a one-click solution. The script requires Windows 7 (uses PowerShell for downloading) and 7-zip installed to the default install path. Modified Paths: -------------- trunk/OpenMPT/build/regenerate_vs_projects.cmd Added Paths: ----------- trunk/OpenMPT/build/download_externals.cmd Property Changed: ---------------- trunk/OpenMPT/build/ trunk/OpenMPT/include/premake/ Index: trunk/OpenMPT/build =================================================================== --- trunk/OpenMPT/build 2015-05-16 06:52:07 UTC (rev 5110) +++ trunk/OpenMPT/build 2015-05-16 11:18:26 UTC (rev 5111) Property changes on: trunk/OpenMPT/build ___________________________________________________________________ Modified: svn:ignore ## -1,2 +1,3 ## +externals lib obj Added: trunk/OpenMPT/build/download_externals.cmd =================================================================== --- trunk/OpenMPT/build/download_externals.cmd (rev 0) +++ trunk/OpenMPT/build/download_externals.cmd 2015-05-16 11:18:26 UTC (rev 5111) @@ -0,0 +1,127 @@ +@echo off + +echo WARNING: This script will unconditionally remove all files from the destination directories. +echo This script requires Windows 7 or later (because of PowerShell). +echo This script requires 7-zip in "C:\Program Files\7-Zip\" (the default path for a native install). +echo When running from a Subversion working copy, this script requires at least Subversion 1.7 (because it removes subdirectories which should not contain .svn metadata). + +pause + +set MY_DIR=%CD% +set BATCH_DIR=%~dp0 +cd %BATCH_DIR% || goto error +cd .. || goto error +goto main + +:download_and_unpack + set MPT_GET_DESTDIR="%~1" + set MPT_GET_URL="%~2" + set MPT_GET_FILE="%~3" + set MPT_GET_SUBDIR="%~4" + if not exist "build\externals\%~3" ( + powershell -Command "(New-Object Net.WebClient).DownloadFile('%MPT_GET_URL%', 'build/externals/%~3')" || exit /B 1 + ) + cd include || exit /B 1 + if exist %MPT_GET_DESTDIR% rmdir /S /Q %MPT_GET_DESTDIR% + if "%~4" == "." ( + mkdir %MPT_GET_DESTDIR% + cd %MPT_GET_DESTDIR% || exit /B 1 + "C:\Program Files\7-Zip\7z.exe" x -y "..\..\build\externals\%~3" || exit /B 1 + cd .. || exit /B 1 + ) + if not "%~4" == "." ( + "C:\Program Files\7-Zip\7z.exe" x -y "..\build\externals\%~3" || exit /B 1 + choice /C y /N /T 2 /D y + move /Y "%~4" %MPT_GET_DESTDIR% || exit /B 1 + ) + cd .. || exit /B 1 +exit /B 0 +goto error + +:main +if not exist "build\externals" mkdir "build\externals" + +rem call :download_and_unpack "premake" "https://downloads.sourceforge.net/project/premake/5.0/premake-5.0-alpha3-windows.zip" "premake-5.0-alpha3-windows.zip" "." || goto error + +call :download_and_unpack "premake" "https://downloads.sourceforge.net/project/premake/5.0/premake-5.0-alpha3-src.zip" "premake-5.0-alpha3-src.zip" "premake-5.0-alpha3" || goto error + +if exist "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2013.cmd || goto error + cd include\premake\build\vs2013 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) +if exist "C:\Program Files\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2013.cmd || goto error + cd include\premake\build\vs2013 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) + +if exist "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2012.cmd || goto error + cd include\premake\build\vs2012 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) +if exist "C:\Program Files\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2012.cmd || goto error + cd include\premake\build\vs2012 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) + +if exist "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2010.cmd || goto error + cd include\premake\build\vs2010 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) +if exist "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2010.cmd || goto error + cd include\premake\build\vs2010 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) + +if exist "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2008.cmd || goto error + cd include\premake\build\vs2008 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) +if exist "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" ( + call build\auto\setup_vs2008.cmd || goto error + cd include\premake\build\vs2008 || goto error + devenv Premake5.sln /build "Release|Win32" || goto error + cd ..\..\..\.. || goto error + goto premakedone +) + +goto error + +:premakedone + +call :download_and_unpack "winamp" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "WA5.55_SDK.exe" "." || goto error +call :download_and_unpack "xmplay" "http://us.un4seen.com/files/xmp-sdk.zip" "xmp-sdk.zip" "." || goto error +call :download_and_unpack "ASIOSDK2" "https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip" "asiosdk2.3.zip" "ASIOSDK2.3" || goto error +call :download_and_unpack "vstsdk2.4" "https://www.steinberg.net/sdk_downloads/vstsdk360_22_11_2013_build_100.zip" "vstsdk360_22_11_2013_build_100.zip" "VST3 SDK" || goto error + +goto ok + +:ok +echo "All OK." +goto end +:error +echo "Error!" +goto end +:end +cd %MY_DIR% +pause Property changes on: trunk/OpenMPT/build/download_externals.cmd ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/x-cmd \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +CRLF \ No newline at end of property Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd =================================================================== --- trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-16 06:52:07 UTC (rev 5110) +++ trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-16 11:18:26 UTC (rev 5111) @@ -7,53 +7,59 @@ cd .. || goto err +set PREMAKE= +if exist "include\premake\premake5.exe" set PREMAKE=include\premake\premake5.exe +if exist "include\premake\bin\release\premake5.exe" set PREMAKE=include\premake\bin\release\premake5.exe + + + echo dofile "build/premake/premake.lua" > premake5.lua || goto err -include\premake\premake5.exe --group=libopenmpt_test vs2008 || goto err -include\premake\premake5.exe --group=libopenmpt vs2008 || goto err -include\premake\premake5.exe --group=openmpt123 vs2008 || goto err -include\premake\premake5.exe --group=PluginBridge vs2008 || goto err -include\premake\premake5.exe --group=OpenMPT vs2008 || goto err -include\premake\premake5.exe --group=all-externals vs2008 || goto err +%PREMAKE% --group=libopenmpt_test vs2008 || goto err +%PREMAKE% --group=libopenmpt vs2008 || goto err +%PREMAKE% --group=openmpt123 vs2008 || goto err +%PREMAKE% --group=PluginBridge vs2008 || goto err +%PREMAKE% --group=OpenMPT vs2008 || goto err +%PREMAKE% --group=all-externals vs2008 || goto err -include\premake\premake5.exe --group=libopenmpt_test vs2010 || goto err -include\premake\premake5.exe --group=foo_openmpt vs2010 || goto err -include\premake\premake5.exe --group=in_openmpt vs2010 || goto err -include\premake\premake5.exe --group=xmp-openmpt vs2010 || goto err -include\premake\premake5.exe --group=libopenmpt vs2010 || goto err -include\premake\premake5.exe --group=openmpt123 vs2010 || goto err -include\premake\premake5.exe --group=PluginBridge vs2010 || goto err -include\premake\premake5.exe --group=OpenMPT vs2010 || goto err -include\premake\premake5.exe --group=all-externals vs2010 || goto err +%PREMAKE% --group=libopenmpt_test vs2010 || goto err +%PREMAKE% --group=foo_openmpt vs2010 || goto err +%PREMAKE% --group=in_openmpt vs2010 || goto err +%PREMAKE% --group=xmp-openmpt vs2010 || goto err +%PREMAKE% --group=libopenmpt vs2010 || goto err +%PREMAKE% --group=openmpt123 vs2010 || goto err +%PREMAKE% --group=PluginBridge vs2010 || goto err +%PREMAKE% --group=OpenMPT vs2010 || goto err +%PREMAKE% --group=all-externals vs2010 || goto err -include\premake\premake5.exe --group=libopenmpt_test vs2012 || goto err -include\premake\premake5.exe --group=in_openmpt vs2012 || goto err -include\premake\premake5.exe --group=xmp-openmpt vs2012 || goto err -include\premake\premake5.exe --group=libopenmpt vs2012 || goto err -include\premake\premake5.exe --group=openmpt123 vs2012 || goto err -include\premake\premake5.exe --group=PluginBridge vs2012 || goto err -include\premake\premake5.exe --group=OpenMPT vs2012 || goto err -include\premake\premake5.exe --group=all-externals vs2012 || goto err +%PREMAKE% --group=libopenmpt_test vs2012 || goto err +%PREMAKE% --group=in_openmpt vs2012 || goto err +%PREMAKE% --group=xmp-openmpt vs2012 || goto err +%PREMAKE% --group=libopenmpt vs2012 || goto err +%PREMAKE% --group=openmpt123 vs2012 || goto err +%PREMAKE% --group=PluginBridge vs2012 || goto err +%PREMAKE% --group=OpenMPT vs2012 || goto err +%PREMAKE% --group=all-externals vs2012 || goto err -include\premake\premake5.exe --group=libopenmpt_test vs2013 || goto err -include\premake\premake5.exe --group=in_openmpt vs2013 || goto err -include\premake\premake5.exe --group=xmp-openmpt vs2013 || goto err -include\premake\premake5.exe --group=libopenmpt vs2013 || goto err -include\premake\premake5.exe --group=openmpt123 vs2013 || goto err -include\premake\premake5.exe --group=PluginBridge vs2013 || goto err -include\premake\premake5.exe --group=OpenMPT vs2013 || goto err -include\premake\premake5.exe --group=all-externals vs2013 || goto err +%PREMAKE% --group=libopenmpt_test vs2013 || goto err +%PREMAKE% --group=in_openmpt vs2013 || goto err +%PREMAKE% --group=xmp-openmpt vs2013 || goto err +%PREMAKE% --group=libopenmpt vs2013 || goto err +%PREMAKE% --group=openmpt123 vs2013 || goto err +%PREMAKE% --group=PluginBridge vs2013 || goto err +%PREMAKE% --group=OpenMPT vs2013 || goto err +%PREMAKE% --group=all-externals vs2013 || goto err -include\premake\premake5.exe --group=libopenmpt_test vs2015 || goto err -include\premake\premake5.exe --group=in_openmpt vs2015 || goto err -include\premake\premake5.exe --group=xmp-openmpt vs2015 || goto err -include\premake\premake5.exe --group=libopenmpt vs2015 || goto err -include\premake\premake5.exe --group=openmpt123 vs2015 || goto err -include\premake\premake5.exe --group=PluginBridge vs2015 || goto err -include\premake\premake5.exe --group=OpenMPT vs2015 || goto err -include\premake\premake5.exe --group=all-externals vs2015 || goto err +%PREMAKE% --group=libopenmpt_test vs2015 || goto err +%PREMAKE% --group=in_openmpt vs2015 || goto err +%PREMAKE% --group=xmp-openmpt vs2015 || goto err +%PREMAKE% --group=libopenmpt vs2015 || goto err +%PREMAKE% --group=openmpt123 vs2015 || goto err +%PREMAKE% --group=PluginBridge vs2015 || goto err +%PREMAKE% --group=OpenMPT vs2015 || goto err +%PREMAKE% --group=all-externals vs2015 || goto err -include\premake\premake5.exe postprocess || goto err +%PREMAKE% postprocess || goto err del premake5.lua || goto err Index: trunk/OpenMPT/include/premake =================================================================== --- trunk/OpenMPT/include/premake 2015-05-16 06:52:07 UTC (rev 5110) +++ trunk/OpenMPT/include/premake 2015-05-16 11:18:26 UTC (rev 5111) Property changes on: trunk/OpenMPT/include/premake ___________________________________________________________________ Modified: svn:ignore ## -1 +1 ## -premake5.exe +* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-19 10:34:57
|
Revision: 5121 http://sourceforge.net/p/modplug/code/5121 Author: manxorist Date: 2015-05-19 10:34:45 +0000 (Tue, 19 May 2015) Log Message: ----------- [Ref] sounddev: Merge Settings::Channels and Settings::ChannelMapping. Standard channel layout is just a special case of a ChannelMapping. [Mod] OpenMPT: Version is now 1.25.00.06 Modified Paths: -------------- trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/mptrack/Mpdlgs.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/sounddev/SoundDevice.cpp trunk/OpenMPT/sounddev/SoundDevice.h trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp Modified: trunk/OpenMPT/common/versionNumber.h =================================================================== --- trunk/OpenMPT/common/versionNumber.h 2015-05-18 21:37:26 UTC (rev 5120) +++ trunk/OpenMPT/common/versionNumber.h 2015-05-19 10:34:45 UTC (rev 5121) @@ -19,7 +19,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 25 #define VER_MINOR 00 -#define VER_MINORMINOR 05 +#define VER_MINORMINOR 06 //Version string. For example "1.17.02.28" #define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR) Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-05-18 21:37:26 UTC (rev 5120) +++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-05-19 10:34:45 UTC (rev 5121) @@ -574,10 +574,10 @@ } } int usedChannels = static_cast<int>(m_CbnChannels.GetItemData(m_CbnChannels.GetCurSel())); - if(m_Settings.ChannelMapping.GetNumHostChannels() != static_cast<uint32>(usedChannels)) + if(m_Settings.Channels.GetNumHostChannels() != static_cast<uint32>(usedChannels)) { // If the channel mapping is not valid for the selected number of channels, reset it to default identity mapping. - m_Settings.ChannelMapping = SoundDevice::ChannelMapping(); + m_Settings.Channels = SoundDevice::ChannelMapping(usedChannels); } GetDlgItem(IDC_STATIC_CHANNELMAPPING)->EnableWindow(m_CurrentDeviceCaps.CanChannelMapping ? TRUE : FALSE); for(int mch = 0; mch < NUM_CHANNELCOMBOBOXES; mch++) // Host channels @@ -597,7 +597,7 @@ { const int pos = (int)::SendMessageW(combo->m_hWnd, CB_ADDSTRING, 0, (LPARAM)m_CurrentDeviceDynamicCaps.channelNames[dch].c_str()); combo->SetItemData(pos, (DWORD_PTR)dch); - if(static_cast<int32>(dch) == m_Settings.ChannelMapping.ToDevice(mch)) + if(static_cast<int32>(dch) == m_Settings.Channels.ToDevice(mch)) { combo->SetCurSel(pos); } @@ -822,7 +822,7 @@ // Channels { DWORD_PTR n = m_CbnChannels.GetItemData(m_CbnChannels.GetCurSel()); - m_Settings.Channels = static_cast<uint8>(n); + m_Settings.Channels = n; if((m_Settings.Channels != 1) && (m_Settings.Channels != 4)) { m_Settings.Channels = 2; @@ -869,10 +869,7 @@ CComboBox *combo = &m_CbnChannelMapping[mch]; channels[mch] = static_cast<int32>(combo->GetItemData(combo->GetCurSel())); } - m_Settings.ChannelMapping = SoundDevice::ChannelMapping(channels); - } else - { - m_Settings.ChannelMapping = SoundDevice::ChannelMapping(); + m_Settings.Channels = channels; } } CMainFrame::GetMainFrame()->SetupSoundCard(m_Settings, m_CurrentDeviceInfo.GetIdentifier(), (SoundDeviceStopMode)m_CbnStoppedMode.GetCurSel()); Modified: trunk/OpenMPT/mptrack/Mptrack.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-18 21:37:26 UTC (rev 5120) +++ trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-19 10:34:45 UTC (rev 5121) @@ -1032,7 +1032,7 @@ m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"SampleRate", m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"SampleRate", defaults.Samplerate)); m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"Channels", - m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"Channels", defaults.Channels)); + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"Channels", defaults.Channels.GetNumHostChannels())); m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"SampleFormat", m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"SampleFormat", defaults.sampleFormat)); m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"ExclusiveMode", @@ -1046,7 +1046,7 @@ m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"DitherType", m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"DitherType", defaults.DitherType)); m_pSettings->Write(L"Sound Settings", mpt::ToWide(newIdentifier) + L"_" + L"ChannelMapping", - m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"ChannelMapping", defaults.ChannelMapping)); + m_pSettings->Read(L"Sound Settings", mpt::ToWide(oldIdentifier) + L"_" + L"ChannelMapping", defaults.Channels)); } } } Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp =================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-18 21:37:26 UTC (rev 5120) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-19 10:34:45 UTC (rev 5121) @@ -434,7 +434,7 @@ Setting<bool> m_SoundDeviceExclusiveMode(conf, "Sound Settings", "ExclusiveMode", SoundDevice::Settings().ExclusiveMode); Setting<bool> m_SoundDeviceBoostThreadPriority(conf, "Sound Settings", "BoostThreadPriority", SoundDevice::Settings().BoostThreadPriority); Setting<bool> m_SoundDeviceUseHardwareTiming(conf, "Sound Settings", "UseHardwareTiming", SoundDevice::Settings().UseHardwareTiming); - Setting<SoundDevice::ChannelMapping> m_SoundDeviceChannelMapping(conf, "Sound Settings", "ChannelMapping", SoundDevice::Settings().ChannelMapping); + Setting<SoundDevice::ChannelMapping> m_SoundDeviceChannelMapping(conf, "Sound Settings", "ChannelMapping", SoundDevice::Settings().Channels); if(storedVersion < MAKE_VERSION_NUMERIC(1,21,01,26)) { if(m_BufferLength_DEPRECATED != 0) @@ -469,17 +469,15 @@ m_SoundDeviceSettingsDefaults.Latency = m_LatencyMS / 1000.0; m_SoundDeviceSettingsDefaults.UpdateInterval = m_UpdateIntervalMS / 1000.0; m_SoundDeviceSettingsDefaults.Samplerate = MixerSamplerate; - m_SoundDeviceSettingsDefaults.Channels = (uint8)MixerOutputChannels; + if(m_SoundDeviceSettingsDefaults.Channels.GetNumHostChannels() != MixerOutputChannels) + { + // reset invalid channel mapping to default + m_SoundDeviceSettingsDefaults.Channels = SoundDevice::ChannelMapping(MixerOutputChannels); + } m_SoundDeviceSettingsDefaults.sampleFormat = m_SampleFormat; m_SoundDeviceSettingsDefaults.ExclusiveMode = m_SoundDeviceExclusiveMode; m_SoundDeviceSettingsDefaults.BoostThreadPriority = m_SoundDeviceBoostThreadPriority; m_SoundDeviceSettingsDefaults.UseHardwareTiming = m_SoundDeviceUseHardwareTiming; - m_SoundDeviceSettingsDefaults.ChannelMapping = m_SoundDeviceChannelMapping; - if(m_SoundDeviceSettingsDefaults.ChannelMapping.GetNumHostChannels() != m_SoundDeviceSettingsDefaults.Channels) - { - // reset invalid channel mapping to default - m_SoundDeviceSettingsDefaults.ChannelMapping = SoundDevice::ChannelMapping(m_SoundDeviceSettingsDefaults.Channels); - } m_SoundDeviceSettingsUseOldDefaults = true; } if(storedVersion < MAKE_VERSION_NUMERIC(1,25,00,04)) @@ -612,19 +610,19 @@ SettingsContainer &conf; const SoundDevice::Info deviceInfo; -public: +private: Setting<uint32> LatencyUS; Setting<uint32> UpdateIntervalUS; Setting<uint32> Samplerate; - Setting<uint8> Channels; + Setting<uint8> ChannelsOld; // compatibility with older versions + Setting<SoundDevice::ChannelMapping> ChannelMapping; Setting<SampleFormat> sampleFormat; Setting<bool> ExclusiveMode; Setting<bool> BoostThreadPriority; Setting<bool> KeepDeviceRunning; Setting<bool> UseHardwareTiming; Setting<int> DitherType; - Setting<SoundDevice::ChannelMapping> ChannelMapping; public: @@ -634,19 +632,20 @@ , LatencyUS(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"Latency", Util::Round<int32>(defaults.Latency * 1000000.0)) , UpdateIntervalUS(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"UpdateInterval", Util::Round<int32>(defaults.UpdateInterval * 1000000.0)) , Samplerate(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"SampleRate", defaults.Samplerate) - , Channels(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"Channels", defaults.Channels) + , ChannelsOld(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"Channels", mpt::saturate_cast<uint8>((int)defaults.Channels)) + , ChannelMapping(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"ChannelMapping", defaults.Channels) , sampleFormat(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"SampleFormat", defaults.sampleFormat) , ExclusiveMode(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"ExclusiveMode", defaults.ExclusiveMode) , BoostThreadPriority(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"BoostThreadPriority", defaults.BoostThreadPriority) , KeepDeviceRunning(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"KeepDeviceRunning", defaults.KeepDeviceRunning) , UseHardwareTiming(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"UseHardwareTiming", defaults.UseHardwareTiming) , DitherType(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"DitherType", defaults.DitherType) - , ChannelMapping(conf, L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"ChannelMapping", defaults.ChannelMapping) { - if(ChannelMapping.Get().GetNumHostChannels() != Channels) + if(ChannelMapping.Get().GetNumHostChannels() != ChannelsOld) { - // reset invalid chanel mapping to default - ChannelMapping = SoundDevice::ChannelMapping(Channels); + // If the stored channel count and the count of channels used in the channel mapping do not match, + // construct a default mapping from the channel count. + ChannelMapping = SoundDevice::ChannelMapping(ChannelsOld); } // store informational data (not read back, just to allow the user to mock with the raw ini file) conf.Write(L"Sound Settings", mpt::ToWide(deviceInfo.GetIdentifier()) + L"_" + L"Type", deviceInfo.type); @@ -660,14 +659,14 @@ LatencyUS = Util::Round<int32>(settings.Latency * 1000000.0); UpdateIntervalUS = Util::Round<int32>(settings.UpdateInterval * 1000000.0); Samplerate = settings.Samplerate; - Channels = settings.Channels; + ChannelsOld = mpt::saturate_cast<uint8>((int)settings.Channels); + ChannelMapping = settings.Channels; sampleFormat = settings.sampleFormat; ExclusiveMode = settings.ExclusiveMode; BoostThreadPriority = settings.BoostThreadPriority; KeepDeviceRunning = settings.KeepDeviceRunning; UseHardwareTiming = settings.UseHardwareTiming; DitherType = settings.DitherType; - ChannelMapping = settings.ChannelMapping; return *this; } @@ -677,14 +676,13 @@ settings.Latency = LatencyUS / 1000000.0; settings.UpdateInterval = UpdateIntervalUS / 1000000.0; settings.Samplerate = Samplerate; - settings.Channels = Channels; + settings.Channels = ChannelMapping; settings.sampleFormat = sampleFormat; settings.ExclusiveMode = ExclusiveMode; settings.BoostThreadPriority = BoostThreadPriority; settings.KeepDeviceRunning = KeepDeviceRunning; settings.UseHardwareTiming = UseHardwareTiming; settings.DitherType = DitherType; - settings.ChannelMapping = ChannelMapping; return settings; } Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-05-18 21:37:26 UTC (rev 5120) +++ trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-05-19 10:34:45 UTC (rev 5121) @@ -25,13 +25,6 @@ namespace SoundDevice { -ChannelMapping::ChannelMapping() -//------------------------------ -{ - return; -} - - ChannelMapping::ChannelMapping(uint32 numHostChannels) //---------------------------------------------------- { @@ -172,21 +165,6 @@ if(m_Settings.UpdateInterval == 0.0) m_Settings.UpdateInterval = m_Caps.DefaultSettings.UpdateInterval; m_Settings.Latency = Clamp(m_Settings.Latency, m_Caps.LatencyMin, m_Caps.LatencyMax); m_Settings.UpdateInterval = Clamp(m_Settings.UpdateInterval, m_Caps.UpdateIntervalMin, m_Caps.UpdateIntervalMax); - if(m_Caps.CanChannelMapping) - { - if(m_Settings.ChannelMapping.GetNumHostChannels() == 0) - { - // default mapping - m_Settings.ChannelMapping = SoundDevice::ChannelMapping(m_Settings.Channels); - } - if(m_Settings.ChannelMapping.GetNumHostChannels() != m_Settings.Channels) - { - return false; - } - } else - { - m_Settings.ChannelMapping = SoundDevice::ChannelMapping(m_Settings.Channels); - } m_Flags = SoundDevice::Flags(); m_DeviceUnavailableOnOpen = false; m_RequestFlags.store(0); Modified: trunk/OpenMPT/sounddev/SoundDevice.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-18 21:37:26 UTC (rev 5120) +++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-19 10:34:45 UTC (rev 5121) @@ -170,11 +170,8 @@ public: - // Construct default empty mapping - ChannelMapping(); - // Construct default identity mapping - ChannelMapping(uint32 numHostChannels); + ChannelMapping(uint32 numHostChannels = 2); // Construct mapping from given vector. // Silently fall back to identity mapping if mapping is invalid. @@ -190,6 +187,16 @@ public: + operator int () const + { + return GetNumHostChannels(); + } + + ChannelMapping & operator = (int channels) + { + return (*this = ChannelMapping(channels)); + } + bool operator == (const SoundDevice::ChannelMapping &cmp) const { return (ChannelToDeviceChannel == cmp.ChannelToDeviceChannel); @@ -258,14 +265,13 @@ double Latency; // seconds double UpdateInterval; // seconds uint32 Samplerate; - uint8 Channels; + SoundDevice::ChannelMapping Channels; SampleFormat sampleFormat; bool ExclusiveMode; // Use hardware buffers directly bool BoostThreadPriority; // Boost thread priority for glitch-free audio rendering bool KeepDeviceRunning; bool UseHardwareTiming; int DitherType; - SoundDevice::ChannelMapping ChannelMapping; Settings() : Latency(0.1) , UpdateInterval(0.005) @@ -292,7 +298,6 @@ && BoostThreadPriority == cmp.BoostThreadPriority && KeepDeviceRunning == cmp.KeepDeviceRunning && UseHardwareTiming == cmp.UseHardwareTiming - && ChannelMapping == cmp.ChannelMapping && DitherType == cmp.DitherType ; } Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-18 21:37:26 UTC (rev 5120) +++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-19 10:34:45 UTC (rev 5121) @@ -284,7 +284,7 @@ { throw ASIOException("Not enough output channels."); } - if(m_Settings.ChannelMapping.GetRequiredDeviceChannels() > outputChannels) + if(m_Settings.Channels.GetRequiredDeviceChannels() > outputChannels) { throw ASIOException("Channel mapping requires more channels than available."); } @@ -365,7 +365,7 @@ { MemsetZero(m_BufferInfo[channel]); m_BufferInfo[channel].isInput = ASIOFalse; - m_BufferInfo[channel].channelNum = m_Settings.ChannelMapping.ToDevice(channel); + m_BufferInfo[channel].channelNum = m_Settings.Channels.ToDevice(channel); } m_Callbacks.bufferSwitch = CallbackBufferSwitch; m_Callbacks.sampleRateDidChange = CallbackSampleRateDidChange; @@ -382,13 +382,13 @@ { MemsetZero(m_ChannelInfo[channel]); m_ChannelInfo[channel].isInput = ASIOFalse; - m_ChannelInfo[channel].channel = m_Settings.ChannelMapping.ToDevice(channel); + m_ChannelInfo[channel].channel = m_Settings.Channels.ToDevice(channel); asioCall(getChannelInfo(&m_ChannelInfo[channel])); MPT_ASSERT(m_ChannelInfo[channel].isActive); mpt::String::SetNullTerminator(m_ChannelInfo[channel].name); Log(mpt::String::Print("ASIO: getChannelInfo(isInput=%1 channel=%2) => isActive=%3 channelGroup=%4 type=%5 name='%6'" , ASIOFalse - , m_Settings.ChannelMapping.ToDevice(channel) + , m_Settings.Channels.ToDevice(channel) , m_ChannelInfo[channel].isActive , m_ChannelInfo[channel].channelGroup , m_ChannelInfo[channel].type This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-20 21:07:31
|
Revision: 5127 http://sourceforge.net/p/modplug/code/5127 Author: manxorist Date: 2015-05-20 21:07:25 +0000 (Wed, 20 May 2015) Log Message: ----------- [Ref] Provide negated versions of the version test functions in mpt::Windows::Version. [Ref] Make mpt::Windows::Version available in non-Windows builds and just return false for every query there. This works the same way our compiler version test macros work. It simplifies cases in which a simple flag must be different on some specific versions of Windows. We can safe a whole #if MPT_OS_WINDOWS preprocessor test in this case which will provide better code readability. Modified Paths: -------------- trunk/OpenMPT/common/misc_util.cpp trunk/OpenMPT/common/misc_util.h trunk/OpenMPT/mptrack/CImageListEx.cpp trunk/OpenMPT/sounddev/SoundDeviceManager.cpp Modified: trunk/OpenMPT/common/misc_util.cpp =================================================================== --- trunk/OpenMPT/common/misc_util.cpp 2015-05-20 21:00:28 UTC (rev 5126) +++ trunk/OpenMPT/common/misc_util.cpp 2015-05-20 21:07:25 UTC (rev 5127) @@ -800,6 +800,13 @@ } +bool IsBefore(mpt::Windows::Version::Number version) +//-------------------------------------------------- +{ + return (SystemVersion < (uint32)version); +} + + bool IsAtLeast(mpt::Windows::Version::Number version) //--------------------------------------------------- { @@ -807,6 +814,13 @@ } +bool Is9x() +//--------- +{ + return !SystemIsNT; +} + + bool IsNT() //--------- { @@ -814,6 +828,13 @@ } +bool IsOriginal() +//--------------- +{ + return !SystemIsWine; +} + + bool IsWine() //----------- { @@ -824,6 +845,18 @@ #else // !MODPLUG_TRACKER +bool IsBefore(mpt::Windows::Version::Number version) +//-------------------------------------------------- +{ + OSVERSIONINFOEXW versioninfoex; + MemsetZero(versioninfoex); + versioninfoex.dwOSVersionInfoSize = sizeof(versioninfoex); + GetVersionExW((LPOSVERSIONINFOW)&versioninfoex); + uint32 SystemVersion = ((uint32)mpt::saturate_cast<uint8>(versioninfoex.dwMajorVersion) << 8) | ((uint32)mpt::saturate_cast<uint8>(versioninfoex.dwMinorVersion) << 0); + return (SystemVersion < (uint32)version); +} + + bool IsAtLeast(mpt::Windows::Version::Number version) //--------------------------------------------------- { Modified: trunk/OpenMPT/common/misc_util.h =================================================================== --- trunk/OpenMPT/common/misc_util.h 2015-05-20 21:00:28 UTC (rev 5126) +++ trunk/OpenMPT/common/misc_util.h 2015-05-20 21:07:25 UTC (rev 5127) @@ -877,8 +877,6 @@ } // namespace Util -#if MPT_OS_WINDOWS - namespace mpt { namespace Windows @@ -908,29 +906,68 @@ #if defined(MODPLUG_TRACKER) +#if MPT_OS_WINDOWS + // Initializes version information. // Version information is cached in order to be safely available in audio real-time contexts. // Checking version information (especially detecting Wine) can be slow. void Init(); +static inline bool IsWindows() { return true; } + +bool IsBefore(mpt::Windows::Version::Number version); bool IsAtLeast(mpt::Windows::Version::Number version); + +bool Is9x(); bool IsNT(); + +bool IsOriginal(); bool IsWine(); +#else // !MPT_OS_WINDOWS + +static inline void Init() { return; } + +static inline bool IsWindows() { return false; } + +static inline bool IsBefore(mpt::Windows::Version::Number /* version */ ) { return false; } +static inline bool IsAtLeast(mpt::Windows::Version::Number /* version */ ) { return false; } + +static inline bool Is9x() { return false; } +static inline bool IsNT() { return false; } + +static inline bool IsOriginal() { return false; } +static inline bool IsWine() { return false; } + +#endif // MPT_OS_WINDOWS + #else // !MODPLUG_TRACKER +#if MPT_OS_WINDOWS + +static inline bool IsWindows() { return true; } + +bool IsBefore(mpt::Windows::Version::Number version); bool IsAtLeast(mpt::Windows::Version::Number version); +#else // !MPT_OS_WINDOWS + +static inline bool IsWindows() { return false; } + +static inline bool IsBefore(mpt::Windows::Version::Number /* version */ ) { return false; } +static inline bool IsAtLeast(mpt::Windows::Version::Number /* version */ ) { return false; } + +#endif // MPT_OS_WINDOWS + #endif // MODPLUG_TRACKER + } // namespace Version } // namespace Windows } // namespace mpt -#endif // MPT_OS_WINDOWS - #if defined(MPT_WITH_DYNBIND) namespace mpt Modified: trunk/OpenMPT/mptrack/CImageListEx.cpp =================================================================== --- trunk/OpenMPT/mptrack/CImageListEx.cpp 2015-05-20 21:00:28 UTC (rev 5126) +++ trunk/OpenMPT/mptrack/CImageListEx.cpp 2015-05-20 21:07:25 UTC (rev 5127) @@ -45,7 +45,7 @@ // Icons with alpha transparency screw up in Windows 2000 and older as well as Wine 1.4 and older. // They all support 1-bit transparency, though, so we pre-multiply all pixels with the default button face colour and create a transparency mask. // Additionally, since we create a bitmap that fits the device's bit depth, we apply this fix when using a bit depth that doesn't have an alpha channel. - if(!mpt::Windows::Version::IsAtLeast(mpt::Windows::Version::WinXP) + if(mpt::Windows::Version::IsBefore(mpt::Windows::Version::WinXP) || mpt::Windows::Version::IsWine() || GetDeviceCaps(dc->GetSafeHdc(), BITSPIXEL) * GetDeviceCaps(dc->GetSafeHdc(), PLANES) < 32) { Modified: trunk/OpenMPT/sounddev/SoundDeviceManager.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-20 21:00:28 UTC (rev 5126) +++ trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-20 21:07:25 UTC (rev 5127) @@ -96,7 +96,7 @@ typePriorities[SoundDevice::TypePORTAUDIO_DS] = 18; typePriorities[SoundDevice::TypeASIO] = 10; typePriorities[SoundDevice::TypePORTAUDIO_WDMKS] = -1; - } else if(!mpt::Windows::Version::IsNT()) + } else if(mpt::Windows::Version::Is9x()) { // Win9x typePriorities[SoundDevice::TypeWAVEOUT] = 29; typePriorities[SoundDevice::TypeDSOUND] = 28; @@ -105,7 +105,7 @@ typePriorities[SoundDevice::TypeASIO] = 1; typePriorities[SoundDevice::TypePORTAUDIO_WDMKS] = -1; typePriorities[SoundDevice::TypePORTAUDIO_WASAPI] = -2; - } else if(!mpt::Windows::Version::IsAtLeast(mpt::Windows::Version::WinVista)) + } else if(mpt::Windows::Version::IsBefore(mpt::Windows::Version::WinVista)) { // WinXP typePriorities[SoundDevice::TypeWAVEOUT] = 29; typePriorities[SoundDevice::TypeASIO] = 28; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-21 08:28:24
|
Revision: 5128 http://sourceforge.net/p/modplug/code/5128 Author: manxorist Date: 2015-05-21 08:28:13 +0000 (Thu, 21 May 2015) Log Message: ----------- [Ref] sounddev: Simplify device enumeration and construction. [Ref] sounddev: Clearup the algorithm in Manager::FindDeviceInfoBestMatch. Modified Paths: -------------- trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/sounddev/SoundDeviceManager.cpp trunk/OpenMPT/sounddev/SoundDeviceManager.h Modified: trunk/OpenMPT/mptrack/MainFrm.cpp =================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp 2015-05-20 21:07:25 UTC (rev 5127) +++ trunk/OpenMPT/mptrack/MainFrm.cpp 2015-05-21 08:28:13 UTC (rev 5128) @@ -240,7 +240,6 @@ SoundDevice::Identifier dev = TrackerSettings::Instance().GetSoundDeviceIdentifier(); if(!theApp.GetSoundDevicesManager()->FindDeviceInfo(dev).IsValid()) { - // Fall back to default WaveOut device dev = theApp.GetSoundDevicesManager()->FindDeviceInfoBestMatch(dev, TrackerSettings::Instance().m_SoundDevicePreferSameTypeIfDeviceUnavailable).GetIdentifier(); TrackerSettings::Instance().SetSoundDeviceIdentifier(dev); } Modified: trunk/OpenMPT/sounddev/SoundDeviceManager.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-20 21:07:25 UTC (rev 5127) +++ trunk/OpenMPT/sounddev/SoundDeviceManager.cpp 2015-05-21 08:28:13 UTC (rev 5128) @@ -41,11 +41,37 @@ }; +template <typename Tdevice> +void Manager::EnumerateDevices() +//------------------------------ +{ + const std::vector<SoundDevice::Info> infos = Tdevice::EnumerateDevices(); + m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); + for(std::vector<SoundDevice::Info>::const_iterator it = infos.begin(); it != infos.end(); ++it) + { + SoundDevice::Identifier identifier = it->GetIdentifier(); + if(!identifier.empty()) + { + m_DeviceFactoryMethods[identifier] = ConstructSoundDevice<Tdevice>; + } + } +} + + +template <typename Tdevice> +SoundDevice::IBase* Manager::ConstructSoundDevice(const SoundDevice::Info &info) +//------------------------------------------------------------------------------ +{ + return new Tdevice(info); +} + + void Manager::ReEnumerate() //------------------------- { m_SoundDevices.clear(); m_DeviceUnavailable.clear(); + m_DeviceFactoryMethods.clear(); m_DeviceCaps.clear(); m_DeviceDynamicCaps.clear(); @@ -58,31 +84,28 @@ if(IsComponentAvailable(m_WaveOut)) { - const std::vector<SoundDevice::Info> infos = CWaveDevice::EnumerateDevices(); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); + EnumerateDevices<CWaveDevice>(); } + +#ifndef NO_DSOUND // kind of deprecated by now -#ifndef NO_DSOUND if(IsComponentAvailable(m_DirectSound)) { - const std::vector<SoundDevice::Info> infos = CDSoundDevice::EnumerateDevices(); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); + EnumerateDevices<CDSoundDevice>(); } #endif // NO_DSOUND #ifndef NO_ASIO if(IsComponentAvailable(m_ASIO)) { - const std::vector<SoundDevice::Info> infos = CASIODevice::EnumerateDevices(); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); + EnumerateDevices<CASIODevice>(); } #endif // NO_ASIO #ifndef NO_PORTAUDIO if(IsComponentAvailable(m_PortAudio)) { - const std::vector<SoundDevice::Info> infos = CPortaudioDevice::EnumerateDevices(); - m_SoundDevices.insert(m_SoundDevices.end(), infos.begin(), infos.end()); + EnumerateDevices<CPortaudioDevice>(); } #endif // NO_PORTAUDIO @@ -129,11 +152,11 @@ Log(LogDebug, MPT_USTRING("Sound Devices enumerated:")); for(std::size_t i = 0; i < m_SoundDevices.size(); ++i) { - Log(LogDebug, mpt::String::Print(MPT_USTRING(" Identifier : %1") , m_SoundDevices[i].GetIdentifier())); - Log(LogDebug, mpt::String::Print(MPT_USTRING(" Type : %1") , m_SoundDevices[i].type)); - Log(LogDebug, mpt::String::Print(MPT_USTRING(" InternalID: %1") , m_SoundDevices[i].internalID)); - Log(LogDebug, mpt::String::Print(MPT_USTRING(" API Name : %1") , m_SoundDevices[i].apiName)); - Log(LogDebug, mpt::String::Print(MPT_USTRING(" Name : %1") , m_SoundDevices[i].name)); + Log(LogDebug, mpt::String::Print(MPT_USTRING(" Identifier : %1"), m_SoundDevices[i].GetIdentifier())); + Log(LogDebug, mpt::String::Print(MPT_USTRING(" Type : %1"), m_SoundDevices[i].type)); + Log(LogDebug, mpt::String::Print(MPT_USTRING(" InternalID: %1"), m_SoundDevices[i].internalID)); + Log(LogDebug, mpt::String::Print(MPT_USTRING(" API Name : %1"), m_SoundDevices[i].apiName)); + Log(LogDebug, mpt::String::Print(MPT_USTRING(" Name : %1"), m_SoundDevices[i].name)); } } @@ -205,41 +228,41 @@ { return SoundDevice::Info(); } - if(identifier.empty()) - { - return *begin(); - } - for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) - { - if((it->GetIdentifier() == identifier) && !IsDeviceUnavailable(it->GetIdentifier())) - { // exact match - return *it; - } - } - const SoundDevice::Type type = ParseType(identifier); - if(type == TypePORTAUDIO_WASAPI) - { - // WASAPI devices might change names if a different connector jack is used. - // In order to avoid defaulting to wave mapper in that case, - // just find the first WASAPI device. + if(!identifier.empty()) + { // valid identifier for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) { - if((it->type == TypePORTAUDIO_WASAPI) && !IsDeviceUnavailable(it->GetIdentifier())) - { + if((it->GetIdentifier() == identifier) && !IsDeviceUnavailable(it->GetIdentifier())) + { // exact match return *it; } } - } - if(preferSameType) - { - for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) + const SoundDevice::Type type = ParseType(identifier); + if(type == TypePORTAUDIO_WASAPI) { - if((it->type == type) && !IsDeviceUnavailable(it->GetIdentifier())) + // WASAPI devices might change names if a different connector jack is used. + // In order to avoid defaulting to wave mapper in that case, + // just find the first WASAPI device. + preferSameType = true; + } + if(preferSameType) + { // find first avilable device of given type + for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) { - return *it; + if((it->type == type) && !IsDeviceUnavailable(it->GetIdentifier())) + { + return *it; + } } } } + for(std::vector<SoundDevice::Info>::const_iterator it = begin(); it != end(); ++it) + { // find first available device + if(!IsDeviceUnavailable(it->GetIdentifier())) + { + return *it; + } + } // default to first device return *begin(); } @@ -333,24 +356,15 @@ { return nullptr; } - SoundDevice::IBase *result = nullptr; - if(info.type.empty()) { result = nullptr; } - if(info.type == TypeWAVEOUT) { result = new CWaveDevice(info); } -#ifndef NO_DSOUND - if(info.type == TypeDSOUND) { result = new CDSoundDevice(info); } -#endif // NO_DSOUND -#ifndef NO_ASIO - if(info.type == TypeASIO) { result = new CASIODevice(info); } -#endif // NO_ASIO -#ifndef NO_PORTAUDIO - if(IsComponentAvailable(m_PortAudio)) + if(m_DeviceFactoryMethods.find(identifier) == m_DeviceFactoryMethods.end()) { - if(info.type == TypePORTAUDIO_WASAPI) { result = new CPortaudioDevice(info); } - if(info.type == TypePORTAUDIO_WDMKS) { result = new CPortaudioDevice(info); } - if(info.type == TypePORTAUDIO_WMME) { result = new CPortaudioDevice(info); } - if(info.type == TypePORTAUDIO_DS) { result = new CPortaudioDevice(info); } + return nullptr; } -#endif // NO_PORTAUDIO + if(!m_DeviceFactoryMethods[identifier]) + { + return nullptr; + } + SoundDevice::IBase *result = m_DeviceFactoryMethods[identifier](info); if(!result) { return nullptr; Modified: trunk/OpenMPT/sounddev/SoundDeviceManager.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceManager.h 2015-05-20 21:07:25 UTC (rev 5127) +++ trunk/OpenMPT/sounddev/SoundDeviceManager.h 2015-05-21 08:28:13 UTC (rev 5128) @@ -42,6 +42,10 @@ private: + typedef SoundDevice::IBase* (*CreateSoundDeviceFunc)(const SoundDevice::Info &info); + +private: + const SoundDevice::AppInfo m_AppInfo; ComponentHandle<ComponentWaveOut> m_WaveOut; @@ -57,6 +61,7 @@ std::vector<SoundDevice::Info> m_SoundDevices; std::map<SoundDevice::Identifier, bool> m_DeviceUnavailable; + std::map<SoundDevice::Identifier, CreateSoundDeviceFunc> m_DeviceFactoryMethods; std::map<SoundDevice::Identifier, SoundDevice::Caps> m_DeviceCaps; std::map<SoundDevice::Identifier, SoundDevice::DynamicCaps> m_DeviceDynamicCaps; @@ -64,6 +69,11 @@ Manager(SoundDevice::AppInfo appInfo); ~Manager(); +private: + + template <typename Tdevice> void EnumerateDevices(); + template <typename Tdevice> static SoundDevice::IBase* ConstructSoundDevice(const SoundDevice::Info &info); + public: void ReEnumerate(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-21 10:17:29
|
Revision: 5131 http://sourceforge.net/p/modplug/code/5131 Author: manxorist Date: 2015-05-21 10:17:24 +0000 (Thu, 21 May 2015) Log Message: ----------- [Fix] build: Newer emscripten apparently do generate 2 output files. A .js and a .js.mem file. Make the test suite work in the case. Modified Paths: -------------- trunk/OpenMPT/Makefile trunk/OpenMPT/build/make/test-pre.js Modified: trunk/OpenMPT/Makefile =================================================================== --- trunk/OpenMPT/Makefile 2015-05-21 09:52:14 UTC (rev 5130) +++ trunk/OpenMPT/Makefile 2015-05-21 10:17:24 UTC (rev 5131) @@ -585,8 +585,10 @@ MISC_OUTPUTS += libopenmpt$(SOSUFFIX) MISC_OUTPUTS += bin/.docs MISC_OUTPUTS += bin/libopenmpt_test$(EXESUFFIX) +MISC_OUTPUTS += bin/libopenmpt_test.js.mem MISC_OUTPUTS += bin/made.docs MISC_OUTPUTS += bin/$(LIBOPENMPT_SONAME) +MISC_OUTPUTS += bin/libopenmpt.js.mem MISC_OUTPUTS += bin/openmpt.a MISC_OUTPUTDIRS += bin/dest @@ -633,7 +635,11 @@ .PHONY: test test: bin/libopenmpt_test$(EXESUFFIX) - $(RUNPREFIX) bin/libopenmpt_test$(EXESUFFIX) +ifeq ($(CONFIG),emscripten) + cd bin && $(RUNPREFIX) libopenmpt_test$(EXESUFFIX) +else + bin/libopenmpt_test$(EXESUFFIX) +endif bin/libopenmpt_test$(EXESUFFIX): $(LIBOPENMPTTEST_OBJECTS) $(INFO) [LD-TEST] $@ Modified: trunk/OpenMPT/build/make/test-pre.js =================================================================== --- trunk/OpenMPT/build/make/test-pre.js 2015-05-21 09:52:14 UTC (rev 5130) +++ trunk/OpenMPT/build/make/test-pre.js 2015-05-21 10:17:24 UTC (rev 5131) @@ -2,6 +2,6 @@ var Module = { 'preInit': function(text) { FS.mkdir('/test'); - FS.mount(NODEFS, {'root': './test/'}, '/test'); + FS.mount(NODEFS, {'root': '../test/'}, '/test'); } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-21 12:05:46
|
Revision: 5133 http://sourceforge.net/p/modplug/code/5133 Author: manxorist Date: 2015-05-21 12:05:38 +0000 (Thu, 21 May 2015) Log Message: ----------- [Imp] sounddev: Add support for recording channels on ASIO and PortAudio devices. This feature is not yet exposed in any way beyond the sound device implementation itself. Modified Paths: -------------- trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Mainfrm.h trunk/OpenMPT/sounddev/SoundDevice.cpp trunk/OpenMPT/sounddev/SoundDevice.h trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp trunk/OpenMPT/sounddev/SoundDeviceASIO.h trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp trunk/OpenMPT/sounddev/SoundDevicePortAudio.h trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp Modified: trunk/OpenMPT/mptrack/MainFrm.cpp =================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/mptrack/MainFrm.cpp 2015-05-21 12:05:38 UTC (rev 5133) @@ -702,10 +702,11 @@ }; -void CMainFrame::SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer) -//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +void CMainFrame::SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer, const void *inputBuffer) +//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- { MPT_TRACE(); + MPT_UNREFERENCED_PARAMETER(inputBuffer); MPT_ASSERT(InAudioThread()); OPENMPT_PROFILE_FUNCTION(Profiler::Audio); TimingInfo timingInfo; Modified: trunk/OpenMPT/mptrack/Mainfrm.h =================================================================== --- trunk/OpenMPT/mptrack/Mainfrm.h 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/mptrack/Mainfrm.h 2015-05-21 12:05:38 UTC (rev 5133) @@ -410,7 +410,7 @@ void SoundSourcePostStopCallback(); bool SoundSourceIsLockedByCurrentThread() const; void SoundSourceLock(); - void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer); + void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer, const void *inputBuffer); void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo); void SoundSourceUnlock(); Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-05-21 12:05:38 UTC (rev 5133) @@ -277,15 +277,15 @@ } -void Base::SourceAudioRead(void *buffer, std::size_t numFrames) -//------------------------------------------------------------- +void Base::SourceAudioRead(void *buffer, const void *inputBuffer, std::size_t numFrames) +//-------------------------------------------------------------------------------------- { MPT_TRACE(); if(numFrames <= 0) { return; } - m_Source->SoundSourceRead(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, buffer); + m_Source->SoundSourceRead(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, buffer, inputBuffer); } Modified: trunk/OpenMPT/sounddev/SoundDevice.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-05-21 12:05:38 UTC (rev 5133) @@ -81,7 +81,7 @@ virtual void SoundSourcePostStopCallback() = 0; virtual bool SoundSourceIsLockedByCurrentThread() const = 0; virtual void SoundSourceLock() = 0; - virtual void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer) = 0; + virtual void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer, const void *inputBuffer) = 0; virtual void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo) = 0; virtual void SoundSourceUnlock() = 0; public: @@ -266,23 +266,27 @@ double UpdateInterval; // seconds uint32 Samplerate; SoundDevice::ChannelMapping Channels; + uint8 InputChannels; SampleFormat sampleFormat; bool ExclusiveMode; // Use hardware buffers directly bool BoostThreadPriority; // Boost thread priority for glitch-free audio rendering bool KeepDeviceRunning; bool UseHardwareTiming; int DitherType; + uint32 InputSourceID; Settings() : Latency(0.1) , UpdateInterval(0.005) , Samplerate(48000) , Channels(2) + , InputChannels(0) , sampleFormat(SampleFormatFloat32) , ExclusiveMode(false) , BoostThreadPriority(true) , KeepDeviceRunning(true) , UseHardwareTiming(false) , DitherType(1) + , InputSourceID(0) { return; } @@ -293,12 +297,14 @@ && Util::Round<int64>(UpdateInterval * 1000000000.0) == Util::Round<int64>(cmp.UpdateInterval * 1000000000.0) // compare in nanoseconds && Samplerate == cmp.Samplerate && Channels == cmp.Channels + && InputChannels == cmp.InputChannels && sampleFormat == cmp.sampleFormat && ExclusiveMode == cmp.ExclusiveMode && BoostThreadPriority == cmp.BoostThreadPriority && KeepDeviceRunning == cmp.KeepDeviceRunning && UseHardwareTiming == cmp.UseHardwareTiming && DitherType == cmp.DitherType + && InputSourceID == cmp.InputSourceID ; } bool operator != (const SoundDevice::Settings &cmp) const @@ -313,6 +319,10 @@ { return Samplerate * GetBytesPerFrame(); } + std::size_t GetTotalChannels() const + { + return InputChannels + Channels; + } }; @@ -345,6 +355,8 @@ bool CanKeepDeviceRunning; bool CanUseHardwareTiming; bool CanChannelMapping; + bool CanInput; + bool HasNamedInputSources; bool CanDriverPanel; bool HasInternalDither; mpt::ustring ExclusiveModeDescription; @@ -362,6 +374,8 @@ , CanKeepDeviceRunning(false) , CanUseHardwareTiming(false) , CanChannelMapping(false) + , CanInput(false) + , HasNamedInputSources(false) , CanDriverPanel(false) , HasInternalDither(false) , ExclusiveModeDescription(MPT_USTRING("Use device exclusively")) @@ -381,6 +395,7 @@ std::vector<uint32> supportedSampleRates; std::vector<uint32> supportedExclusiveSampleRates; std::vector<mpt::ustring> channelNames; + std::vector<std::pair<uint32, mpt::ustring> > inputSourceNames; DynamicCaps() : currentSampleRate(0) { @@ -539,7 +554,7 @@ bool SourceIsLockedByCurrentThread() const; void SourceFillAudioBufferLocked(); void SourceAudioPreRead(std::size_t numFrames, std::size_t framesLatency); - void SourceAudioRead(void *buffer, std::size_t numFrames); + void SourceAudioRead(void *buffer, const void *inputBuffer, std::size_t numFrames); void SourceAudioDone(); void RequestClose() { m_RequestFlags.fetch_or(RequestFlagClose); } Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-05-21 12:05:38 UTC (rev 5133) @@ -206,6 +206,10 @@ m_SampleBufferInt16.clear(); m_SampleBufferInt24.clear(); m_SampleBufferInt32.clear(); + m_SampleInputBufferFloat.clear(); + m_SampleInputBufferInt16.clear(); + m_SampleInputBufferInt24.clear(); + m_SampleInputBufferInt32.clear(); m_CanOutputReady = false; m_DeviceRunning = false; @@ -253,14 +257,17 @@ InitMembers(); - Log(mpt::String::Print("ASIO: Open('%1'): %2-bit, %3 channels, %4Hz, hw-timing=%5" + Log(mpt::String::Print("ASIO: Open('%1'): %2-bit, (%3,%4) channels, %5Hz, hw-timing=%6" , mpt::ToLocale(GetDeviceInternalID()) , m_Settings.sampleFormat.GetBitsPerSample() + , m_Settings.InputChannels , m_Settings.Channels , m_Settings.Samplerate , m_Settings.UseHardwareTiming )); + SoundDevice::ChannelMapping inputChannelMapping = SoundDevice::ChannelMapping::BaseChannel(m_Settings.InputChannels, m_Settings.InputSourceID); + try { @@ -288,6 +295,14 @@ { throw ASIOException("Channel mapping requires more channels than available."); } + if(m_Settings.InputChannels > inputChannels) + { + throw ASIOException("Not enough input channels."); + } + if(inputChannelMapping.GetRequiredDeviceChannels() > inputChannels) + { + throw ASIOException("Channel mapping requires more channels than available."); + } Log(mpt::String::Print("ASIO: setSampleRate(sampleRate=%1)", m_Settings.Samplerate)); asioCall(setSampleRate(m_Settings.Samplerate)); @@ -360,12 +375,19 @@ MPT_ASSERT(false); } - m_BufferInfo.resize(m_Settings.Channels); - for(int channel = 0; channel < m_Settings.Channels; ++channel) + m_BufferInfo.resize(m_Settings.GetTotalChannels()); + for(std::size_t channel = 0; channel < m_Settings.GetTotalChannels(); ++channel) { MemsetZero(m_BufferInfo[channel]); - m_BufferInfo[channel].isInput = ASIOFalse; - m_BufferInfo[channel].channelNum = m_Settings.Channels.ToDevice(channel); + if(channel < m_Settings.InputChannels) + { + m_BufferInfo[channel].isInput = ASIOTrue; + m_BufferInfo[channel].channelNum = inputChannelMapping.ToDevice(channel); + } else + { + m_BufferInfo[channel].isInput = ASIOFalse; + m_BufferInfo[channel].channelNum = m_Settings.Channels.ToDevice(channel - m_Settings.InputChannels); + } } m_Callbacks.bufferSwitch = CallbackBufferSwitch; m_Callbacks.sampleRateDidChange = CallbackSampleRateDidChange; @@ -374,20 +396,27 @@ MPT_ASSERT_ALWAYS(g_CallbacksInstance == nullptr); g_CallbacksInstance = this; Log(mpt::String::Print("ASIO: createBuffers(numChannels=%1, bufferSize=%2)", m_Settings.Channels, m_nAsioBufferLen)); - asioCall(createBuffers(&m_BufferInfo[0], m_Settings.Channels, m_nAsioBufferLen, &m_Callbacks)); + asioCall(createBuffers(&m_BufferInfo[0], m_Settings.GetTotalChannels(), m_nAsioBufferLen, &m_Callbacks)); m_BuffersCreated = true; - m_ChannelInfo.resize(m_Settings.Channels); - for(int channel = 0; channel < m_Settings.Channels; ++channel) + m_ChannelInfo.resize(m_Settings.GetTotalChannels()); + for(std::size_t channel = 0; channel < m_Settings.GetTotalChannels(); ++channel) { MemsetZero(m_ChannelInfo[channel]); - m_ChannelInfo[channel].isInput = ASIOFalse; - m_ChannelInfo[channel].channel = m_Settings.Channels.ToDevice(channel); + if(channel < m_Settings.InputChannels) + { + m_ChannelInfo[channel].isInput = ASIOTrue; + m_ChannelInfo[channel].channel = inputChannelMapping.ToDevice(channel); + } else + { + m_ChannelInfo[channel].isInput = ASIOFalse; + m_ChannelInfo[channel].channel = m_Settings.Channels.ToDevice(channel - m_Settings.InputChannels); + } asioCall(getChannelInfo(&m_ChannelInfo[channel])); MPT_ASSERT(m_ChannelInfo[channel].isActive); mpt::String::SetNullTerminator(m_ChannelInfo[channel].name); Log(mpt::String::Print("ASIO: getChannelInfo(isInput=%1 channel=%2) => isActive=%3 channelGroup=%4 type=%5 name='%6'" - , ASIOFalse + , (channel < m_Settings.InputChannels) ? ASIOTrue : ASIOFalse , m_Settings.Channels.ToDevice(channel) , m_ChannelInfo[channel].isActive , m_ChannelInfo[channel].channelGroup @@ -399,7 +428,7 @@ bool allChannelsAreFloat = true; bool allChannelsAreInt16 = true; bool allChannelsAreInt24 = true; - for(int channel = 0; channel < m_Settings.Channels; ++channel) + for(std::size_t channel = 0; channel < m_Settings.GetTotalChannels(); ++channel) { if(!IsSampleTypeFloat(m_ChannelInfo[channel].type)) { @@ -418,21 +447,25 @@ { m_Settings.sampleFormat = SampleFormatFloat32; m_SampleBufferFloat.resize(m_nAsioBufferLen * m_Settings.Channels); + m_SampleInputBufferFloat.resize(m_nAsioBufferLen * m_Settings.InputChannels); } else if(allChannelsAreInt16) { m_Settings.sampleFormat = SampleFormatInt16; m_SampleBufferInt16.resize(m_nAsioBufferLen * m_Settings.Channels); + m_SampleInputBufferInt16.resize(m_nAsioBufferLen * m_Settings.InputChannels); } else if(allChannelsAreInt24) { m_Settings.sampleFormat = SampleFormatInt24; m_SampleBufferInt24.resize(m_nAsioBufferLen * m_Settings.Channels); + m_SampleInputBufferInt24.resize(m_nAsioBufferLen * m_Settings.InputChannels); } else { m_Settings.sampleFormat = SampleFormatInt32; m_SampleBufferInt32.resize(m_nAsioBufferLen * m_Settings.Channels); + m_SampleInputBufferInt32.resize(m_nAsioBufferLen * m_Settings.InputChannels); } - for(int channel = 0; channel < m_Settings.Channels; ++channel) + for(std::size_t channel = 0; channel < m_Settings.GetTotalChannels(); ++channel) { if(m_BufferInfo[channel].buffers[0]) { @@ -631,6 +664,10 @@ m_SampleBufferInt16.clear(); m_SampleBufferInt24.clear(); m_SampleBufferInt32.clear(); + m_SampleInputBufferFloat.clear(); + m_SampleInputBufferInt16.clear(); + m_SampleInputBufferInt24.clear(); + m_SampleInputBufferInt32.clear(); m_ChannelInfo.clear(); if(m_BuffersCreated) { @@ -857,22 +894,155 @@ { MPT_TRACE(); const bool rendersilence = !useSource; - const int channels = m_Settings.Channels; const std::size_t countChunk = m_nAsioBufferLen; + const std::size_t inputChannels = m_Settings.InputChannels; + const std::size_t outputChannels = m_Settings.Channels; + for(std::size_t inputChannel = 0; inputChannel < inputChannels; ++inputChannel) + { + std::size_t channel = inputChannel; + void *src = m_BufferInfo[channel].buffers[static_cast<unsigned long>(m_BufferIndex) & 1]; + if(IsSampleTypeBigEndian(m_ChannelInfo[channel].type)) + { + if(src) + { + SwapEndian(reinterpret_cast<uint8*>(src), countChunk, GetSampleSize(m_ChannelInfo[channel].type)); + } + } + if(m_Settings.sampleFormat == SampleFormatFloat32) + { + float *const dstFloat = &m_SampleInputBufferFloat[0]; + if(!src) + { + // Skip if we did get no buffer for this channel, + // Fill with zeroes. + std::fill(dstFloat, dstFloat + countChunk, 0.0f); + continue; + } + switch(m_ChannelInfo[channel].type) + { + case ASIOSTFloat32MSB: + case ASIOSTFloat32LSB: + CopyChannelToInterleaved<SC::Convert<float, float> >(dstFloat, reinterpret_cast<float*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTFloat64MSB: + case ASIOSTFloat64LSB: + CopyChannelToInterleaved<SC::Convert<float, double> >(dstFloat, reinterpret_cast<double*>(src), inputChannels, countChunk, inputChannel); + break; + default: + ASSERT(false); + break; + } + } else if(m_Settings.sampleFormat == SampleFormatInt16) + { + int16 *const dstInt16 = &m_SampleInputBufferInt16[0]; + if(!src) + { + // Skip if we did get no buffer for this channel, + // Fill with zeroes. + std::fill(dstInt16, dstInt16 + countChunk, 0); + continue; + } + switch(m_ChannelInfo[channel].type) + { + case ASIOSTInt16MSB: + case ASIOSTInt16LSB: + CopyChannelToInterleaved<SC::Convert<int16, int16> >(dstInt16, reinterpret_cast<int16*>(src), inputChannels, countChunk, inputChannel); + break; + default: + ASSERT(false); + break; + } + } else if(m_Settings.sampleFormat == SampleFormatInt24) + { + int24 *const dstInt24 = &m_SampleInputBufferInt24[0]; + if(!src) + { + // Skip if we did get no buffer for this channel, + // Fill with zeroes. + std::fill(dstInt24, dstInt24 + countChunk, int24(0)); + continue; + } + switch(m_ChannelInfo[channel].type) + { + case ASIOSTInt24MSB: + case ASIOSTInt24LSB: + CopyChannelToInterleaved<SC::Convert<int24, int24> >(dstInt24, reinterpret_cast<int24*>(src), inputChannels, countChunk, inputChannel); + break; + default: + ASSERT(false); + break; + } + } else if(m_Settings.sampleFormat == SampleFormatInt32) + { + int32 *const dstInt32 = &m_SampleInputBufferInt32[0]; + if(!src) + { + // Skip if we did get no buffer for this channel, + // Fill with zeroes. + std::fill(dstInt32, dstInt32 + countChunk, 0); + continue; + } + switch(m_ChannelInfo[channel].type) + { + case ASIOSTInt16MSB: + case ASIOSTInt16LSB: + CopyChannelToInterleaved<SC::Convert<int32, int16> >(dstInt32, reinterpret_cast<int16*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTInt24MSB: + case ASIOSTInt24LSB: + CopyChannelToInterleaved<SC::Convert<int32, int24> >(dstInt32, reinterpret_cast<int24*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTInt32MSB: + case ASIOSTInt32LSB: + CopyChannelToInterleaved<SC::Convert<int32, int32> >(dstInt32, reinterpret_cast<int32*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTFloat32MSB: + case ASIOSTFloat32LSB: + CopyChannelToInterleaved<SC::Convert<int32, float> >(dstInt32, reinterpret_cast<float*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTFloat64MSB: + case ASIOSTFloat64LSB: + CopyChannelToInterleaved<SC::Convert<int32, double> >(dstInt32, reinterpret_cast<double*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTInt32MSB16: + case ASIOSTInt32LSB16: + CopyChannelToInterleaved<SC::ConvertShiftUp<int32, int32, 16> >(dstInt32, reinterpret_cast<int32*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTInt32MSB18: + case ASIOSTInt32LSB18: + CopyChannelToInterleaved<SC::ConvertShiftUp<int32, int32, 14> >(dstInt32, reinterpret_cast<int32*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTInt32MSB20: + case ASIOSTInt32LSB20: + CopyChannelToInterleaved<SC::ConvertShiftUp<int32, int32, 12> >(dstInt32, reinterpret_cast<int32*>(src), inputChannels, countChunk, inputChannel); + break; + case ASIOSTInt32MSB24: + case ASIOSTInt32LSB24: + CopyChannelToInterleaved<SC::ConvertShiftUp<int32, int32, 8> >(dstInt32, reinterpret_cast<int32*>(src), inputChannels, countChunk, inputChannel); + break; + default: + ASSERT(false); + break; + } + } else + { + ASSERT(false); + } + } if(rendersilence) { if(m_Settings.sampleFormat == SampleFormatFloat32) { - std::memset(&m_SampleBufferFloat[0], 0, countChunk * channels * sizeof(float)); + std::memset(&m_SampleBufferFloat[0], 0, countChunk * outputChannels * sizeof(float)); } else if(m_Settings.sampleFormat == SampleFormatInt16) { - std::memset(&m_SampleBufferInt16[0], 0, countChunk * channels * sizeof(int16)); + std::memset(&m_SampleBufferInt16[0], 0, countChunk * outputChannels * sizeof(int16)); } else if(m_Settings.sampleFormat == SampleFormatInt24) { - std::memset(&m_SampleBufferInt24[0], 0, countChunk * channels * sizeof(int24)); + std::memset(&m_SampleBufferInt24[0], 0, countChunk * outputChannels * sizeof(int24)); } else if(m_Settings.sampleFormat == SampleFormatInt32) { - std::memset(&m_SampleBufferInt32[0], 0, countChunk * channels * sizeof(int32)); + std::memset(&m_SampleBufferInt32[0], 0, countChunk * outputChannels * sizeof(int32)); } else { MPT_ASSERT(false); @@ -882,24 +1052,25 @@ SourceAudioPreRead(countChunk, m_nAsioBufferLen); if(m_Settings.sampleFormat == SampleFormatFloat32) { - SourceAudioRead(&m_SampleBufferFloat[0], countChunk); + SourceAudioRead(&m_SampleBufferFloat[0], (m_SampleInputBufferFloat.size() > 0) ? &m_SampleInputBufferFloat[0] : nullptr, countChunk); } else if(m_Settings.sampleFormat == SampleFormatInt16) { - SourceAudioRead(&m_SampleBufferInt16[0], countChunk); + SourceAudioRead(&m_SampleBufferInt16[0], (m_SampleInputBufferInt16.size() > 0) ? &m_SampleInputBufferInt16[0] : nullptr, countChunk); } else if(m_Settings.sampleFormat == SampleFormatInt24) { - SourceAudioRead(&m_SampleBufferInt24[0], countChunk); + SourceAudioRead(&m_SampleBufferInt24[0], (m_SampleInputBufferInt24.size() > 0) ? &m_SampleInputBufferInt24[0] : nullptr, countChunk); } else if(m_Settings.sampleFormat == SampleFormatInt32) { - SourceAudioRead(&m_SampleBufferInt32[0], countChunk); + SourceAudioRead(&m_SampleBufferInt32[0], (m_SampleInputBufferInt32.size() > 0) ? &m_SampleInputBufferInt32[0] : nullptr, countChunk); } else { MPT_ASSERT(false); } } - for(int channel = 0; channel < channels; ++channel) + for(std::size_t outputChannel = 0; outputChannel < outputChannels; ++outputChannel) { - void *dst = m_BufferInfo[channel].buffers[(unsigned long)m_BufferIndex & 1]; + std::size_t channel = outputChannel + m_Settings.InputChannels; + void *dst = m_BufferInfo[channel].buffers[static_cast<unsigned long>(m_BufferIndex) & 1]; if(!dst) { // Skip if we did get no buffer for this channel @@ -912,11 +1083,11 @@ { case ASIOSTFloat32MSB: case ASIOSTFloat32LSB: - CopyInterleavedToChannel<SC::Convert<float, float> >(reinterpret_cast<float*>(dst), srcFloat, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<float, float> >(reinterpret_cast<float*>(dst), srcFloat, outputChannels, countChunk, outputChannel); break; case ASIOSTFloat64MSB: case ASIOSTFloat64LSB: - CopyInterleavedToChannel<SC::Convert<double, float> >(reinterpret_cast<double*>(dst), srcFloat, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<double, float> >(reinterpret_cast<double*>(dst), srcFloat, outputChannels, countChunk, outputChannel); break; default: MPT_ASSERT(false); @@ -929,7 +1100,7 @@ { case ASIOSTInt16MSB: case ASIOSTInt16LSB: - CopyInterleavedToChannel<SC::Convert<int16, int16> >(reinterpret_cast<int16*>(dst), srcInt16, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<int16, int16> >(reinterpret_cast<int16*>(dst), srcInt16, outputChannels, countChunk, outputChannel); break; default: MPT_ASSERT(false); @@ -942,7 +1113,7 @@ { case ASIOSTInt24MSB: case ASIOSTInt24LSB: - CopyInterleavedToChannel<SC::Convert<int24, int24> >(reinterpret_cast<int24*>(dst), srcInt24, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<int24, int24> >(reinterpret_cast<int24*>(dst), srcInt24, outputChannels, countChunk, outputChannel); break; default: MPT_ASSERT(false); @@ -955,39 +1126,39 @@ { case ASIOSTInt16MSB: case ASIOSTInt16LSB: - CopyInterleavedToChannel<SC::Convert<int16, int32> >(reinterpret_cast<int16*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<int16, int32> >(reinterpret_cast<int16*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTInt24MSB: case ASIOSTInt24LSB: - CopyInterleavedToChannel<SC::Convert<int24, int32> >(reinterpret_cast<int24*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<int24, int32> >(reinterpret_cast<int24*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTInt32MSB: case ASIOSTInt32LSB: - CopyInterleavedToChannel<SC::Convert<int32, int32> >(reinterpret_cast<int32*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<int32, int32> >(reinterpret_cast<int32*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTFloat32MSB: case ASIOSTFloat32LSB: - CopyInterleavedToChannel<SC::Convert<float, int32> >(reinterpret_cast<float*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<float, int32> >(reinterpret_cast<float*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTFloat64MSB: case ASIOSTFloat64LSB: - CopyInterleavedToChannel<SC::Convert<double, int32> >(reinterpret_cast<double*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::Convert<double, int32> >(reinterpret_cast<double*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTInt32MSB16: case ASIOSTInt32LSB16: - CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 16> >(reinterpret_cast<int32*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 16> >(reinterpret_cast<int32*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTInt32MSB18: case ASIOSTInt32LSB18: - CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 14> >(reinterpret_cast<int32*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 14> >(reinterpret_cast<int32*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTInt32MSB20: case ASIOSTInt32LSB20: - CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 12> >(reinterpret_cast<int32*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 12> >(reinterpret_cast<int32*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; case ASIOSTInt32MSB24: case ASIOSTInt32LSB24: - CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 8> >(reinterpret_cast<int32*>(dst), srcInt32, channels, countChunk, channel); + CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 8> >(reinterpret_cast<int32*>(dst), srcInt32, outputChannels, countChunk, outputChannel); break; default: MPT_ASSERT(false); @@ -1386,6 +1557,8 @@ caps.CanKeepDeviceRunning = true; caps.CanUseHardwareTiming = true; caps.CanChannelMapping = true; + caps.CanInput = true; + caps.HasNamedInputSources = true; caps.CanDriverPanel = true; caps.LatencyMin = 0.000001; // 1 us @@ -1467,6 +1640,24 @@ } caps.channelNames.push_back(name); } + for(long i = 0; i < inputChannels; ++i) + { + ASIOChannelInfo channelInfo; + MemsetZero(channelInfo); + channelInfo.channel = i; + channelInfo.isInput = ASIOTrue; + mpt::ustring name = mpt::ufmt::dec(i); + try + { + asioCall(getChannelInfo(&channelInfo)); + mpt::String::SetNullTerminator(channelInfo.name); + name = mpt::ToUnicode(mpt::CharsetLocale, channelInfo.name); + } catch(...) + { + // continue + } + caps.inputSourceNames.push_back(std::make_pair(static_cast<uint32>(i), name)); + } } catch(...) { // continue Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-05-21 12:05:38 UTC (rev 5133) @@ -71,6 +71,10 @@ std::vector<int16> m_SampleBufferInt16; std::vector<int24> m_SampleBufferInt24; std::vector<int32> m_SampleBufferInt32; + std::vector<float> m_SampleInputBufferFloat; + std::vector<int16> m_SampleInputBufferInt16; + std::vector<int24> m_SampleInputBufferInt24; + std::vector<int32> m_SampleInputBufferInt32; bool m_CanOutputReady; bool m_DeviceRunning; Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-05-21 12:05:38 UTC (rev 5133) @@ -142,6 +142,8 @@ caps.CanBoostThreadPriority = true; caps.CanUseHardwareTiming = false; caps.CanChannelMapping = false; + caps.CanInput = false; + caps.HasNamedInputSources = false; caps.CanDriverPanel = false; caps.ExclusiveModeDescription = MPT_USTRING("Use primary buffer"); caps.DefaultSettings.sampleFormat = SampleFormatInt16; @@ -238,6 +240,8 @@ bool CDSoundDevice::InternalOpen() //-------------------------------- { + if(m_Settings.InputChannels > 0) return false; + WAVEFORMATEXTENSIBLE wfext; if(!FillWaveFormatExtensible(wfext, m_Settings)) return false; WAVEFORMATEX *pwfx = &wfext.Format; @@ -455,8 +459,8 @@ SourceAudioPreRead(dwSize1/bytesPerFrame + dwSize2/bytesPerFrame, dwLatency/bytesPerFrame); - SourceAudioRead(buf1, dwSize1/bytesPerFrame); - SourceAudioRead(buf2, dwSize2/bytesPerFrame); + SourceAudioRead(buf1, nullptr, dwSize1/bytesPerFrame); + SourceAudioRead(buf2, nullptr, dwSize2/bytesPerFrame); if(m_pMixBuffer->Unlock(buf1, dwSize1, buf2, dwSize2) != DS_OK) { Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-05-21 12:05:38 UTC (rev 5133) @@ -40,6 +40,7 @@ m_DeviceIndex = ConvertStrTo<PaDeviceIndex>(GetDeviceInternalID()); m_HostApiType = Pa_GetHostApiInfo(Pa_GetDeviceInfo(m_DeviceIndex)->hostApi)->type; MemsetZero(m_StreamParameters); + MemsetZero(m_InputStreamParameters); m_Stream = 0; m_StreamInfo = 0; m_CurrentFrameCount = 0; @@ -58,9 +59,11 @@ //----------------------------------- { MemsetZero(m_StreamParameters); + MemsetZero(m_InputStreamParameters); m_Stream = 0; m_StreamInfo = 0; m_CurrentFrameBuffer = 0; + m_CurrentFrameBufferInput = 0; m_CurrentFrameCount = 0; m_StreamParameters.device = m_DeviceIndex; if(m_StreamParameters.device == -1) return false; @@ -114,13 +117,19 @@ { m_Flags.NeedsClippedFloat = false; } - if(Pa_IsFormatSupported(NULL, &m_StreamParameters, m_Settings.Samplerate) != paFormatIsSupported) return false; + m_InputStreamParameters = m_StreamParameters; + if(!HasInputChannelsOnSameDevice()) + { + m_InputStreamParameters.device = static_cast<PaDeviceIndex>(m_Settings.InputSourceID); + } + m_InputStreamParameters.channelCount = m_Settings.InputChannels; + if(Pa_IsFormatSupported((m_Settings.InputChannels > 0) ? &m_InputStreamParameters : NULL, &m_StreamParameters, m_Settings.Samplerate) != paFormatIsSupported) return false; PaStreamFlags flags = paNoFlag; if(m_Settings.DitherType == 0) { flags |= paDitherOff; } - if(Pa_OpenStream(&m_Stream, NULL, &m_StreamParameters, m_Settings.Samplerate, framesPerBuffer, flags, StreamCallbackWrapper, (void*)this) != paNoError) return false; + if(Pa_OpenStream(&m_Stream, (m_Settings.InputChannels > 0) ? &m_InputStreamParameters : NULL, &m_StreamParameters, m_Settings.Samplerate, framesPerBuffer, flags, StreamCallbackWrapper, (void*)this) != paNoError) return false; m_StreamInfo = Pa_GetStreamInfo(m_Stream); if(!m_StreamInfo) { @@ -145,10 +154,12 @@ Pa_Sleep(Util::Round<long>(bufferAttributes.Latency * 2.0 * 1000.0 + 0.5)); // wait for broken wdm drivers not closing the stream immediatly } MemsetZero(m_StreamParameters); + MemsetZero(m_InputStreamParameters); m_StreamInfo = 0; m_Stream = 0; m_CurrentFrameCount = 0; m_CurrentFrameBuffer = 0; + m_CurrentFrameBufferInput = 0; } return true; } @@ -173,7 +184,7 @@ { if(m_CurrentFrameCount == 0) return; SourceAudioPreRead(m_CurrentFrameCount, Util::Round<std::size_t>(m_CurrentRealLatency * m_StreamInfo->sampleRate)); - SourceAudioRead(m_CurrentFrameBuffer, m_CurrentFrameCount); + SourceAudioRead(m_CurrentFrameBuffer, m_CurrentFrameBufferInput, m_CurrentFrameCount); m_StatisticPeriodFrames.store(m_CurrentFrameCount); SourceAudioDone(); } @@ -221,14 +232,25 @@ caps.CanBoostThreadPriority = false; caps.CanUseHardwareTiming = false; caps.CanChannelMapping = false; + caps.CanInput = false; + caps.HasNamedInputSources = false; caps.CanDriverPanel = false; caps.HasInternalDither = true; + caps.DefaultSettings.sampleFormat = SampleFormatFloat32; const PaDeviceInfo *deviceInfo = Pa_GetDeviceInfo(m_DeviceIndex); if(deviceInfo) { caps.DefaultSettings.Latency = deviceInfo->defaultLowOutputLatency; } - caps.DefaultSettings.sampleFormat = SampleFormatFloat32; + if(HasInputChannelsOnSameDevice()) + { + caps.CanInput = true; + caps.HasNamedInputSources = false; + } else + { + caps.CanInput = (EnumerateInputOnlyDevices(m_HostApiType).size() > 0); + caps.HasNamedInputSources = caps.CanInput; + } if(m_HostApiType == paWASAPI) { caps.CanExclusiveMode = true; @@ -266,7 +288,7 @@ { SoundDevice::DynamicCaps caps; PaDeviceIndex device = m_DeviceIndex; - if(device == -1) + if(device == paNoDevice) { return caps; } @@ -294,6 +316,17 @@ caps.supportedExclusiveSampleRates.push_back(baseSampleRates[n]); } } + + if(!HasInputChannelsOnSameDevice()) + { + caps.inputSourceNames.clear(); + std::vector<std::pair<PaDeviceIndex, mpt::ustring> > inputDevices = EnumerateInputOnlyDevices(m_HostApiType); + for(std::vector<std::pair<PaDeviceIndex, mpt::ustring> >::const_iterator it = inputDevices.begin(); it != inputDevices.end(); ++it) + { + caps.inputSourceNames.push_back(std::make_pair(static_cast<uint32>(it->first), it->second)); + } + } + return caps; } @@ -350,10 +383,12 @@ m_CurrentRealLatency = timeInfo->outputBufferDacTime - timeInfo->currentTime; } m_CurrentFrameBuffer = output; + m_CurrentFrameBufferInput = input; m_CurrentFrameCount = frameCount; SourceFillAudioBufferLocked(); m_CurrentFrameCount = 0; m_CurrentFrameBuffer = 0; + m_CurrentFrameBufferInput = 0; return paContinue; } @@ -452,6 +487,68 @@ } + + +std::vector<std::pair<PaDeviceIndex, mpt::ustring> > CPortaudioDevice::EnumerateInputOnlyDevices(PaHostApiTypeId hostApiType) +//--------------------------------------------------------------------------------------------------------------------------- +{ + std::vector<std::pair<PaDeviceIndex, mpt::ustring> > result; + for(PaDeviceIndex dev = 0; dev < Pa_GetDeviceCount(); ++dev) + { + if(!Pa_GetDeviceInfo(dev)) + { + continue; + } + if(Pa_GetDeviceInfo(dev)->hostApi < 0) + { + continue; + } + if(!Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)) + { + continue; + } + if(!Pa_GetDeviceInfo(dev)->name) + { + continue; + } + if(!Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->name) + { + continue; + } + if(Pa_GetDeviceInfo(dev)->maxInputChannels <= 0) + { + continue; + } + if(Pa_GetDeviceInfo(dev)->maxOutputChannels > 0) + { // only find devices with only input channels + continue; + } + if(Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->type != hostApiType) + { + continue; + } + result.push_back(std::make_pair(dev, mpt::ToUnicode(mpt::CharsetUTF8, Pa_GetDeviceInfo(dev)->name))); + } + return result; +} + + +bool CPortaudioDevice::HasInputChannelsOnSameDevice() const +//--------------------------------------------------------- +{ + if(m_DeviceIndex == paNoDevice) + { + return false; + } + const PaDeviceInfo *deviceinfo = Pa_GetDeviceInfo(m_DeviceIndex); + if(!deviceinfo) + { + return false; + } + return (deviceinfo->maxInputChannels > 0); +} + + static void PortaudioLog(const char *text) //---------------------------------------- { Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.h =================================================================== --- trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-05-21 12:05:38 UTC (rev 5133) @@ -29,24 +29,30 @@ class CPortaudioDevice: public SoundDevice::Base //========================================= { + protected: + PaDeviceIndex m_DeviceIndex; PaHostApiTypeId m_HostApiType; PaStreamParameters m_StreamParameters; + PaStreamParameters m_InputStreamParameters; PaWasapiStreamInfo m_WasapiStreamInfo; PaStream * m_Stream; const PaStreamInfo * m_StreamInfo; void * m_CurrentFrameBuffer; + const void * m_CurrentFrameBufferInput; unsigned long m_CurrentFrameCount; double m_CurrentRealLatency; // seconds mpt::atomic_uint32_t m_StatisticPeriodFrames; public: + CPortaudioDevice(SoundDevice::Info info); ~CPortaudioDevice(); public: + bool InternalOpen(); bool InternalClose(); void InternalFillAudioBuffer(); @@ -69,6 +75,7 @@ ); public: + static int StreamCallbackWrapper( const void *input, void *output, unsigned long frameCount, @@ -79,6 +86,12 @@ static std::vector<SoundDevice::Info> EnumerateDevices(); +private: + + bool HasInputChannelsOnSameDevice() const; + + static std::vector<std::pair<PaDeviceIndex, mpt::ustring> > EnumerateInputOnlyDevices(PaHostApiTypeId hostApiType); + }; Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp =================================================================== --- trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-05-21 11:48:12 UTC (rev 5132) +++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-05-21 12:05:38 UTC (rev 5133) @@ -75,6 +75,8 @@ caps.CanKeepDeviceRunning = false; caps.CanUseHardwareTiming = false; caps.CanChannelMapping = false; + caps.CanInput = false; + caps.HasNamedInputSources = false; caps.CanDriverPanel = false; caps.HasInternalDither = false; caps.ExclusiveModeDescription = MPT_USTRING("Use direct mode"); @@ -133,6 +135,10 @@ //------------------------------ { MPT_TRACE(); + if(m_Settings.InputChannels > 0) + { + return false; + } WAVEFORMATEXTENSIBLE wfext; if(!FillWaveFormatExtensible(wfext, m_Settings)) { @@ -265,7 +271,7 @@ { nLatency += m_nWaveBufferSize; SourceAudioPreRead(m_nWaveBufferSize / bytesPerFrame, nLatency / bytesPerFrame); - SourceAudioRead(m_WaveBuffers[m_nWriteBuffer].lpData, m_nWaveBufferSize / bytesPerFrame); + SourceAudioRead(m_WaveBuffers[m_nWriteBuffer].lpData, nullptr, m_nWaveBufferSize / bytesPerFrame); nBytesWritten += m_nWaveBufferSize; m_WaveBuffers[m_nWriteBuffer].dwBufferLength = m_nWaveBufferSize; InterlockedIncrement(&m_nBuffersPending); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2015-05-22 18:57:32
|
Revision: 5135 http://sourceforge.net/p/modplug/code/5135 Author: manxorist Date: 2015-05-22 18:57:26 +0000 (Fri, 22 May 2015) Log Message: ----------- [Ref] Add -Wcast-qual option to Makefile builds. -Wcast-qual emits a warning when a C-style cast casts away constness or volatility. const_cast does not trigger a warning. This enforces const-correctness when no const_cast is used. Fix the fallout. Modified Paths: -------------- trunk/OpenMPT/Makefile trunk/OpenMPT/libopenmpt/libopenmpt_c.cpp trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c trunk/OpenMPT/soundlib/Load_mdl.cpp trunk/OpenMPT/soundlib/Load_med.cpp Modified: trunk/OpenMPT/Makefile =================================================================== --- trunk/OpenMPT/Makefile 2015-05-21 15:39:09 UTC (rev 5134) +++ trunk/OpenMPT/Makefile 2015-05-22 18:57:26 UTC (rev 5135) @@ -291,8 +291,8 @@ CFLAGS += -g endif -CXXFLAGS += -Wall -Wextra -Wcast-align $(CXXFLAGS_WARNINGS) -CFLAGS += -Wall -Wextra -Wcast-align $(CFLAGS_WARNINGS) +CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align $(CXXFLAGS_WARNINGS) +CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align $(CFLAGS_WARNINGS) endif Modified: trunk/OpenMPT/libopenmpt/libopenmpt_c.cpp =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt_c.cpp 2015-05-21 15:39:09 UTC (rev 5134) +++ trunk/OpenMPT/libopenmpt/libopenmpt_c.cpp 2015-05-22 18:57:26 UTC (rev 5135) @@ -156,7 +156,7 @@ void openmpt_free_string( const char * str ) { try { - std::free( (void*)str ); + std::free( const_cast< char * >( str ) ); } catch ( ... ) { openmpt::report_exception( __FUNCTION__ ); } Modified: trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c 2015-05-21 15:39:09 UTC (rev 5134) +++ trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c 2015-05-22 18:57:26 UTC (rev 5135) @@ -81,8 +81,8 @@ openmpt_module* mod; signed short* buf; signed int* mixerbuf; - const char* name; - const char* message; + char* name; + char* message; ModPlug_Settings settings; ModPlugMixerProc mixerproc; unsigned char * * patterns; @@ -124,6 +124,8 @@ LIBOPENMPT_MODPLUG_API ModPlugFile* ModPlug_Load(const void* data, int size) { ModPlugFile* file = malloc(sizeof(ModPlugFile)); + const char* name = NULL; + const char* message = NULL; if(!file) return NULL; memset(file,0,sizeof(ModPlugFile)); memcpy(&file->settings,&globalsettings,sizeof(ModPlug_Settings)); @@ -139,8 +141,34 @@ return NULL; } openmpt_module_set_repeat_count(file->mod,file->settings.mLoopCount); - file->name = openmpt_module_get_metadata(file->mod,"title"); - file->message = openmpt_module_get_metadata(file->mod,"message"); + name = openmpt_module_get_metadata(file->mod,"title"); + if(name){ + file->name = malloc(strlen(name)+1); + if(file->name){ + strcpy(file->name,name); + } + openmpt_free_string(name); + name = NULL; + }else{ + file->name = malloc(strlen("")+1); + if(file->name){ + strcpy(file->name,""); + } + } + message = openmpt_module_get_metadata(file->mod,"message"); + if(message){ + file->message = malloc(strlen(message)+1); + if(file->message){ + strcpy(file->message,message); + } + openmpt_free_string(message); + message = NULL; + }else{ + file->message = malloc(strlen("")+1); + if(file->message){ + strcpy(file->message,""); + } + } #ifndef LIBOPENMPT_MODPLUG_0_8_7 openmpt_module_set_render_param(file->mod,OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT,file->settings.mStereoSeparation*100/128); #endif @@ -168,9 +196,9 @@ } openmpt_module_destroy(file->mod); file->mod = NULL; - openmpt_free_string(file->name); + free(file->name); file->name = NULL; - openmpt_free_string(file->message); + free(file->message); file->message = NULL; free(file->buf); file->buf = NULL; @@ -423,7 +451,7 @@ LIBOPENMPT_MODPLUG_API char* ModPlug_GetMessage(ModPlugFile* file) { if(!file) return NULL; - return (char*)file->message; + return file->message; } LIBOPENMPT_MODPLUG_API unsigned int ModPlug_NumInstruments(ModPlugFile* file) Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp =================================================================== --- trunk/OpenMPT/soundlib/Load_mdl.cpp 2015-05-21 15:39:09 UTC (rev 5134) +++ trunk/OpenMPT/soundlib/Load_mdl.cpp 2015-05-22 18:57:26 UTC (rev 5135) @@ -309,7 +309,7 @@ const uint8 *lpStream = reinterpret_cast<const uint8 *>(file.GetRawData()); DWORD dwMemPos, dwPos, blocklen, dwTrackPos; - MDLInfoBlock *pmib; + const MDLInfoBlock *pmib; UINT i,j, norders = 0, npatterns = 0, ntracks = 0; UINT ninstruments = 0, nsamples = 0; WORD block; @@ -352,7 +352,7 @@ #ifdef MDL_LOG Log("infoblock: %d bytes\n", blocklen); #endif - pmib = (MDLInfoBlock *)(lpStream+dwMemPos); + pmib = (const MDLInfoBlock *)(lpStream+dwMemPos); mpt::String::Read<mpt::String::maybeNullTerminated>(songName, pmib->songname); mpt::String::Read<mpt::String::maybeNullTerminated>(songArtist, pmib->composer); Modified: trunk/OpenMPT/soundlib/Load_med.cpp =================================================================== --- trunk/OpenMPT/soundlib/Load_med.cpp 2015-05-21 15:39:09 UTC (rev 5134) +++ trunk/OpenMPT/soundlib/Load_med.cpp 2015-05-22 18:57:26 UTC (rev 5135) @@ -568,11 +568,11 @@ dwSmplArr = BigEndian(pmmh.smplarr); dwExpData = BigEndian(pmmh.expdata); if ((dwExpData) && (dwExpData < dwMemLength - sizeof(MMD0EXP))) - pmex = (MMD0EXP *)(lpStream+dwExpData); + pmex = (const MMD0EXP *)(lpStream+dwExpData); else pmex = NULL; - pmsh = (MMD0SONGHEADER *)(lpStream + dwSong); - pmsh2 = (MMD2SONGHEADER *)pmsh; + pmsh = (const MMD0SONGHEADER *)(lpStream + dwSong); + pmsh2 = (const MMD2SONGHEADER *)pmsh; #ifdef MED_LOG if (version < '2') { @@ -716,7 +716,7 @@ } if ((pseq) && (pseq < dwMemLength - sizeof(MMD2PLAYSEQ))) { - MMD2PLAYSEQ *pmps = (MMD2PLAYSEQ *)(lpStream + pseq); + const MMD2PLAYSEQ *pmps = (const MMD2PLAYSEQ *)(lpStream + pseq); if(songName.empty()) mpt::String::Read<mpt::String::maybeNullTerminated>(songName, pmps->name); uint16 n = BigEndianW(pmps->length); if (pseq+n <= dwMemLength) @@ -816,14 +816,14 @@ { UINT dwPos = BigEndian(pdwTable[iSmp]); if ((dwPos >= dwMemLength) || (dwPos + sizeof(MMDSAMPLEHEADER) >= dwMemLength)) continue; - MMDSAMPLEHEADER *psdh = (MMDSAMPLEHEADER *)(lpStream + dwPos); + const MMDSAMPLEHEADER *psdh = (const MMDSAMPLEHEADER *)(lpStream + dwPos); UINT len = BigEndian(psdh->length); #ifdef MED_LOG Log("SampleData %d: stype=0x%02X len=%d\n", iSmp, BigEndianW(psdh->type), len); #endif if(dwPos + len + 6 > dwMemLength) len = 0; UINT stype = BigEndianW(psdh->type); - char *psdata = (char *)(lpStream + dwPos + 6); + const char *psdata = (const char *)(lpStream + dwPos + 6); SampleIO sampleIO( SampleIO::_8bit, @@ -899,13 +899,13 @@ } } else { - MMD1BLOCK *pmb = (MMD1BLOCK *)(lpStream + dwPos); + const MMD1BLOCK *pmb = (const MMD1BLOCK *)(lpStream + dwPos); #ifdef MED_LOG Log("MMD1BLOCK: lines=%2d, tracks=%2d, offset=0x%04X\n", BigEndianW(pmb->lines), BigEndianW(pmb->numtracks), BigEndian(pmb->info)); #endif - MMD1BLOCKINFO *pbi = NULL; - BYTE *pcmdext = NULL; + const MMD1BLOCKINFO *pbi = NULL; + const BYTE *pcmdext = NULL; lines = (pmb->lines >> 8) + 1; tracks = pmb->numtracks >> 8; if (!tracks) tracks = m_nChannels; @@ -913,7 +913,7 @@ DWORD dwBlockInfo = BigEndian(pmb->info); if ((dwBlockInfo) && (dwBlockInfo < dwMemLength - sizeof(MMD1BLOCKINFO))) { - pbi = (MMD1BLOCKINFO *)(lpStream + dwBlockInfo); + pbi = (const MMD1BLOCKINFO *)(lpStream + dwBlockInfo); #ifdef MED_LOG Log(" BLOCKINFO: blockname=0x%04X namelen=%d pagetable=0x%04X &cmdexttable=0x%04X\n", BigEndian(pbi->blockname), BigEndian(pbi->blocknamelen), BigEndian(pbi->pagetable), BigEndian(pbi->cmdexttable)); @@ -924,7 +924,7 @@ UINT namelen = BigEndian(pbi->blocknamelen); if ((nameofs < dwMemLength) && (namelen < dwMemLength - nameofs)) { - Patterns[iBlk].SetName((char *)(lpStream + nameofs), namelen); + Patterns[iBlk].SetName((const char *)(lpStream + nameofs), namelen); } } if (pbi->cmdexttable) @@ -935,7 +935,7 @@ cmdexttable = BigEndian(*const_unaligned_ptr_le<DWORD>(lpStream + cmdexttable)); if ((cmdexttable) && (cmdexttable <= dwMemLength - lines*tracks)) { - pcmdext = (BYTE *)(lpStream + cmdexttable); + pcmdext = (const BYTE *)(lpStream + cmdexttable); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |