diff --git a/Externals/MusicMod/Player/Player.vcproj b/Externals/MusicMod/Player/Player.vcproj index 4b7df6c15f..a9d38bb8b0 100644 --- a/Externals/MusicMod/Player/Player.vcproj +++ b/Externals/MusicMod/Player/Player.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\Source\Core\Common\Src" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="0" diff --git a/Externals/MusicMod/Player/Src/DspPlugin.cpp b/Externals/MusicMod/Player/Src/DspPlugin.cpp index 40988eb8c8..1026124591 100644 --- a/Externals/MusicMod/Player/Src/DspPlugin.cpp +++ b/Externals/MusicMod/Player/Src/DspPlugin.cpp @@ -86,7 +86,7 @@ bool DspPlugin::Load() { // Note: The prefix is not removed to hide their // origin at Nullsoft! It just reads easier. - if( !strnicmp( header->description, "nullsoft ", 9 ) ) + if( !_strnicmp( header->description, "nullsoft ", 9 ) ) { header->description += 9; } diff --git a/Externals/MusicMod/Player/Src/GenPlugin.cpp b/Externals/MusicMod/Player/Src/GenPlugin.cpp index 8856229bbe..9404237340 100644 --- a/Externals/MusicMod/Player/Src/GenPlugin.cpp +++ b/Externals/MusicMod/Player/Src/GenPlugin.cpp @@ -97,7 +97,7 @@ bool GenPlugin::Load() { // Note: The prefix is not removed to hide their // origin at Nullsoft! It just reads easier. - if( !strnicmp( plugin->description, "nullsoft ", 9 ) ) + if( !_strnicmp( plugin->description, "nullsoft ", 9 ) ) { plugin->description += 9; } @@ -106,7 +106,7 @@ bool GenPlugin::Load() char * walk = plugin->description + strlen( plugin->description ) - 5; while( true ) { - if( ( walk <= plugin->description ) || strnicmp( walk, ".dll)", 5 ) ) break; + if( ( walk <= plugin->description ) || _strnicmp( walk, ".dll)", 5 ) ) break; while( ( walk > plugin->description ) && ( *walk != '(' ) ) walk--; if( walk <= plugin->description ) break; walk--; diff --git a/Externals/MusicMod/Player/Src/InputPlugin.cpp b/Externals/MusicMod/Player/Src/InputPlugin.cpp index 59fed72c55..ac294749f6 100644 --- a/Externals/MusicMod/Player/Src/InputPlugin.cpp +++ b/Externals/MusicMod/Player/Src/InputPlugin.cpp @@ -121,10 +121,10 @@ bool InputPlugin::Load() { // Note: The prefix is not removed to hide their // origin at Nullsoft! It just reads easier. - if( !strnicmp( plugin->description, "nullsoft ", 9 ) ) + if( !_strnicmp( plugin->description, "nullsoft ", 9 ) ) { plugin->description += 9; - if( !strnicmp( plugin->description, "mpeg(layer1-3/ct aac+/dolby aac) ", 33 ) ) + if( !_strnicmp( plugin->description, "mpeg(layer1-3/ct aac+/dolby aac) ", 33 ) ) { plugin->description += ( 33 - 5 ); memcpy( plugin->description, "MPEG", 4 * sizeof( char ) ); diff --git a/Externals/MusicMod/Player/Src/OutputPlugin.cpp b/Externals/MusicMod/Player/Src/OutputPlugin.cpp index 3138e85b70..30653d9ed4 100644 --- a/Externals/MusicMod/Player/Src/OutputPlugin.cpp +++ b/Externals/MusicMod/Player/Src/OutputPlugin.cpp @@ -118,7 +118,7 @@ bool OutputPlugin::Load() { // Note: The prefix is not removed to hide their // origin at Nullsoft! It just reads easier. - if( !strnicmp( plugin->description, "nullsoft ", 9 ) ) + if( !_strnicmp( plugin->description, "nullsoft ", 9 ) ) { plugin->description += 9; } diff --git a/Externals/MusicMod/Player/Src/VisPlugin.cpp b/Externals/MusicMod/Player/Src/VisPlugin.cpp index c25262e715..9259078929 100644 --- a/Externals/MusicMod/Player/Src/VisPlugin.cpp +++ b/Externals/MusicMod/Player/Src/VisPlugin.cpp @@ -85,7 +85,7 @@ bool VisPlugin::Load() { // Note: The prefix is not removed to hide their // origin at Nullsoft! It just reads easier. - if( !strnicmp( header->description, "nullsoft ", 9 ) ) + if( !_strnicmp( header->description, "nullsoft ", 9 ) ) { header->description += 9; } diff --git a/Externals/MusicMod/TestPlayer/TestPlayer.vcproj b/Externals/MusicMod/TestPlayer/TestPlayer.vcproj index d19f9f460b..c29d9108ef 100644 --- a/Externals/MusicMod/TestPlayer/TestPlayer.vcproj +++ b/Externals/MusicMod/TestPlayer/TestPlayer.vcproj @@ -102,7 +102,7 @@ /> + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> diff --git a/Source/MusicMod.sln b/Source/MusicMod.sln index 0c97184944..1c5490e3b7 100644 --- a/Source/MusicMod.sln +++ b/Source/MusicMod.sln @@ -130,18 +130,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL", "Plugins\ {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MusicMod", "MusicMod", "{77CF6E34-3038-4B23-A2E7-90AD17801609}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{5C17B1EB-6C76-438A-A503-8F3C7831023B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", "{4F427D1B-8C90-4D9C-B23D-A51493A1C471}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dolphin", "Dolphin", "{61C7F431-0623-4A8D-9C4B-EDE35696554A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcproj", "{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Externals\MusicMod\Common\Common.vcproj", "{DE7C596C-CBC4-4278-8909-146D63990803}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "..\Externals\MusicMod\Main\Main.vcproj", "{95CCAABC-7062-47C4-B8C1-A064DD5F16FF}" ProjectSection(ProjectDependencies) = postProject {0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {0B72B5D6-5D72-4391-84A7-9CCA5392668A}