From b6fe9968a1d8fe06aed7269ba1107be969af69de Mon Sep 17 00:00:00 2001 From: Grigory Chudov Date: Mon, 19 Feb 2018 12:31:02 -0500 Subject: [PATCH] Upgraade solution to Visual Studio 2017 --- .gitignore | 13 +++ CUEPlayer/Deck.cs | 4 +- CUEPlayer/Icecast.cs | 2 +- CUERipper/Program.cs | 2 +- CUERipper/frmCUERipper.cs | 4 +- CUETools.AVX/CUETools.AVX.vcxproj | 7 +- CUETools.AccurateRip/AccurateRip.cs | 3 +- CUETools.CTDB/CUETools.CTDB.csproj | 1 + CUETools.CTDB/CUEToolsDB.cs | 2 +- .../CUETools.Codecs.APE.vcxproj | 7 +- .../CUETools.Codecs.FLAC.vcxproj | 8 +- CUETools.Codecs.HDCD/HDCDDotNet.cs | 2 +- .../CUETools.Codecs.TTA.vcxproj | 7 +- .../CUETools.Codecs.WavPack.vcxproj | 7 +- CUETools.Codecs/LpcContext.cs | 6 +- CUETools/CUETools.sln | 87 +++++++++--------- MAC_SDK/Source/MACLib/Assembly/Assembly.nas | 2 +- MAC_SDK/Source/MACLib/Assembly/Assembly.obj | Bin 836 -> 818 bytes MAC_SDK/Source/MACLib/MACLib.vcxproj | 12 ++- flac/src/libFLAC/libFLAC_static.vcxproj | 11 ++- ttalib-1.1/TTALib.vcxproj | 7 +- wavpack-4.5.0/src/libwavpack.vcxproj | 7 +- 22 files changed, 132 insertions(+), 69 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f1a6cfd --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +.vs/ +obj/ +bin/ +lib/ +Release/ +*.vcxproj.user +*.csproj.user +*.sdf +*.suo +*.opensdf +Win32/ +x64/ +ia32/ diff --git a/CUEPlayer/Deck.cs b/CUEPlayer/Deck.cs index d21f0f1..1ec7262 100644 --- a/CUEPlayer/Deck.cs +++ b/CUEPlayer/Deck.cs @@ -160,7 +160,7 @@ namespace CUEPlayer } } while (true); } - catch (Exception ex) + catch (Exception) { } if (playingCue != null) @@ -198,7 +198,7 @@ namespace CUEPlayer needUpdate = true; UpdateDeck(); } - catch (Exception ex) + catch (Exception) { playingStart = playingFinish = 0; playingCue = null; diff --git a/CUEPlayer/Icecast.cs b/CUEPlayer/Icecast.cs index b0cf3f5..de56dac 100644 --- a/CUEPlayer/Icecast.cs +++ b/CUEPlayer/Icecast.cs @@ -69,7 +69,7 @@ namespace CUEPlayer { _icecastWriter.Write(result); } - catch (Exception ex) + catch (Exception) { close = true; } diff --git a/CUERipper/Program.cs b/CUERipper/Program.cs index 8140a4b..221af15 100644 --- a/CUERipper/Program.cs +++ b/CUERipper/Program.cs @@ -43,7 +43,7 @@ namespace CUERipper { deploy.DownloadFileGroup(groupName); } - catch (DeploymentException de) + catch (DeploymentException) { // Log error. Do not report this error to the user, because a satellite // assembly may not exist if the user's culture and the application's diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs index 8d2b0b5..1d8a26b 100644 --- a/CUERipper/frmCUERipper.cs +++ b/CUERipper/frmCUERipper.cs @@ -1446,7 +1446,7 @@ namespace CUERipper } List albumArt = new List(); - int currentAlbumArt = 0, frontAlbumArt = -1; + int currentAlbumArt = 0;//, frontAlbumArt = -1; private void ResetAlbumArt() { @@ -1490,7 +1490,7 @@ namespace CUERipper var cueSheet = args.cueSheet; albumArt.Clear(); currentAlbumArt = 0; - frontAlbumArt = -1; + //frontAlbumArt = -1; var knownUrls = new List(); var firstUrls = new List(); diff --git a/CUETools.AVX/CUETools.AVX.vcxproj b/CUETools.AVX/CUETools.AVX.vcxproj index ee17ab5..940005a 100644 --- a/CUETools.AVX/CUETools.AVX.vcxproj +++ b/CUETools.AVX/CUETools.AVX.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,28 +22,33 @@ {CC022842-F2E9-4016-82B8-65A264B642D5} ManagedCProj CUEToolsAVX + 10.0.16299.0 DynamicLibrary true Unicode + v141 DynamicLibrary true Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode true + v141 diff --git a/CUETools.AccurateRip/AccurateRip.cs b/CUETools.AccurateRip/AccurateRip.cs index 4db908d..04d75fd 100644 --- a/CUETools.AccurateRip/AccurateRip.cs +++ b/CUETools.AccurateRip/AccurateRip.cs @@ -403,7 +403,6 @@ namespace CUETools.AccurateRip if (prefixSamples < 0 || prefixSamples >= maxOffset || suffixSamples < 0 || suffixSamples > maxOffset) throw new ArgumentOutOfRangeException(); - uint crc; if (iTrack == 0) { int discLen = ((int)_toc.AudioLength - (int)TOC.Pregap) * 588; @@ -1262,7 +1261,7 @@ namespace CUETools.AccurateRip respStream.Close(); myOffsetsSaved.Close(); } - catch (WebException ex) + catch (WebException) { driveReadOffset = 0; return false; diff --git a/CUETools.CTDB/CUETools.CTDB.csproj b/CUETools.CTDB/CUETools.CTDB.csproj index 4435451..25ba842 100644 --- a/CUETools.CTDB/CUETools.CTDB.csproj +++ b/CUETools.CTDB/CUETools.CTDB.csproj @@ -31,6 +31,7 @@ false false true + false true diff --git a/CUETools.CTDB/CUEToolsDB.cs b/CUETools.CTDB/CUEToolsDB.cs index 0aa16f0..63597d5 100644 --- a/CUETools.CTDB/CUEToolsDB.cs +++ b/CUETools.CTDB/CUEToolsDB.cs @@ -98,7 +98,7 @@ namespace CUETools.CTDB this.QueryExceptionMessage = resp.StatusDescription; if (this.QueryResponseStatus == HttpStatusCode.OK) { - // XmlSerializer serializer = new XmlSerializer(typeof(CTDBResponse)); + //XmlSerializer serializer = new XmlSerializer(typeof(CTDBResponse)); XmlSerializer serializer = new Microsoft.Xml.Serialization.GeneratedAssembly.CTDBResponseSerializer(); this.total = 0; using (Stream responseStream = resp.GetResponseStream()) diff --git a/CUETools.Codecs.APE/CUETools.Codecs.APE.vcxproj b/CUETools.Codecs.APE/CUETools.Codecs.APE.vcxproj index 3cacfbf..be0d692 100644 --- a/CUETools.Codecs.APE/CUETools.Codecs.APE.vcxproj +++ b/CUETools.Codecs.APE/CUETools.Codecs.APE.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,6 +23,7 @@ v2.0 CUETools.Codecs.APE ManagedCProj + 10.0.16299.0 @@ -30,22 +31,26 @@ Unicode true true + v141 DynamicLibrary Unicode true + v141 DynamicLibrary Unicode true true + v141 DynamicLibrary Unicode true + v141 diff --git a/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcxproj b/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcxproj index ddd45e8..62c989a 100644 --- a/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcxproj +++ b/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,6 +23,7 @@ v2.0 CUETools.Codecs.FLAC ManagedCProj + 10.0.16299.0 @@ -30,23 +31,26 @@ Unicode true true + v141 DynamicLibrary Unicode true + v141 DynamicLibrary Unicode true true - v90 + v141 DynamicLibrary Unicode true + v141 diff --git a/CUETools.Codecs.HDCD/HDCDDotNet.cs b/CUETools.Codecs.HDCD/HDCDDotNet.cs index 31c22ef..1983e53 100644 --- a/CUETools.Codecs.HDCD/HDCDDotNet.cs +++ b/CUETools.Codecs.HDCD/HDCDDotNet.cs @@ -246,7 +246,7 @@ namespace HDCDDotNet private AudioBuffer _audioBuffer; private IntPtr _decoder; - private int[,] _inSampleBuffer; + //private int[,] _inSampleBuffer; private int[,] _outSampleBuffer; private int _channelCount, _bitsPerSample; hdcd_decoder_write_callback _decoderCallback; diff --git a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj index aa22b8d..8d60c53 100644 --- a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj +++ b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,6 +23,7 @@ v2.0 CUEToolsCodecsTTA ManagedCProj + 10.0.16299.0 @@ -30,22 +31,26 @@ Unicode true true + v141 DynamicLibrary Unicode true + v141 DynamicLibrary Unicode true true + v141 DynamicLibrary Unicode true + v141 diff --git a/CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.vcxproj b/CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.vcxproj index c3fae68..4222156 100644 --- a/CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.vcxproj +++ b/CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,6 +23,7 @@ v2.0 CUETools.Codecs.WavPack ManagedCProj + 10.0.16299.0 @@ -30,22 +31,26 @@ Unicode true true + v141 DynamicLibrary Unicode true + v141 DynamicLibrary Unicode true true + v141 DynamicLibrary Unicode true + v141 diff --git a/CUETools.Codecs/LpcContext.cs b/CUETools.Codecs/LpcContext.cs index 2337b24..678d604 100644 --- a/CUETools.Codecs/LpcContext.cs +++ b/CUETools.Codecs/LpcContext.cs @@ -145,9 +145,9 @@ namespace CUETools.Codecs if (secs[i] >= lpc.MAX_LPC_SECTIONS - 1) { throw new IndexOutOfRangeException(); - window_sections[secs[i] - 1].m_type = LpcWindowSection.SectionType.Data; - window_sections[secs[i] - 1].m_end = boundaries[j + 1]; - continue; + //window_sections[secs[i] - 1].m_type = LpcWindowSection.SectionType.Data; + //window_sections[secs[i] - 1].m_end = boundaries[j + 1]; + //continue; } window_sections[secs[i]].setData(boundaries[j], boundaries[j + 1]); window_sections[secs[i]++].m_type = types[i, j]; diff --git a/CUETools/CUETools.sln b/CUETools/CUETools.sln index 5eec664..a84636d 100644 --- a/CUETools/CUETools.sln +++ b/CUETools/CUETools.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodecLibs", "CodecLibs", "{8B179853-B7D6-479C-B8B2-6CBCE835D040}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BWGBurn", "BWGBurn", "{B36BE134-D85A-437E-AB61-2DA1CCDE06C1}" @@ -185,9 +187,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.eac3to", "..\CUETools.eac3to\CUETools.eac3to.csproj", "{E3FF7539-6B22-4922-8FEF-6D26F2C2E3CE}" EndProject Global - GlobalSection(TestCaseManagementSettings) = postSolution - CategoryFile = CUETools1.vsmdi - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms @@ -1112,57 +1111,63 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {8B179853-B7D6-479C-B8B2-6CBCE835D040} = {39A17A65-E893-44B8-A312-DDCDD990D9D1} + {B36BE134-D85A-437E-AB61-2DA1CCDE06C1} = {90FD290C-5D65-42A6-AC9C-928730432116} {39A17A65-E893-44B8-A312-DDCDD990D9D1} = {FD0D49DB-8F02-4A64-A9A3-A5AF54481770} {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} = {FD0D49DB-8F02-4A64-A9A3-A5AF54481770} {FD1DD69E-EC51-443D-B6A7-908B8E0EF9E2} = {FD0D49DB-8F02-4A64-A9A3-A5AF54481770} - {32338A04-5B6B-4C63-8EE7-C6400F73B5D7} = {FD0D49DB-8F02-4A64-A9A3-A5AF54481770} - {B36BE134-D85A-437E-AB61-2DA1CCDE06C1} = {90FD290C-5D65-42A6-AC9C-928730432116} - {8CF07381-BEA2-4AFC-B3DD-9B2F21C65A3A} = {90FD290C-5D65-42A6-AC9C-928730432116} - {39B43BBB-BAFC-4D85-9BEA-3BCB7EFED89C} = {90FD290C-5D65-42A6-AC9C-928730432116} - {D2700165-3E77-4B28-928D-551F5FC11954} = {90FD290C-5D65-42A6-AC9C-928730432116} - {2D8D7A03-DFFA-44EF-9299-8BB56D122245} = {90FD290C-5D65-42A6-AC9C-928730432116} - {A5A8D8FA-9E32-4010-8AAF-AE580C5AF728} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {A574F3B1-E38B-4EE4-9394-49D6E2DF52EA} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {9253A314-1821-42BF-B02F-2BF986B1765D} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {115CC5B0-0385-41CD-8A23-6A7EA4C51926} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {2379BAAF-A406-4477-BF53-2D6A326C24C8} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {8E6E1763-39AE-491D-A10F-44C8844ABA5B} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {1FCA8834-34E6-47CF-B53F-D8DF35345363} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {F8C29953-A697-4462-82DC-DA7146654A64} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {E3FF7539-6B22-4922-8FEF-6D26F2C2E3CE} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} - {8B179853-B7D6-479C-B8B2-6CBCE835D040} = {39A17A65-E893-44B8-A312-DDCDD990D9D1} + {9A0D1EB8-269E-4165-971C-541C96AA506F} = {5D823ABE-D280-4800-824C-2633CBAB2EA9} + {0E404B8B-FF82-427F-ADE4-77B54A29219F} = {5D823ABE-D280-4800-824C-2633CBAB2EA9} {E70FA90A-7012-4A52-86B5-362B699D1540} = {39A17A65-E893-44B8-A312-DDCDD990D9D1} {9AE965C4-301E-4C01-B90F-297AF341ACC6} = {39A17A65-E893-44B8-A312-DDCDD990D9D1} {CC2E74B6-534A-43D8-9F16-AC03FE955000} = {39A17A65-E893-44B8-A312-DDCDD990D9D1} - {1D1E99BC-6D22-41C0-BD94-FF4DD5EC725B} = {39A17A65-E893-44B8-A312-DDCDD990D9D1} {0B9C97D4-61B8-4294-A1DF-BA90752A1779} = {8B179853-B7D6-479C-B8B2-6CBCE835D040} {4CEFBC84-C215-11DB-8314-0800200C9A66} = {8B179853-B7D6-479C-B8B2-6CBCE835D040} {5CCCB9CF-0384-458F-BA08-72B73866840F} = {8B179853-B7D6-479C-B8B2-6CBCE835D040} - {B3DF599C-1C8F-451D-91E4-DD766210DA1F} = {8B179853-B7D6-479C-B8B2-6CBCE835D040} + {A5A8D8FA-9E32-4010-8AAF-AE580C5AF728} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} + {32338A04-5B6B-4C63-8EE7-C6400F73B5D7} = {FD0D49DB-8F02-4A64-A9A3-A5AF54481770} {F2EC7193-D5E5-4252-9803-5CEB407E910F} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} - {082D6B9E-326E-4D15-9798-EDAE9EDE70A6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} - {1AF02E2C-2CB2-44B5-B417-37653071FEC6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} - {DFE55765-564C-4B8F-993B-A94C4D1C212E} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} - {082D6B9E-326E-4D15-9798-DE70A6EDAE9E} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} - {E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} - {04945FB2-8410-4F14-8262-2ED18DCDACD6} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} - {A430AD28-B76A-4ED0-AF7D-D13B8969297F} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} - {5C8B61C0-BC3D-4316-B8A7-419D55BB5796} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} - {6C74652F-1EF4-459E-84F4-99D93D3D17DA} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} - {84EBB7CB-02C9-40A9-9D32-C641B822DAA2} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} + {8427CAA5-80B8-4952-9A68-5F3DFCFBDF40} = {FD1DD69E-EC51-443D-B6A7-908B8E0EF9E2} + {A574F3B1-E38B-4EE4-9394-49D6E2DF52EA} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} {B75FA7AD-968E-4990-B342-1B4B17C850DF} = {B36BE134-D85A-437E-AB61-2DA1CCDE06C1} {F2DFEB00-BB35-4665-85EA-CB8C7729A6B7} = {B36BE134-D85A-437E-AB61-2DA1CCDE06C1} {A05B6AA6-0EC3-495D-BCC4-ECE1210071A8} = {B36BE134-D85A-437E-AB61-2DA1CCDE06C1} - {8427CAA5-80B8-4952-9A68-5F3DFCFBDF40} = {FD1DD69E-EC51-443D-B6A7-908B8E0EF9E2} - {EA2CAE21-940C-4F51-A802-E02ABB97A9B5} = {FD1DD69E-EC51-443D-B6A7-908B8E0EF9E2} - {9A0D1EB8-269E-4165-971C-541C96AA506F} = {5D823ABE-D280-4800-824C-2633CBAB2EA9} - {0E404B8B-FF82-427F-ADE4-77B54A29219F} = {5D823ABE-D280-4800-824C-2633CBAB2EA9} - {816D964C-9772-46C5-AF1D-49E8C78A1E7C} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64} - {0AC7691C-562A-4879-8A11-6C7890BF659B} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64} - {8DD1E84B-0B03-4C0B-9B42-1E49F75E7CB1} = {7E402406-7E51-4F0D-8209-60824C1CD6E8} - {758285C6-1ACA-458A-9906-EE6701D5AF87} = {7E402406-7E51-4F0D-8209-60824C1CD6E8} + {8CF07381-BEA2-4AFC-B3DD-9B2F21C65A3A} = {90FD290C-5D65-42A6-AC9C-928730432116} + {9253A314-1821-42BF-B02F-2BF986B1765D} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} + {39B43BBB-BAFC-4D85-9BEA-3BCB7EFED89C} = {90FD290C-5D65-42A6-AC9C-928730432116} {5ADCFD6D-BFEA-4B10-BB45-9083BBB56AF4} = {7E402406-7E51-4F0D-8209-60824C1CD6E8} + {B3DF599C-1C8F-451D-91E4-DD766210DA1F} = {8B179853-B7D6-479C-B8B2-6CBCE835D040} + {1D1E99BC-6D22-41C0-BD94-FF4DD5EC725B} = {39A17A65-E893-44B8-A312-DDCDD990D9D1} + {115CC5B0-0385-41CD-8A23-6A7EA4C51926} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} + {082D6B9E-326E-4D15-9798-EDAE9EDE70A6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} + {2379BAAF-A406-4477-BF53-2D6A326C24C8} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} + {8E6E1763-39AE-491D-A10F-44C8844ABA5B} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} + {04945FB2-8410-4F14-8262-2ED18DCDACD6} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} + {A430AD28-B76A-4ED0-AF7D-D13B8969297F} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} + {EA2CAE21-940C-4F51-A802-E02ABB97A9B5} = {FD1DD69E-EC51-443D-B6A7-908B8E0EF9E2} + {D2700165-3E77-4B28-928D-551F5FC11954} = {90FD290C-5D65-42A6-AC9C-928730432116} + {5C8B61C0-BC3D-4316-B8A7-419D55BB5796} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} + {6C74652F-1EF4-459E-84F4-99D93D3D17DA} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} + {8DD1E84B-0B03-4C0B-9B42-1E49F75E7CB1} = {7E402406-7E51-4F0D-8209-60824C1CD6E8} + {1AF02E2C-2CB2-44B5-B417-37653071FEC6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} + {2D8D7A03-DFFA-44EF-9299-8BB56D122245} = {90FD290C-5D65-42A6-AC9C-928730432116} + {DFE55765-564C-4B8F-993B-A94C4D1C212E} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} + {1FCA8834-34E6-47CF-B53F-D8DF35345363} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} + {758285C6-1ACA-458A-9906-EE6701D5AF87} = {7E402406-7E51-4F0D-8209-60824C1CD6E8} + {816D964C-9772-46C5-AF1D-49E8C78A1E7C} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64} + {84EBB7CB-02C9-40A9-9D32-C641B822DAA2} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4} + {0AC7691C-562A-4879-8A11-6C7890BF659B} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64} + {F8C29953-A697-4462-82DC-DA7146654A64} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} {6B143A39-C7B2-4743-9917-92262C60E9A6} = {7E402406-7E51-4F0D-8209-60824C1CD6E8} {7EA4160F-3BBD-47C9-A38C-4053B64B24A8} = {7E402406-7E51-4F0D-8209-60824C1CD6E8} + {082D6B9E-326E-4D15-9798-DE70A6EDAE9E} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} + {E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D} + {E3FF7539-6B22-4922-8FEF-6D26F2C2E3CE} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C634D169-5814-4203-94B6-6A11371DDA95} + EndGlobalSection + GlobalSection(TestCaseManagementSettings) = postSolution + CategoryFile = CUETools1.vsmdi EndGlobalSection EndGlobal diff --git a/MAC_SDK/Source/MACLib/Assembly/Assembly.nas b/MAC_SDK/Source/MACLib/Assembly/Assembly.nas index 74e4eaa..70140a5 100644 --- a/MAC_SDK/Source/MACLib/Assembly/Assembly.nas +++ b/MAC_SDK/Source/MACLib/Assembly/Assembly.nas @@ -178,4 +178,4 @@ return: popad and eax, byte 1 endproc - end +; end diff --git a/MAC_SDK/Source/MACLib/Assembly/Assembly.obj b/MAC_SDK/Source/MACLib/Assembly/Assembly.obj index 66a66f21b3eed62fa2c9f033120a38a81cbaac67..19dc1a8b0ba8a0673f24d07d6bd37ea3dba0ed6e 100644 GIT binary patch delta 26 hcmX@Ywuz0`hmnyXk*zzbhLM3mXd~}JrpX7GS^!q|2J-*_ delta 36 pcmdnQc7%=BhmnzCZ?RTj4I=}C@J8N+Oq{8CDGVUsFnK9cF94)z2*CgV diff --git a/MAC_SDK/Source/MACLib/MACLib.vcxproj b/MAC_SDK/Source/MACLib/MACLib.vcxproj index 25e3f50..bafd7b2 100644 --- a/MAC_SDK/Source/MACLib/MACLib.vcxproj +++ b/MAC_SDK/Source/MACLib/MACLib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,32 @@ {0B9C97D4-61B8-4294-A1DF-BA90752A1779} v2.0 MACLib + 10.0.16299.0 StaticLibrary false Unicode + v141 StaticLibrary false Unicode + v141 StaticLibrary false Unicode + v141 StaticLibrary false Unicode + v141 @@ -565,6 +570,11 @@ nasmw -d WIN32 -f win64 -o Assembly64.obj Assembly64.nas + + + true + + diff --git a/flac/src/libFLAC/libFLAC_static.vcxproj b/flac/src/libFLAC/libFLAC_static.vcxproj index 693edd4..aa7e758 100644 --- a/flac/src/libFLAC/libFLAC_static.vcxproj +++ b/flac/src/libFLAC/libFLAC_static.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,25 +22,26 @@ {4cefbc84-c215-11db-8314-0800200c9a66} libFLAC_static Win32Proj + 10.0.16299.0 StaticLibrary true - v90 + v141 StaticLibrary true - v90 + v141 StaticLibrary - v90 + v141 StaticLibrary - v90 + v141 diff --git a/ttalib-1.1/TTALib.vcxproj b/ttalib-1.1/TTALib.vcxproj index 53a7d78..62350e9 100644 --- a/ttalib-1.1/TTALib.vcxproj +++ b/ttalib-1.1/TTALib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,27 +23,32 @@ v2.0 TTALib ManagedCProj + 10.0.16299.0 StaticLibrary MultiByte false + v141 StaticLibrary MultiByte false + v141 StaticLibrary MultiByte false + v141 StaticLibrary MultiByte false + v141 diff --git a/wavpack-4.5.0/src/libwavpack.vcxproj b/wavpack-4.5.0/src/libwavpack.vcxproj index a882e5d..bb9e2a2 100644 --- a/wavpack-4.5.0/src/libwavpack.vcxproj +++ b/wavpack-4.5.0/src/libwavpack.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,19 +23,24 @@ v2.0 libwavpack Win32Proj + 10.0.16299.0 StaticLibrary + v141 StaticLibrary + v141 StaticLibrary + v141 StaticLibrary + v141