CW Cyrix's Git Repository Mirror
Browse code

Various updates:

* Fix build with Visual Studio, updating projects to Visual Studio 2019 (as that is what I have installed).
* Changed C++ language standard to C++ 17.
* Add files for in_2sf's spu from Coda's recent commit.
* Add files for zlib now that it is being included as a submodule (removes the need for the zlib DLL as well).
* Remove common.props (due to the aforementioned zlib inclusion as well as the winamp headers also being in the project now).
* Minor NCSF file in the SSEQ player, the check for when to process tracks should've been >=, not >.

Naram Qashat authored on 2021/03/15 22:34:25
Showing 12 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ 6311c58
... ... 
@@ -1,54 +1,54 @@
1 
-/*  Copyright 2009-2015 DeSmuME team
2 
-
3 
-	This file is free software: you can redistribute it and/or modify
4 
-	it under the terms of the GNU General Public License as published by
5 
-	the Free Software Foundation, either version 2 of the License, or
6 
-	(at your option) any later version.
7 
-
8 
-	This file is distributed in the hope that it will be useful,
9 
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 
-	GNU General Public License for more details.
12 
-
13 
-	You should have received a copy of the GNU General Public License
14 
-	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 
-*/
16 
-
17 
-//-------------------------
18 
-//this file contains the METASPU system
19 
-//which is designed to handle the task of audio synchronization
20 
-//and is designed to be as portable between multiple emulators
21 
-//-------------------------
22 
-
23 
-
24 
-#ifndef _METASPU_H_
25 
-#define _METASPU_H_
26 
-
27 
-#include <algorithm>
28 
-
29 
-#include "types.h"
30 
-
31 
-class ISynchronizingAudioBuffer
32 
-{
33 
-public:
34 
-  virtual ~ISynchronizingAudioBuffer() {}
35 
-
36 
-	virtual void enqueue_samples(s16* buf, int samples_provided) = 0;
37 
-
38 
-	//returns the number of samples actually supplied, which may not match the number requested
39 
-	virtual int output_samples(s16* buf, int samples_requested) = 0;
40 
-};
41 
-
42 
-enum ESynchMode
43 
-{
44 
-	ESynchMode_Synchronous
45 
-};
46 
-
47 
-enum ESynchMethod
48 
-{
49 
-	ESynchMethod_0, //Null
50 
-};
51 
-
52 
-ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method);
53 
-
54 
-#endif
1 
+/*  Copyright 2009-2015 DeSmuME team
2 
+
3 
+	This file is free software: you can redistribute it and/or modify
4 
+	it under the terms of the GNU General Public License as published by
5 
+	the Free Software Foundation, either version 2 of the License, or
6 
+	(at your option) any later version.
7 
+
8 
+	This file is distributed in the hope that it will be useful,
9 
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 
+	GNU General Public License for more details.
12 
+
13 
+	You should have received a copy of the GNU General Public License
14 
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 
+*/
16 
+
17 
+//-------------------------
18 
+//this file contains the METASPU system
19 
+//which is designed to handle the task of audio synchronization
20 
+//and is designed to be as portable between multiple emulators
21 
+//-------------------------
22 
+
23 
+
24 
+#ifndef _METASPU_H_
25 
+#define _METASPU_H_
26 
+
27 
+#include <algorithm>
28 
+
29 
+#include "../types.h"
30 
+
31 
+class ISynchronizingAudioBuffer
32 
+{
33 
+public:
34 
+  virtual ~ISynchronizingAudioBuffer() {}
35 
+
36 
+	virtual void enqueue_samples(s16* buf, int samples_provided) = 0;
37 
+
38 
+	//returns the number of samples actually supplied, which may not match the number requested
39 
+	virtual int output_samples(s16* buf, int samples_requested) = 0;
40 
+};
41 
+
42 
+enum ESynchMode
43 
+{
44 
+	ESynchMode_Synchronous
45 
+};
46 
+
47 
+enum ESynchMethod
48 
+{
49 
+	ESynchMethod_0, //Null
50 
+};
51 
+
52 
+ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method);
53 
+
54 
+#endif
src/in_2sf/in_2sf.vcxproj
History View file @ 6311c58
... ... 
@@ -14,29 +14,30 @@
14 14 
     <ProjectGuid>{1927E848-5CFF-4462-A5AB-2768A390C5F3}</ProjectGuid>
15 15 
     <Keyword>Win32Proj</Keyword>
16 16 
     <RootNamespace>in_2sf</RootNamespace>
17 
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
17 18 
   </PropertyGroup>
18 19 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 20 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20 21 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
21 22 
     <UseDebugLibraries>true</UseDebugLibraries>
22 23 
     <CharacterSet>Unicode</CharacterSet>
24 
+    <PlatformToolset>v142</PlatformToolset>
23 25 
   </PropertyGroup>
24 26 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25 27 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
26 28 
     <UseDebugLibraries>false</UseDebugLibraries>
27 29 
     <WholeProgramOptimization>true</WholeProgramOptimization>
28 30 
     <CharacterSet>Unicode</CharacterSet>
31 
+    <PlatformToolset>v142</PlatformToolset>
29 32 
   </PropertyGroup>
30 33 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31 34 
   <ImportGroup Label="ExtensionSettings">
32 35 
   </ImportGroup>
33 36 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
34 37 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
35 
-    <Import Project="..\in_xsf_framework\common.props" />
36 38 
   </ImportGroup>
37 39 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38 40 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39 
-    <Import Project="..\in_xsf_framework\common.props" />
40 41 
   </ImportGroup>
41 42 
   <PropertyGroup Label="UserMacros" />
42 43 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
... ... 
@@ -50,14 +51,13 @@
50 51 
       <WarningLevel>Level4</WarningLevel>
51 52 
       <Optimization>Disabled</Optimization>
52 53 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_2SF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;HAVE_LIBZ;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 55 
       <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
56 
+      <LanguageStandard>stdcpp17</LanguageStandard>
55 57 
     </ClCompile>
56 58 
     <Link>
57 59 
       <SubSystem>Windows</SubSystem>
58 60 
       <GenerateDebugInformation>true</GenerateDebugInformation>
59 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
60 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
61 61 
     </Link>
62 62 
   </ItemDefinitionGroup>
63 63 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -67,16 +67,15 @@
67 67 
       <FunctionLevelLinking>true</FunctionLevelLinking>
68 68 
       <IntrinsicFunctions>true</IntrinsicFunctions>
69 69 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_2SF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;HAVE_LIBZ;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
70 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71 71 
       <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 
+      <LanguageStandard>stdcpp17</LanguageStandard>
72 73 
     </ClCompile>
73 74 
     <Link>
74 75 
       <SubSystem>Windows</SubSystem>
75 76 
       <GenerateDebugInformation>true</GenerateDebugInformation>
76 77 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
77 78 
       <OptimizeReferences>true</OptimizeReferences>
78 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
79 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
80 79 
     </Link>
81 80 
   </ItemDefinitionGroup>
82 81 
   <ItemGroup>
... ... 
@@ -122,6 +121,10 @@
122 121 
     <ClCompile Include="desmume/thumb_instructions.cpp" />
123 122 
     <ClCompile Include="desmume/firmware.cpp" />
124 123 
     <ClCompile Include="desmume/slot1.cpp" />
124 
+    <ClCompile Include="spu\adpcmdecoder.cpp" />
125 
+    <ClCompile Include="spu\interpolator.cpp" />
126 
+    <ClCompile Include="spu\samplecache.cpp" />
127 
+    <ClCompile Include="spu\sampledata.cpp" />
125 128 
     <ClCompile Include="XSFConfig_2SF.cpp" />
126 129 
     <ClCompile Include="XSFPlayer_2SF.cpp" />
127 130 
   </ItemGroup>
... ... 
@@ -186,6 +189,10 @@
186 189 
     <ClInclude Include="desmume\FIFO.h" />
187 190 
     <ClInclude Include="desmume\SPU.h" />
188 191 
     <ClInclude Include="desmume\armcpu.h" />
192 
+    <ClInclude Include="spu\adpcmdecoder.h" />
193 
+    <ClInclude Include="spu\interpolator.h" />
194 
+    <ClInclude Include="spu\samplecache.h" />
195 
+    <ClInclude Include="spu\sampledata.h" />
189 196 
   </ItemGroup>
190 197 
   <ItemGroup>
191 198 
     <None Include="desmume\instruction_tabdef.inc" />
... ... 
@@ -199,4 +206,4 @@
199 206 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
200 207 
   <ImportGroup Label="ExtensionTargets">
201 208 
   </ImportGroup>
202 
-</Project>
209 
+</Project>
203 210 
\ No newline at end of file
src/in_2sf/in_2sf.vcxproj.filters
History View file @ 6311c58
... ... 
@@ -28,12 +28,6 @@
28 28 
     <Filter Include="Header Files\desmume\metaspu">
29 29 
       <UniqueIdentifier>{2e480556-28dd-4cf7-a818-ac973f0bdef7}</UniqueIdentifier>
30 30 
     </Filter>
31 
-    <Filter Include="Header Files\desmume\metaspu\SoundTouch">
32 
-      <UniqueIdentifier>{81492340-404e-4695-9649-bb4e89ed2693}</UniqueIdentifier>
33 
-    </Filter>
34 
-    <Filter Include="Source Files\desmume\metaspu\SoundTouch">
35 
-      <UniqueIdentifier>{4f7fbac4-f0a6-43ac-8c61-657966ea5660}</UniqueIdentifier>
36 
-    </Filter>
37 31 
     <Filter Include="Source Files\desmume\utils">
38 32 
       <UniqueIdentifier>{1a3eb159-8c0f-49aa-ac30-2bc578078bac}</UniqueIdentifier>
39 33 
     </Filter>
... ... 
@@ -58,179 +52,158 @@
58 52 
     <Filter Include="Source Files\desmume\utils\AsmJit\base">
59 53 
       <UniqueIdentifier>{3ca7e13f-394b-4d27-bdbf-135feb26480f}</UniqueIdentifier>
60 54 
     </Filter>
55 
+    <Filter Include="Source Files\spu">
56 
+      <UniqueIdentifier>{b1c5369c-9385-4580-9a15-4394f4e39907}</UniqueIdentifier>
57 
+    </Filter>
58 
+    <Filter Include="Header Files\spu">
59 
+      <UniqueIdentifier>{97c58dd3-5505-48b2-b115-2d0cbb8c1022}</UniqueIdentifier>
60 
+    </Filter>
61 61 
   </ItemGroup>
62 62 
   <ItemGroup>
63 63 
     <ClCompile Include="XSFPlayer_2SF.cpp">
64 64 
       <Filter>Source Files</Filter>
65 65 
     </ClCompile>
66 
-    <ClCompile Include="desmume\arm_instructions.cpp">
67 
-      <Filter>Source Files\desmume</Filter>
66 
+    <ClCompile Include="XSFConfig_2SF.cpp">
67 
+      <Filter>Source Files</Filter>
68 68 
     </ClCompile>
69 
-    <ClCompile Include="desmume\armcpu.cpp">
69 
+    <ClCompile Include="desmume/arm_instructions.cpp">
70 70 
       <Filter>Source Files\desmume</Filter>
71 71 
     </ClCompile>
72 
-    <ClCompile Include="desmume\bios.cpp">
72 
+    <ClCompile Include="desmume/arm_jit.cpp">
73 73 
       <Filter>Source Files\desmume</Filter>
74 74 
     </ClCompile>
75 
-    <ClCompile Include="desmume\cp15.cpp">
75 
+    <ClCompile Include="desmume/armcpu.cpp">
76 76 
       <Filter>Source Files\desmume</Filter>
77 77 
     </ClCompile>
78 
-    <ClCompile Include="desmume\emufile.cpp">
79 
-      <Filter>Source Files\desmume</Filter>
78 
+    <ClCompile Include="desmume/utils/AsmJit/base/assembler.cpp">
79 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
80 80 
     </ClCompile>
81 
-    <ClCompile Include="desmume\FIFO.cpp">
81 
+    <ClCompile Include="desmume/bios.cpp">
82 82 
       <Filter>Source Files\desmume</Filter>
83 83 
     </ClCompile>
84 
-    <ClCompile Include="desmume\firmware.cpp">
85 
-      <Filter>Source Files\desmume</Filter>
84 
+    <ClCompile Include="desmume/utils/AsmJit/base/codegen.cpp">
85 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
86 86 
     </ClCompile>
87 
-    <ClCompile Include="desmume\mc.cpp">
88 
-      <Filter>Source Files\desmume</Filter>
87 
+    <ClCompile Include="desmume/utils/AsmJit/base/compiler.cpp">
88 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
89 89 
     </ClCompile>
90 
-    <ClCompile Include="desmume\MMU.cpp">
91 
-      <Filter>Source Files\desmume</Filter>
90 
+    <ClCompile Include="desmume/utils/AsmJit/base/constpool.cpp">
91 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
92 92 
     </ClCompile>
93 
-    <ClCompile Include="desmume\NDSSystem.cpp">
94 
-      <Filter>Source Files\desmume</Filter>
93 
+    <ClCompile Include="desmume/utils/AsmJit/base/containers.cpp">
94 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
95 95 
     </ClCompile>
96 
-    <ClCompile Include="desmume\readwrite.cpp">
97 
-      <Filter>Source Files\desmume</Filter>
96 
+    <ClCompile Include="desmume/utils/AsmJit/base/context.cpp">
97 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
98 98 
     </ClCompile>
99 
-    <ClCompile Include="desmume\slot1.cpp">
99 
+    <ClCompile Include="desmume/cp15.cpp">
100 100 
       <Filter>Source Files\desmume</Filter>
101 101 
     </ClCompile>
102 
-    <ClCompile Include="desmume\SPU.cpp">
103 
-      <Filter>Source Files\desmume</Filter>
102 
+    <ClCompile Include="desmume/utils/AsmJit/base/cpuinfo.cpp">
103 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
104 104 
     </ClCompile>
105 
-    <ClCompile Include="desmume\thumb_instructions.cpp">
106 
-      <Filter>Source Files\desmume</Filter>
105 
+    <ClCompile Include="desmume/utils/AsmJit/base/cputicks.cpp">
106 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
107 107 
     </ClCompile>
108 
-    <ClCompile Include="desmume\version.cpp">
108 
+    <ClCompile Include="desmume/emufile.cpp">
109 109 
       <Filter>Source Files\desmume</Filter>
110 110 
     </ClCompile>
111 
-    <ClCompile Include="desmume\addons\slot1_retail.cpp">
112 
-      <Filter>Source Files\desmume\addons</Filter>
113 
-    </ClCompile>
114 
-    <ClCompile Include="desmume\metaspu\metaspu.cpp">
115 
-      <Filter>Source Files\desmume\metaspu</Filter>
116 
-    </ClCompile>
117 
-    <ClCompile Include="desmume\metaspu\SndOut.cpp">
118 
-      <Filter>Source Files\desmume\metaspu</Filter>
119 
-    </ClCompile>
120 
-    <ClCompile Include="desmume\metaspu\Timestretcher.cpp">
121 
-      <Filter>Source Files\desmume\metaspu</Filter>
122 
-    </ClCompile>
123 
-    <ClCompile Include="desmume\metaspu\SoundTouch\AAFilter.cpp">
124 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
125 
-    </ClCompile>
126 
-    <ClCompile Include="desmume\metaspu\SoundTouch\cpu_detect_x86_win.cpp">
127 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
128 
-    </ClCompile>
129 
-    <ClCompile Include="desmume\metaspu\SoundTouch\FIFOSampleBuffer.cpp">
130 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
131 
-    </ClCompile>
132 
-    <ClCompile Include="desmume\metaspu\SoundTouch\FIRFilter.cpp">
133 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
134 
-    </ClCompile>
135 
-    <ClCompile Include="desmume\metaspu\SoundTouch\RateTransposer.cpp">
136 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
137 
-    </ClCompile>
138 
-    <ClCompile Include="desmume\metaspu\SoundTouch\SoundTouch.cpp">
139 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
140 
-    </ClCompile>
141 
-    <ClCompile Include="desmume\metaspu\SoundTouch\sse_optimized.cpp">
142 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
143 
-    </ClCompile>
144 
-    <ClCompile Include="desmume\metaspu\SoundTouch\TDStretch.cpp">
145 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
146 
-    </ClCompile>
147 
-    <ClCompile Include="desmume\utils\dlditool.cpp">
148 
-      <Filter>Source Files\desmume\utils</Filter>
149 
-    </ClCompile>
150 
-    <ClCompile Include="desmume\utils\xstring.cpp">
151 
-      <Filter>Source Files\desmume\utils</Filter>
152 
-    </ClCompile>
153 
-    <ClCompile Include="XSFConfig_2SF.cpp">
154 
-      <Filter>Source Files</Filter>
111 
+    <ClCompile Include="desmume/utils/AsmJit/base/error.cpp">
112 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
155 113 
     </ClCompile>
156 
-    <ClCompile Include="desmume\arm_jit.cpp">
114 
+    <ClCompile Include="desmume/FIFO.cpp">
157 115 
       <Filter>Source Files\desmume</Filter>
158 116 
     </ClCompile>
159 
-    <ClCompile Include="desmume\metaspu\SoundTouch\mmx_optimized.cpp">
160 
-      <Filter>Source Files\desmume\metaspu\SoundTouch</Filter>
117 
+    <ClCompile Include="desmume/firmware.cpp">
118 
+      <Filter>Source Files\desmume</Filter>
161 119 
     </ClCompile>
162 
-    <ClCompile Include="desmume\utils\AsmJit\base\assembler.cpp">
120 
+    <ClCompile Include="desmume/utils/AsmJit/base/globals.cpp">
163 121 
       <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
164 122 
     </ClCompile>
165 
-    <ClCompile Include="desmume\utils\AsmJit\base\codegen.cpp">
123 
+    <ClCompile Include="desmume/utils/AsmJit/base/logger.cpp">
166 124 
       <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
167 125 
     </ClCompile>
168 
-    <ClCompile Include="desmume\utils\AsmJit\base\compiler.cpp">
169 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
126 
+    <ClCompile Include="desmume/mc.cpp">
127 
+      <Filter>Source Files\desmume</Filter>
170 128 
     </ClCompile>
171 
-    <ClCompile Include="desmume\utils\AsmJit\base\constpool.cpp">
172 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
129 
+    <ClCompile Include="desmume/metaspu/metaspu.cpp">
130 
+      <Filter>Source Files\desmume\metaspu</Filter>
173 131 
     </ClCompile>
174 
-    <ClCompile Include="desmume\utils\AsmJit\base\containers.cpp">
175 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
132 
+    <ClCompile Include="desmume/MMU.cpp">
133 
+      <Filter>Source Files\desmume</Filter>
176 134 
     </ClCompile>
177 
-    <ClCompile Include="desmume\utils\AsmJit\base\context.cpp">
178 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
135 
+    <ClCompile Include="desmume/NDSSystem.cpp">
136 
+      <Filter>Source Files\desmume</Filter>
179 137 
     </ClCompile>
180 
-    <ClCompile Include="desmume\utils\AsmJit\base\cpuinfo.cpp">
138 
+    <ClCompile Include="desmume/utils/AsmJit/base/operand.cpp">
181 139 
       <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
182 140 
     </ClCompile>
183 
-    <ClCompile Include="desmume\utils\AsmJit\base\cputicks.cpp">
141 
+    <ClCompile Include="desmume/readwrite.cpp">
184 142 
       <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
185 143 
     </ClCompile>
186 
-    <ClCompile Include="desmume\utils\AsmJit\base\error.cpp">
144 
+    <ClCompile Include="desmume/utils/AsmJit/base/runtime.cpp">
187 145 
       <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
188 146 
     </ClCompile>
189 
-    <ClCompile Include="desmume\utils\AsmJit\base\globals.cpp">
190 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
147 
+    <ClCompile Include="desmume/slot1.cpp">
148 
+      <Filter>Source Files\desmume</Filter>
191 149 
     </ClCompile>
192 
-    <ClCompile Include="desmume\utils\AsmJit\base\logger.cpp">
193 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
150 
+    <ClCompile Include="desmume/addons/slot1_retail.cpp">
151 
+      <Filter>Source Files\desmume\addons</Filter>
194 152 
     </ClCompile>
195 
-    <ClCompile Include="desmume\utils\AsmJit\base\operand.cpp">
196 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
153 
+    <ClCompile Include="desmume/SPU.cpp">
154 
+      <Filter>Source Files\desmume</Filter>
197 155 
     </ClCompile>
198 
-    <ClCompile Include="desmume\utils\AsmJit\base\runtime.cpp">
156 
+    <ClCompile Include="desmume/utils/AsmJit/base/vmem.cpp">
199 157 
       <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
200 158 
     </ClCompile>
201 
-    <ClCompile Include="desmume\utils\AsmJit\base\string.cpp">
159 
+    <ClCompile Include="desmume/utils/AsmJit/base/string.cpp">
202 160 
       <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
203 161 
     </ClCompile>
204 
-    <ClCompile Include="desmume\utils\AsmJit\base\vmem.cpp">
205 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
162 
+    <ClCompile Include="desmume/thumb_instructions.cpp">
163 
+      <Filter>Source Files\desmume</Filter>
206 164 
     </ClCompile>
207 
-    <ClCompile Include="desmume\utils\AsmJit\base\zone.cpp">
208 
-      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
165 
+    <ClCompile Include="desmume/version.cpp">
166 
+      <Filter>Source Files\desmume</Filter>
209 167 
     </ClCompile>
210 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86assembler.cpp">
168 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86assembler.cpp">
211 169 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
212 170 
     </ClCompile>
213 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86compiler.cpp">
171 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86compiler.cpp">
214 172 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
215 173 
     </ClCompile>
216 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86context.cpp">
174 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86context.cpp">
217 175 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
218 176 
     </ClCompile>
219 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86cpuinfo.cpp">
177 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86cpuinfo.cpp">
220 178 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
221 179 
     </ClCompile>
222 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86inst.cpp">
180 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86inst.cpp">
223 181 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
224 182 
     </ClCompile>
225 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand.cpp">
183 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86operand.cpp">
226 184 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
227 185 
     </ClCompile>
228 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand_regs.cpp">
186 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86operand_regs.cpp">
229 187 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
230 188 
     </ClCompile>
231 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86scheduler.cpp">
189 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86scheduler.cpp">
232 190 
       <Filter>Source Files\desmume\utils\AsmJit\x86</Filter>
233 191 
     </ClCompile>
192 
+    <ClCompile Include="desmume/utils/AsmJit/base/zone.cpp">
193 
+      <Filter>Source Files\desmume\utils\AsmJit\base</Filter>
194 
+    </ClCompile>
195 
+    <ClCompile Include="spu\adpcmdecoder.cpp">
196 
+      <Filter>Source Files\spu</Filter>
197 
+    </ClCompile>
198 
+    <ClCompile Include="spu\interpolator.cpp">
199 
+      <Filter>Source Files\spu</Filter>
200 
+    </ClCompile>
201 
+    <ClCompile Include="spu\samplecache.cpp">
202 
+      <Filter>Source Files\spu</Filter>
203 
+    </ClCompile>
204 
+    <ClCompile Include="spu\sampledata.cpp">
205 
+      <Filter>Source Files\spu</Filter>
206 
+    </ClCompile>
234 207 
   </ItemGroup>
235 208 
   <ItemGroup>
236 209 
     <ClInclude Include="desmume\armcpu.h">
... ... 
@@ -299,39 +272,6 @@
299 272 
     <ClInclude Include="desmume\metaspu\metaspu.h">
300 273 
       <Filter>Header Files\desmume\metaspu</Filter>
301 274 
     </ClInclude>
302 
-    <ClInclude Include="desmume\metaspu\SndOut.h">
303 
-      <Filter>Header Files\desmume\metaspu</Filter>
304 
-    </ClInclude>
305 
-    <ClInclude Include="desmume\metaspu\SoundTouch\AAFilter.h">
306 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
307 
-    </ClInclude>
308 
-    <ClInclude Include="desmume\metaspu\SoundTouch\cpu_detect.h">
309 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
310 
-    </ClInclude>
311 
-    <ClInclude Include="desmume\metaspu\SoundTouch\FIFOSampleBuffer.h">
312 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
313 
-    </ClInclude>
314 
-    <ClInclude Include="desmume\metaspu\SoundTouch\FIFOSamplePipe.h">
315 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
316 
-    </ClInclude>
317 
-    <ClInclude Include="desmume\metaspu\SoundTouch\FIRFilter.h">
318 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
319 
-    </ClInclude>
320 
-    <ClInclude Include="desmume\metaspu\SoundTouch\RateTransposer.h">
321 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
322 
-    </ClInclude>
323 
-    <ClInclude Include="desmume\metaspu\SoundTouch\SoundTouch.h">
324 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
325 
-    </ClInclude>
326 
-    <ClInclude Include="desmume\metaspu\SoundTouch\STTypes.h">
327 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
328 
-    </ClInclude>
329 
-    <ClInclude Include="desmume\metaspu\SoundTouch\TDStretch.h">
330 
-      <Filter>Header Files\desmume\metaspu\SoundTouch</Filter>
331 
-    </ClInclude>
332 
-    <ClInclude Include="desmume\utils\xstring.h">
333 
-      <Filter>Header Files\desmume\utils</Filter>
334 
-    </ClInclude>
335 275 
     <ClInclude Include="desmume\instructions.h">
336 276 
       <Filter>Header Files\desmume</Filter>
337 277 
     </ClInclude>
... ... 
@@ -443,6 +383,21 @@
443 383 
     <ClInclude Include="desmume\utils\AsmJit\x86\x86scheduler_p.h">
444 384 
       <Filter>Header Files\desmume\utils\AsmJit\x86</Filter>
445 385 
     </ClInclude>
386 
+    <ClInclude Include="desmume\utils\bits.h">
387 
+      <Filter>Header Files\desmume\utils</Filter>
388 
+    </ClInclude>
389 
+    <ClInclude Include="spu\adpcmdecoder.h">
390 
+      <Filter>Header Files\spu</Filter>
391 
+    </ClInclude>
392 
+    <ClInclude Include="spu\interpolator.h">
393 
+      <Filter>Header Files\spu</Filter>
394 
+    </ClInclude>
395 
+    <ClInclude Include="spu\samplecache.h">
396 
+      <Filter>Header Files\spu</Filter>
397 
+    </ClInclude>
398 
+    <ClInclude Include="spu\sampledata.h">
399 
+      <Filter>Header Files\spu</Filter>
400 
+    </ClInclude>
446 401 
   </ItemGroup>
447 402 
   <ItemGroup>
448 403 
     <None Include="desmume\instruction_tabdef.inc">
src/in_gsf/in_gsf.vcxproj
History View file @ 6311c58
... ... 
@@ -14,29 +14,30 @@
14 14 
     <ProjectGuid>{1F019070-5442-43ED-99F8-B5DC45E762B1}</ProjectGuid>
15 15 
     <Keyword>Win32Proj</Keyword>
16 16 
     <RootNamespace>in_gsf</RootNamespace>
17 
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
17 18 
   </PropertyGroup>
18 19 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 20 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20 21 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
21 22 
     <UseDebugLibraries>true</UseDebugLibraries>
22 23 
     <CharacterSet>Unicode</CharacterSet>
24 
+    <PlatformToolset>v142</PlatformToolset>
23 25 
   </PropertyGroup>
24 26 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25 27 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
26 28 
     <UseDebugLibraries>false</UseDebugLibraries>
27 29 
     <WholeProgramOptimization>true</WholeProgramOptimization>
28 30 
     <CharacterSet>Unicode</CharacterSet>
31 
+    <PlatformToolset>v142</PlatformToolset>
29 32 
   </PropertyGroup>
30 33 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31 34 
   <ImportGroup Label="ExtensionSettings">
32 35 
   </ImportGroup>
33 36 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
34 37 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
35 
-    <Import Project="..\in_xsf_framework\common.props" />
36 38 
   </ImportGroup>
37 39 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38 40 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39 
-    <Import Project="..\in_xsf_framework\common.props" />
40 41 
   </ImportGroup>
41 42 
   <PropertyGroup Label="UserMacros" />
42 43 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
... ... 
@@ -50,14 +51,13 @@
50 51 
       <WarningLevel>Level4</WarningLevel>
51 52 
       <Optimization>Disabled</Optimization>
52 53 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_GSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 55 
       <DisableSpecificWarnings>4100;4127;4189;4244;4291;4310;4512;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
56 
+      <LanguageStandard>stdcpp17</LanguageStandard>
55 57 
     </ClCompile>
56 58 
     <Link>
57 59 
       <SubSystem>Windows</SubSystem>
58 60 
       <GenerateDebugInformation>true</GenerateDebugInformation>
59 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
60 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
61 61 
     </Link>
62 62 
   </ItemDefinitionGroup>
63 63 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -67,16 +67,15 @@
67 67 
       <FunctionLevelLinking>true</FunctionLevelLinking>
68 68 
       <IntrinsicFunctions>true</IntrinsicFunctions>
69 69 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_GSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
70 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71 71 
       <DisableSpecificWarnings>4100;4127;4189;4244;4291;4310;4512;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 
+      <LanguageStandard>stdcpp17</LanguageStandard>
72 73 
     </ClCompile>
73 74 
     <Link>
74 75 
       <SubSystem>Windows</SubSystem>
75 76 
       <GenerateDebugInformation>true</GenerateDebugInformation>
76 77 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
77 78 
       <OptimizeReferences>true</OptimizeReferences>
78 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
79 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
80 79 
     </Link>
81 80 
   </ItemDefinitionGroup>
82 81 
   <ItemGroup>
src/in_ncsf/SSEQPlayer/Channel.h
History View file @ 6311c58
... ... 
@@ -21,7 +21,7 @@
21 21
22 22 
 /*
23 23 
  * This structure is meant to be similar to what is stored in the actual
24 
- * Nintendo DS's sound registers.  Items that were not being used by this
24 
+ * Nintendo DS's sound registers. Items that were not being used by this
25 25 
  * player have been removed, and items which help the simulated registers
26 26 
  * have been added.
27 27 
  */
... ... 
@@ -67,7 +67,7 @@ struct NDSSoundRegister
67 67
68 68 
 /*
69 69 
  * From FeOS Sound System, this is temporary storage of what will go into
70 
- * the Nintendo DS sound registers.  It is kept separate as the original code
70 
+ * the Nintendo DS sound registers. It is kept separate as the original code
71 71 
  * from FeOS Sound System utilized this to hold data prior to passing it into
72 72 
  * the DS's registers.
73 73 
  */
... ... 
@@ -88,7 +88,7 @@ struct Player;
88 88 
  * data, duplicated. The way it is duplicated is done as follows:
89 89 
  * the samples are stored in the center of the buffer, and on both
90 90 
  * sides is half of the data, the first half being after the data
91 
- * and the second half before before the data. This in essense
91 
+ * and the second half begin before the data. This in essence
92 92 
  * mirrors the data while allowing a pointer to always be retrieved
93 93 
  * and no extra copies of the buffer are created. Part of the idea
94 94 
  * for this came from kode54's original buffer implementation, but
src/in_ncsf/SSEQPlayer/Player.cpp
History View file @ 6311c58
... ... 
@@ -141,7 +141,7 @@ int Player::TrackAlloc()
141 141 
 // Original FSS Function: Player_Run
142 142 
 void Player::Run()
143 143 
 {
144 
-	while (this->tempoCount > 240)
144 
+	while (this->tempoCount >= 240)
145 145 
 	{
146 146 
 		this->tempoCount -= 240;
147 147 
 		for (uint8_t i = 0; i < this->nTracks; ++i)
src/in_ncsf/in_ncsf.vcxproj
History View file @ 6311c58
... ... 
@@ -14,29 +14,30 @@
14 14 
     <ProjectGuid>{4EDC9B55-39BE-4D36-8819-F414FC77ED1E}</ProjectGuid>
15 15 
     <Keyword>Win32Proj</Keyword>
16 16 
     <RootNamespace>in_ncsf</RootNamespace>
17 
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
17 18 
   </PropertyGroup>
18 19 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 20 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20 21 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
21 22 
     <UseDebugLibraries>true</UseDebugLibraries>
22 23 
     <CharacterSet>Unicode</CharacterSet>
24 
+    <PlatformToolset>v142</PlatformToolset>
23 25 
   </PropertyGroup>
24 26 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25 27 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
26 28 
     <UseDebugLibraries>false</UseDebugLibraries>
27 29 
     <WholeProgramOptimization>true</WholeProgramOptimization>
28 30 
     <CharacterSet>Unicode</CharacterSet>
31 
+    <PlatformToolset>v142</PlatformToolset>
29 32 
   </PropertyGroup>
30 33 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31 34 
   <ImportGroup Label="ExtensionSettings">
32 35 
   </ImportGroup>
33 36 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
34 37 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
35 
-    <Import Project="..\in_xsf_framework\common.props" />
36 38 
   </ImportGroup>
37 39 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38 40 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39 
-    <Import Project="..\in_xsf_framework\common.props" />
40 41 
   </ImportGroup>
41 42 
   <PropertyGroup Label="UserMacros" />
42 43 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
... ... 
@@ -50,14 +51,13 @@
50 51 
       <WarningLevel>Level4</WarningLevel>
51 52 
       <Optimization>Disabled</Optimization>
52 53 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_NCSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 55 
       <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
56 
+      <LanguageStandard>stdcpp17</LanguageStandard>
55 57 
     </ClCompile>
56 58 
     <Link>
57 59 
       <SubSystem>Windows</SubSystem>
58 60 
       <GenerateDebugInformation>true</GenerateDebugInformation>
59 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
60 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
61 61 
     </Link>
62 62 
   </ItemDefinitionGroup>
63 63 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -67,16 +67,15 @@
67 67 
       <FunctionLevelLinking>true</FunctionLevelLinking>
68 68 
       <IntrinsicFunctions>true</IntrinsicFunctions>
69 69 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_NCSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
70 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71 71 
       <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 
+      <LanguageStandard>stdcpp17</LanguageStandard>
72 73 
     </ClCompile>
73 74 
     <Link>
74 75 
       <SubSystem>Windows</SubSystem>
75 76 
       <GenerateDebugInformation>true</GenerateDebugInformation>
76 77 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
77 78 
       <OptimizeReferences>true</OptimizeReferences>
78 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
79 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
80 79 
     </Link>
81 80 
   </ItemDefinitionGroup>
82 81 
   <ItemGroup>
src/in_snsf/in_snsf.vcxproj
History View file @ 6311c58
... ... 
@@ -14,29 +14,30 @@
14 14 
     <ProjectGuid>{C643848D-8ECB-4B45-9089-1F7DC4ED0451}</ProjectGuid>
15 15 
     <Keyword>Win32Proj</Keyword>
16 16 
     <RootNamespace>in_snsf</RootNamespace>
17 
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
17 18 
   </PropertyGroup>
18 19 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 20 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20 21 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
21 22 
     <UseDebugLibraries>true</UseDebugLibraries>
22 23 
     <CharacterSet>Unicode</CharacterSet>
24 
+    <PlatformToolset>v142</PlatformToolset>
23 25 
   </PropertyGroup>
24 26 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25 27 
     <ConfigurationType>DynamicLibrary</ConfigurationType>
26 28 
     <UseDebugLibraries>false</UseDebugLibraries>
27 29 
     <WholeProgramOptimization>true</WholeProgramOptimization>
28 30 
     <CharacterSet>Unicode</CharacterSet>
31 
+    <PlatformToolset>v142</PlatformToolset>
29 32 
   </PropertyGroup>
30 33 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31 34 
   <ImportGroup Label="ExtensionSettings">
32 35 
   </ImportGroup>
33 36 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
34 37 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
35 
-    <Import Project="..\in_xsf_framework\common.props" />
36 38 
   </ImportGroup>
37 39 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38 40 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39 
-    <Import Project="..\in_xsf_framework\common.props" />
40 41 
   </ImportGroup>
41 42 
   <PropertyGroup Label="UserMacros" />
42 43 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
... ... 
@@ -50,14 +51,13 @@
50 51 
       <WarningLevel>Level4</WarningLevel>
51 52 
       <Optimization>Disabled</Optimization>
52 53 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 55 
       <DisableSpecificWarnings>4100;4127;4244;4245;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
56 
+      <LanguageStandard>stdcpp17</LanguageStandard>
55 57 
     </ClCompile>
56 58 
     <Link>
57 59 
       <SubSystem>Windows</SubSystem>
58 60 
       <GenerateDebugInformation>true</GenerateDebugInformation>
59 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
60 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
61 61 
     </Link>
62 62 
   </ItemDefinitionGroup>
63 63 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -67,16 +67,15 @@
67 67 
       <FunctionLevelLinking>true</FunctionLevelLinking>
68 68 
       <IntrinsicFunctions>true</IntrinsicFunctions>
69 69 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70 
-      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
70 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71 71 
       <DisableSpecificWarnings>4100;4127;4244;4245;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 
+      <LanguageStandard>stdcpp17</LanguageStandard>
72 73 
     </ClCompile>
73 74 
     <Link>
74 75 
       <SubSystem>Windows</SubSystem>
75 76 
       <GenerateDebugInformation>true</GenerateDebugInformation>
76 77 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
77 78 
       <OptimizeReferences>true</OptimizeReferences>
78 
-      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
79 
-      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
80 79 
     </Link>
81 80 
   </ItemDefinitionGroup>
82 81 
   <ItemGroup>
src/in_xsf.sln
History View file @ 6311c58
... ... 
@@ -1,6 +1,8 @@
1 1 
 
2 
-Microsoft Visual Studio Solution File, Format Version 11.00
3 
-# Visual C++ Express 2010
2 
+Microsoft Visual Studio Solution File, Format Version 12.00
3 
+# Visual Studio Version 16
4 
+VisualStudioVersion = 16.0.31105.61
5 
+MinimumVisualStudioVersion = 10.0.40219.1
4 6 
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_2sf", "in_2sf\in_2sf.vcxproj", "{1927E848-5CFF-4462-A5AB-2768A390C5F3}"
5 7 
 EndProject
6 8 
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_gsf", "in_gsf\in_gsf.vcxproj", "{1F019070-5442-43ED-99F8-B5DC45E762B1}"
... ... 
@@ -41,4 +43,7 @@ Global
41 43 
 	GlobalSection(SolutionProperties) = preSolution
42 44 
 		HideSolutionNode = FALSE
43 45 
 	EndGlobalSection
46 
+	GlobalSection(ExtensibilityGlobals) = postSolution
47 
+		SolutionGuid = {99405376-9E56-4155-AA21-9076746C360B}
48 
+	EndGlobalSection
44 49 
 EndGlobal
src/in_xsf_framework/common.props
History View file @ 6311c58
45 50 
deleted file mode 100644
... ... 
@@ -1,18 +0,0 @@
1 
-<?xml version="1.0" encoding="utf-8"?>
2 
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 
-  <ImportGroup Label="PropertySheets" />
4 
-  <PropertyGroup Label="UserMacros">
5 
-    <zlibRootDir>$(MSBuildThisFileDirectory)\zlib</zlibRootDir>
6 
-    <WinampSDKDir>$(MSBuildThisFileDirectory)\winamp</WinampSDKDir>
7 
-  </PropertyGroup>
8 
-  <PropertyGroup />
9 
-  <ItemDefinitionGroup />
10 
-  <ItemGroup>
11 
-    <BuildMacro Include="zlibRootDir">
12 
-      <Value>$(zlibRootDir)</Value>
13 
-    </BuildMacro>
14 
-    <BuildMacro Include="WinampSDKDir">
15 
-      <Value>$(WinampSDKDir)</Value>
16 
-    </BuildMacro>
17 
-  </ItemGroup>
18 
-</Project>
src/in_xsf_framework/in_xsf_framework.vcxproj
History View file @ 6311c58
... ... 
@@ -14,29 +14,30 @@
14 14 
     <ProjectGuid>{9D6D2540-B3DC-462B-BBC0-5B7C32A4D581}</ProjectGuid>
15 15 
     <Keyword>Win32Proj</Keyword>
16 16 
     <RootNamespace>in_xsf_framework</RootNamespace>
17 
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
17 18 
   </PropertyGroup>
18 19 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 20 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20 21 
     <ConfigurationType>StaticLibrary</ConfigurationType>
21 22 
     <UseDebugLibraries>true</UseDebugLibraries>
22 23 
     <CharacterSet>Unicode</CharacterSet>
24 
+    <PlatformToolset>v142</PlatformToolset>
23 25 
   </PropertyGroup>
24 26 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25 27 
     <ConfigurationType>StaticLibrary</ConfigurationType>
26 28 
     <UseDebugLibraries>false</UseDebugLibraries>
27 29 
     <WholeProgramOptimization>true</WholeProgramOptimization>
28 30 
     <CharacterSet>Unicode</CharacterSet>
31 
+    <PlatformToolset>v142</PlatformToolset>
29 32 
   </PropertyGroup>
30 33 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31 34 
   <ImportGroup Label="ExtensionSettings">
32 35 
   </ImportGroup>
33 36 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
34 37 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
35 
-    <Import Project="common.props" />
36 38 
   </ImportGroup>
37 39 
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38 40 
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39 
-    <Import Project="common.props" />
40 41 
   </ImportGroup>
41 42 
   <PropertyGroup Label="UserMacros" />
42 43 
   <PropertyGroup />
... ... 
@@ -45,8 +46,9 @@
45 46 
       <WarningLevel>Level4</WarningLevel>
46 47 
       <Optimization>Disabled</Optimization>
47 48 
       <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;UNICODE_INPUT_PLUGIN;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
48 
-      <AdditionalIncludeDirectories>$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
49 
+      <AdditionalIncludeDirectories>.\zlib;.\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
49 50 
       <DisableSpecificWarnings>4127;4244;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
51 
+      <LanguageStandard>stdcpp17</LanguageStandard>
50 52 
     </ClCompile>
51 53 
     <Link>
52 54 
       <SubSystem>Windows</SubSystem>
... ... 
@@ -60,8 +62,9 @@
60 62 
       <FunctionLevelLinking>true</FunctionLevelLinking>
61 63 
       <IntrinsicFunctions>true</IntrinsicFunctions>
62 64 
       <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;UNICODE_INPUT_PLUGIN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
63 
-      <AdditionalIncludeDirectories>$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
65 
+      <AdditionalIncludeDirectories>.\zlib;.\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64 66 
       <DisableSpecificWarnings>4127;4244;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
67 
+      <LanguageStandard>stdcpp17</LanguageStandard>
65 68 
     </ClCompile>
66 69 
     <Link>
67 70 
       <SubSystem>Windows</SubSystem>
... ... 
@@ -81,6 +84,15 @@
81 84 
     <ClInclude Include="XSFConfig.h" />
82 85 
     <ClInclude Include="XSFFile.h" />
83 86 
     <ClInclude Include="XSFPlayer.h" />
87 
+    <ClInclude Include="zlib\crc32.h" />
88 
+    <ClInclude Include="zlib\gzguts.h" />
89 
+    <ClInclude Include="zlib\inffast.h" />
90 
+    <ClInclude Include="zlib\inffixed.h" />
91 
+    <ClInclude Include="zlib\inflate.h" />
92 
+    <ClInclude Include="zlib\inftrees.h" />
93 
+    <ClInclude Include="zlib\zconf.h" />
94 
+    <ClInclude Include="zlib\zlib.h" />
95 
+    <ClInclude Include="zlib\zutil.h" />
84 96 
   </ItemGroup>
85 97 
   <ItemGroup>
86 98 
     <ClCompile Include="DialogBuilder.cpp" />
... ... 
@@ -90,9 +102,13 @@
90 102 
     <ClCompile Include="XSFConfig_Winamp.cpp" />
91 103 
     <ClCompile Include="XSFFile.cpp" />
92 104 
     <ClCompile Include="XSFPlayer.cpp" />
93 
-  </ItemGroup>
94 
-  <ItemGroup>
95 
-    <None Include="common.props" />
105 
+    <ClCompile Include="zlib\adler32.c" />
106 
+    <ClCompile Include="zlib\crc32.c" />
107 
+    <ClCompile Include="zlib\inffast.c" />
108 
+    <ClCompile Include="zlib\inflate.c" />
109 
+    <ClCompile Include="zlib\inftrees.c" />
110 
+    <ClCompile Include="zlib\uncompr.c" />
111 
+    <ClCompile Include="zlib\zutil.c" />
96 112 
   </ItemGroup>
97 113 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
98 114 
   <ImportGroup Label="ExtensionTargets">
src/in_xsf_framework/in_xsf_framework.vcxproj.filters
History View file @ 6311c58
... ... 
@@ -13,6 +13,12 @@
13 13 
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14 14 
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15 15 
     </Filter>
16 
+    <Filter Include="Source Files\zlib">
17 
+      <UniqueIdentifier>{4ece8f78-c8a3-4384-80be-82bdfe7f6952}</UniqueIdentifier>
18 
+    </Filter>
19 
+    <Filter Include="Header Files\zlib">
20 
+      <UniqueIdentifier>{e073fbb9-3de6-48aa-8777-f6ce1fb61845}</UniqueIdentifier>
21 
+    </Filter>
16 22 
   </ItemGroup>
17 23 
   <ItemGroup>
18 24 
     <ClInclude Include="convert.h">
... ... 
@@ -45,6 +51,33 @@
45 51 
     <ClInclude Include="ltstr.h">
46 52 
       <Filter>Header Files</Filter>
47 53 
     </ClInclude>
54 
+    <ClInclude Include="zlib\crc32.h">
55 
+      <Filter>Header Files\zlib</Filter>
56 
+    </ClInclude>
57 
+    <ClInclude Include="zlib\gzguts.h">
58 
+      <Filter>Header Files\zlib</Filter>
59 
+    </ClInclude>
60 
+    <ClInclude Include="zlib\inffast.h">
61 
+      <Filter>Header Files\zlib</Filter>
62 
+    </ClInclude>
63 
+    <ClInclude Include="zlib\inffixed.h">
64 
+      <Filter>Header Files\zlib</Filter>
65 
+    </ClInclude>
66 
+    <ClInclude Include="zlib\inflate.h">
67 
+      <Filter>Header Files\zlib</Filter>
68 
+    </ClInclude>
69 
+    <ClInclude Include="zlib\inftrees.h">
70 
+      <Filter>Header Files\zlib</Filter>
71 
+    </ClInclude>
72 
+    <ClInclude Include="zlib\zconf.h">
73 
+      <Filter>Header Files\zlib</Filter>
74 
+    </ClInclude>
75 
+    <ClInclude Include="zlib\zlib.h">
76 
+      <Filter>Header Files\zlib</Filter>
77 
+    </ClInclude>
78 
+    <ClInclude Include="zlib\zutil.h">
79 
+      <Filter>Header Files\zlib</Filter>
80 
+    </ClInclude>
48 81 
   </ItemGroup>
49 82 
   <ItemGroup>
50 83 
     <ClCompile Include="DialogBuilder.cpp">
... ... 
@@ -68,8 +101,26 @@
68 101 
     <ClCompile Include="TagList.cpp">
69 102 
       <Filter>Source Files</Filter>
70 103 
     </ClCompile>
71 
-  </ItemGroup>
72 
-  <ItemGroup>
73 
-    <None Include="common.props" />
104 
+    <ClCompile Include="zlib\zutil.c">
105 
+      <Filter>Source Files\zlib</Filter>
106 
+    </ClCompile>
107 
+    <ClCompile Include="zlib\adler32.c">
108 
+      <Filter>Source Files\zlib</Filter>
109 
+    </ClCompile>
110 
+    <ClCompile Include="zlib\crc32.c">
111 
+      <Filter>Source Files\zlib</Filter>
112 
+    </ClCompile>
113 
+    <ClCompile Include="zlib\inffast.c">
114 
+      <Filter>Source Files\zlib</Filter>
115 
+    </ClCompile>
116 
+    <ClCompile Include="zlib\inflate.c">
117 
+      <Filter>Source Files\zlib</Filter>
118 
+    </ClCompile>
119 
+    <ClCompile Include="zlib\inftrees.c">
120 
+      <Filter>Source Files\zlib</Filter>
121 
+    </ClCompile>
122 
+    <ClCompile Include="zlib\uncompr.c">
123 
+      <Filter>Source Files\zlib</Filter>
124 
+    </ClCompile>
74 125 
   </ItemGroup>
75 126 
 </Project>
76 127 
\ No newline at end of file