CW Cyrix's Git Repository Mirror
Browse code

Ignore Visual Studio 2019's arithmetic overflow warning.

It is obnoxious and only in the IDE and not at compile-time.

Naram Qashat authored on 2021/03/19 18:51:40
Showing 1 changed files
src/in_2sf/in_2sf.vcxproj
History View file @ c472324
... ... 
@@ -52,7 +52,7 @@
52 52 
       <Optimization>Disabled</Optimization>
53 53 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_2SF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;HAVE_LIBZ;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
54 54 
       <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
55 
-      <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
55 
+      <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;26451;%(DisableSpecificWarnings)</DisableSpecificWarnings>
56 56 
       <LanguageStandard>stdcpp17</LanguageStandard>
57 57 
     </ClCompile>
58 58 
     <Link>
... ... 
@@ -68,7 +68,7 @@
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 70 
       <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71 
-      <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
71 
+      <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;26451;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 72 
       <LanguageStandard>stdcpp17</LanguageStandard>
73 73 
     </ClCompile>
74 74 
     <Link>
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 1 changed files
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
Browse code

update for C++17 compliance, update to latest 2sf, add WINE cross-compile makefiles

Adam Higerd authored on 2021/02/11 15:36:17
Showing 1 changed files
src/in_2sf/in_2sf.vcxproj
History View file @ 846d8df
... ... 
@@ -80,135 +80,112 @@
80 80 
     </Link>
81 81 
   </ItemDefinitionGroup>
82 82 
   <ItemGroup>
83 
-    <ClCompile Include="desmume\arm_jit.cpp" />
84 
-    <ClCompile Include="desmume\metaspu\SoundTouch\mmx_optimized.cpp" />
85 
-    <ClCompile Include="desmume\utils\AsmJit\base\assembler.cpp" />
86 
-    <ClCompile Include="desmume\utils\AsmJit\base\codegen.cpp" />
87 
-    <ClCompile Include="desmume\utils\AsmJit\base\compiler.cpp" />
88 
-    <ClCompile Include="desmume\utils\AsmJit\base\constpool.cpp" />
89 
-    <ClCompile Include="desmume\utils\AsmJit\base\containers.cpp" />
90 
-    <ClCompile Include="desmume\utils\AsmJit\base\context.cpp" />
91 
-    <ClCompile Include="desmume\utils\AsmJit\base\cpuinfo.cpp" />
92 
-    <ClCompile Include="desmume\utils\AsmJit\base\cputicks.cpp" />
93 
-    <ClCompile Include="desmume\utils\AsmJit\base\error.cpp" />
94 
-    <ClCompile Include="desmume\utils\AsmJit\base\globals.cpp" />
95 
-    <ClCompile Include="desmume\utils\AsmJit\base\logger.cpp" />
96 
-    <ClCompile Include="desmume\utils\AsmJit\base\operand.cpp" />
97 
-    <ClCompile Include="desmume\utils\AsmJit\base\runtime.cpp" />
98 
-    <ClCompile Include="desmume\utils\AsmJit\base\string.cpp" />
99 
-    <ClCompile Include="desmume\utils\AsmJit\base\vmem.cpp" />
100 
-    <ClCompile Include="desmume\utils\AsmJit\base\zone.cpp" />
101 
-    <ClCompile Include="desmume\addons\slot1_retail.cpp" />
102 
-    <ClCompile Include="desmume\armcpu.cpp" />
103 
-    <ClCompile Include="desmume\arm_instructions.cpp" />
104 
-    <ClCompile Include="desmume\bios.cpp" />
105 
-    <ClCompile Include="desmume\cp15.cpp" />
106 
-    <ClCompile Include="desmume\emufile.cpp" />
107 
-    <ClCompile Include="desmume\FIFO.cpp" />
108 
-    <ClCompile Include="desmume\firmware.cpp" />
109 
-    <ClCompile Include="desmume\mc.cpp" />
110 
-    <ClCompile Include="desmume\metaspu\metaspu.cpp" />
111 
-    <ClCompile Include="desmume\metaspu\SndOut.cpp" />
112 
-    <ClCompile Include="desmume\metaspu\SoundTouch\AAFilter.cpp" />
113 
-    <ClCompile Include="desmume\metaspu\SoundTouch\cpu_detect_x86_win.cpp" />
114 
-    <ClCompile Include="desmume\metaspu\SoundTouch\FIFOSampleBuffer.cpp" />
115 
-    <ClCompile Include="desmume\metaspu\SoundTouch\FIRFilter.cpp" />
116 
-    <ClCompile Include="desmume\metaspu\SoundTouch\RateTransposer.cpp" />
117 
-    <ClCompile Include="desmume\metaspu\SoundTouch\SoundTouch.cpp" />
118 
-    <ClCompile Include="desmume\metaspu\SoundTouch\sse_optimized.cpp" />
119 
-    <ClCompile Include="desmume\metaspu\SoundTouch\TDStretch.cpp" />
120 
-    <ClCompile Include="desmume\metaspu\Timestretcher.cpp" />
121 
-    <ClCompile Include="desmume\MMU.cpp" />
122 
-    <ClCompile Include="desmume\NDSSystem.cpp" />
123 
-    <ClCompile Include="desmume\readwrite.cpp" />
124 
-    <ClCompile Include="desmume\slot1.cpp" />
125 
-    <ClCompile Include="desmume\SPU.cpp" />
126 
-    <ClCompile Include="desmume\thumb_instructions.cpp" />
127 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86assembler.cpp" />
128 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86compiler.cpp" />
129 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86context.cpp" />
130 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86cpuinfo.cpp" />
131 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86inst.cpp" />
132 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand.cpp" />
133 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand_regs.cpp" />
134 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86scheduler.cpp" />
135 
-    <ClCompile Include="desmume\utils\dlditool.cpp" />
136 
-    <ClCompile Include="desmume\utils\xstring.cpp" />
137 
-    <ClCompile Include="desmume\version.cpp" />
83 
+    <ClCompile Include="desmume/mc.cpp" />
84 
+    <ClCompile Include="desmume/bios.cpp" />
85 
+    <ClCompile Include="desmume/MMU.cpp" />
86 
+    <ClCompile Include="desmume/readwrite.cpp" />
87 
+    <ClCompile Include="desmume/FIFO.cpp" />
88 
+    <ClCompile Include="desmume/addons/slot1_retail.cpp" />
89 
+    <ClCompile Include="desmume/armcpu.cpp" />
90 
+    <ClCompile Include="desmume/arm_jit.cpp" />
91 
+    <ClCompile Include="desmume/emufile.cpp" />
92 
+    <ClCompile Include="desmume/utils/AsmJit/base/compiler.cpp" />
93 
+    <ClCompile Include="desmume/utils/AsmJit/base/string.cpp" />
94 
+    <ClCompile Include="desmume/utils/AsmJit/base/constpool.cpp" />
95 
+    <ClCompile Include="desmume/utils/AsmJit/base/assembler.cpp" />
96 
+    <ClCompile Include="desmume/utils/AsmJit/base/error.cpp" />
97 
+    <ClCompile Include="desmume/utils/AsmJit/base/context.cpp" />
98 
+    <ClCompile Include="desmume/utils/AsmJit/base/globals.cpp" />
99 
+    <ClCompile Include="desmume/utils/AsmJit/base/containers.cpp" />
100 
+    <ClCompile Include="desmume/utils/AsmJit/base/codegen.cpp" />
101 
+    <ClCompile Include="desmume/utils/AsmJit/base/cputicks.cpp" />
102 
+    <ClCompile Include="desmume/utils/AsmJit/base/cpuinfo.cpp" />
103 
+    <ClCompile Include="desmume/utils/AsmJit/base/vmem.cpp" />
104 
+    <ClCompile Include="desmume/utils/AsmJit/base/operand.cpp" />
105 
+    <ClCompile Include="desmume/utils/AsmJit/base/zone.cpp" />
106 
+    <ClCompile Include="desmume/utils/AsmJit/base/logger.cpp" />
107 
+    <ClCompile Include="desmume/utils/AsmJit/base/runtime.cpp" />
108 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86cpuinfo.cpp" />
109 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86compiler.cpp" />
110 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86inst.cpp" />
111 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86operand_regs.cpp" />
112 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86assembler.cpp" />
113 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86context.cpp" />
114 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86operand.cpp" />
115 
+    <ClCompile Include="desmume/utils/AsmJit/x86/x86scheduler.cpp" />
116 
+    <ClCompile Include="desmume/version.cpp" />
117 
+    <ClCompile Include="desmume/SPU.cpp" />
118 
+    <ClCompile Include="desmume/NDSSystem.cpp" />
119 
+    <ClCompile Include="desmume/metaspu/metaspu.cpp" />
120 
+    <ClCompile Include="desmume/cp15.cpp" />
121 
+    <ClCompile Include="desmume/arm_instructions.cpp" />
122 
+    <ClCompile Include="desmume/thumb_instructions.cpp" />
123 
+    <ClCompile Include="desmume/firmware.cpp" />
124 
+    <ClCompile Include="desmume/slot1.cpp" />
138 125 
     <ClCompile Include="XSFConfig_2SF.cpp" />
139 126 
     <ClCompile Include="XSFPlayer_2SF.cpp" />
140 127 
   </ItemGroup>
141 128 
   <ItemGroup>
129 
+    <ClInclude Include="desmume\NDSSystem.h" />
130 
+    <ClInclude Include="desmume\emufile.h" />
131 
+    <ClInclude Include="desmume\bits.h" />
132 
+    <ClInclude Include="desmume\types.h" />
142 133 
     <ClInclude Include="desmume\arm_jit.h" />
143 
-    <ClInclude Include="desmume\instructions.h" />
134 
+    <ClInclude Include="desmume\PACKED_END.h" />
135 
+    <ClInclude Include="desmume\version.h" />
144 136 
     <ClInclude Include="desmume\instruction_attributes.h" />
145 
-    <ClInclude Include="desmume\utils\AsmJit\apibegin.h" />
137 
+    <ClInclude Include="desmume\registers.h" />
138 
+    <ClInclude Include="desmume\firmware.h" />
139 
+    <ClInclude Include="desmume\utils\bits.h" />
140 
+    <ClInclude Include="desmume\utils\AsmJit\AsmJit.h" />
146 141 
     <ClInclude Include="desmume\utils\AsmJit\apiend.h" />
147 
-    <ClInclude Include="desmume\utils\AsmJit\asmjit.h" />
148 142 
     <ClInclude Include="desmume\utils\AsmJit\base.h" />
149 
-    <ClInclude Include="desmume\utils\AsmJit\base\assembler.h" />
150 
-    <ClInclude Include="desmume\utils\AsmJit\base\codegen.h" />
151 
-    <ClInclude Include="desmume\utils\AsmJit\base\compiler.h" />
152 
-    <ClInclude Include="desmume\utils\AsmJit\base\constpool.h" />
153 
-    <ClInclude Include="desmume\utils\AsmJit\base\containers.h" />
143 
+    <ClInclude Include="desmume\utils\AsmJit\x86.h" />
144 
+    <ClInclude Include="desmume\utils\AsmJit\host.h" />
145 
+    <ClInclude Include="desmume\utils\AsmJit\build.h" />
154 146 
     <ClInclude Include="desmume\utils\AsmJit\base\context_p.h" />
147 
+    <ClInclude Include="desmume\utils\AsmJit\base\vectypes.h" />
148 
+    <ClInclude Include="desmume\utils\AsmJit\base\containers.h" />
149 
+    <ClInclude Include="desmume\utils\AsmJit\base\zone.h" />
150 
+    <ClInclude Include="desmume\utils\AsmJit\base\constpool.h" />
155 151 
     <ClInclude Include="desmume\utils\AsmJit\base\cpuinfo.h" />
156 
-    <ClInclude Include="desmume\utils\AsmJit\base\cputicks.h" />
157 
-    <ClInclude Include="desmume\utils\AsmJit\base\error.h" />
158 
-    <ClInclude Include="desmume\utils\AsmJit\base\globals.h" />
159 
-    <ClInclude Include="desmume\utils\AsmJit\base\intutil.h" />
160 
-    <ClInclude Include="desmume\utils\AsmJit\base\lock.h" />
152 
+    <ClInclude Include="desmume\utils\AsmJit\base\vmem.h" />
153 
+    <ClInclude Include="desmume\utils\AsmJit\base\string.h" />
161 154 
     <ClInclude Include="desmume\utils\AsmJit\base\logger.h" />
155 
+    <ClInclude Include="desmume\utils\AsmJit\base\intutil.h" />
156 
+    <ClInclude Include="desmume\utils\AsmJit\base\compiler.h" />
157 
+    <ClInclude Include="desmume\utils\AsmJit\base\assembler.h" />
158 
+    <ClInclude Include="desmume\utils\AsmJit\base\error.h" />
162 159 
     <ClInclude Include="desmume\utils\AsmJit\base\operand.h" />
160 
+    <ClInclude Include="desmume\utils\AsmJit\base\cputicks.h" />
161 
+    <ClInclude Include="desmume\utils\AsmJit\base\globals.h" />
162 
+    <ClInclude Include="desmume\utils\AsmJit\base\codegen.h" />
163 163 
     <ClInclude Include="desmume\utils\AsmJit\base\runtime.h" />
164 
-    <ClInclude Include="desmume\utils\AsmJit\base\string.h" />
165 
-    <ClInclude Include="desmume\utils\AsmJit\base\vectypes.h" />
166 
-    <ClInclude Include="desmume\utils\AsmJit\base\vmem.h" />
167 
-    <ClInclude Include="desmume\utils\AsmJit\base\zone.h" />
168 
-    <ClInclude Include="desmume\utils\AsmJit\build.h" />
169 
-    <ClInclude Include="desmume\utils\AsmJit\config.h" />
170 
-    <ClInclude Include="desmume\utils\AsmJit\host.h" />
171 
-    <ClInclude Include="desmume\utils\AsmJit\x86.h" />
172 
-    <ClInclude Include="desmume\armcpu.h" />
164 
+    <ClInclude Include="desmume\utils\AsmJit\base\lock.h" />
165 
+    <ClInclude Include="desmume\utils\AsmJit\Config.h" />
166 
+    <ClInclude Include="desmume\utils\AsmJit\apibegin.h" />
167 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86assembler.h" />
168 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86compiler.h" />
169 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86operand.h" />
170 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86scheduler_p.h" />
171 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86inst.h" />
172 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86cpuinfo.h" />
173 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86context_p.h" />
173 174 
     <ClInclude Include="desmume\bios.h" />
174 
-    <ClInclude Include="desmume\bits.h" />
175 175 
     <ClInclude Include="desmume\cp15.h" />
176 
-    <ClInclude Include="desmume\emufile.h" />
177 
-    <ClInclude Include="desmume\FIFO.h" />
178 
-    <ClInclude Include="desmume\firmware.h" />
179 
-    <ClInclude Include="desmume\matrix.h" />
176 
+    <ClInclude Include="desmume\MMU.h" />
177 
+    <ClInclude Include="desmume\readwrite.h" />
180 178 
     <ClInclude Include="desmume\mc.h" />
181 
-    <ClInclude Include="desmume\mem.h" />
179 
+    <ClInclude Include="desmume\instructions.h" />
182 180 
     <ClInclude Include="desmume\metaspu\metaspu.h" />
183 
-    <ClInclude Include="desmume\metaspu\SndOut.h" />
184 
-    <ClInclude Include="desmume\metaspu\SoundTouch\AAFilter.h" />
185 
-    <ClInclude Include="desmume\metaspu\SoundTouch\cpu_detect.h" />
186 
-    <ClInclude Include="desmume\metaspu\SoundTouch\FIFOSampleBuffer.h" />
187 
-    <ClInclude Include="desmume\metaspu\SoundTouch\FIFOSamplePipe.h" />
188 
-    <ClInclude Include="desmume\metaspu\SoundTouch\FIRFilter.h" />
189 
-    <ClInclude Include="desmume\metaspu\SoundTouch\RateTransposer.h" />
190 
-    <ClInclude Include="desmume\metaspu\SoundTouch\SoundTouch.h" />
191 
-    <ClInclude Include="desmume\metaspu\SoundTouch\STTypes.h" />
192 
-    <ClInclude Include="desmume\metaspu\SoundTouch\TDStretch.h" />
193 
-    <ClInclude Include="desmume\MMU.h" />
194 
-    <ClInclude Include="desmume\MMU_timing.h" />
195 
-    <ClInclude Include="desmume\NDSSystem.h" />
181 
+    <ClInclude Include="desmume\mem.h" />
196 182 
     <ClInclude Include="desmume\PACKED.h" />
197 
-    <ClInclude Include="desmume\PACKED_END.h" />
198 
-    <ClInclude Include="desmume\readwrite.h" />
199 
-    <ClInclude Include="desmume\registers.h" />
183 
+    <ClInclude Include="desmume\matrix.h" />
184 
+    <ClInclude Include="desmume\MMU_timing.h" />
200 185 
     <ClInclude Include="desmume\slot1.h" />
186 
+    <ClInclude Include="desmume\FIFO.h" />
201 187 
     <ClInclude Include="desmume\SPU.h" />
202 
-    <ClInclude Include="desmume\types.h" />
203 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86assembler.h" />
204 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86compiler.h" />
205 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86context_p.h" />
206 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86cpuinfo.h" />
207 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86inst.h" />
208 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86operand.h" />
209 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86scheduler_p.h" />
210 
-    <ClInclude Include="desmume\utils\xstring.h" />
211 
-    <ClInclude Include="desmume\version.h" />
188 
+    <ClInclude Include="desmume\armcpu.h" />
212 189 
   </ItemGroup>
213 190 
   <ItemGroup>
214 191 
     <None Include="desmume\instruction_tabdef.inc" />
... ... 
@@ -222,4 +199,4 @@
222 199 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
223 200 
   <ImportGroup Label="ExtensionTargets">
224 201 
   </ImportGroup>
225 
-</Project>
226 202 
\ No newline at end of file
203 
+</Project>
Browse code

* Fixes for gcc and clang (while they can compile the code, the DLLs made aren't functional, but oh well).

* [2SF] Used more up-to-date asmjit, despite the ugly looking code.

Naram Qashat authored on 2014/09/17 19:51:45
Showing 1 changed files
src/in_2sf/in_2sf.vcxproj
History View file @ 9315374
... ... 
@@ -82,33 +82,22 @@
82 82 
   <ItemGroup>
83 83 
     <ClCompile Include="desmume\arm_jit.cpp" />
84 84 
     <ClCompile Include="desmume\metaspu\SoundTouch\mmx_optimized.cpp" />
85 
-    <ClCompile Include="desmume\utils\AsmJit\core\assembler.cpp" />
86 
-    <ClCompile Include="desmume\utils\AsmJit\core\assert.cpp" />
87 
-    <ClCompile Include="desmume\utils\AsmJit\core\buffer.cpp" />
88 
-    <ClCompile Include="desmume\utils\AsmJit\core\compiler.cpp" />
89 
-    <ClCompile Include="desmume\utils\AsmJit\core\compilercontext.cpp" />
90 
-    <ClCompile Include="desmume\utils\AsmJit\core\compilerfunc.cpp" />
91 
-    <ClCompile Include="desmume\utils\AsmJit\core\compileritem.cpp" />
92 
-    <ClCompile Include="desmume\utils\AsmJit\core\context.cpp" />
93 
-    <ClCompile Include="desmume\utils\AsmJit\core\cpuinfo.cpp" />
94 
-    <ClCompile Include="desmume\utils\AsmJit\core\defs.cpp" />
95 
-    <ClCompile Include="desmume\utils\AsmJit\core\logger.cpp" />
96 
-    <ClCompile Include="desmume\utils\AsmJit\core\memorymanager.cpp" />
97 
-    <ClCompile Include="desmume\utils\AsmJit\core\operand.cpp" />
98 
-    <ClCompile Include="desmume\utils\AsmJit\core\stringbuilder.cpp" />
99 
-    <ClCompile Include="desmume\utils\AsmJit\core\stringutil.cpp" />
100 
-    <ClCompile Include="desmume\utils\AsmJit\core\virtualmemory.cpp" />
101 
-    <ClCompile Include="desmume\utils\AsmJit\core\zonememory.cpp" />
102 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86assembler.cpp" />
103 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86compiler.cpp" />
104 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86compilercontext.cpp" />
105 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86compilerfunc.cpp" />
106 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86compileritem.cpp" />
107 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86cpuinfo.cpp" />
108 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86defs.cpp" />
109 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86func.cpp" />
110 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand.cpp" />
111 
-    <ClCompile Include="desmume\utils\AsmJit\x86\x86util.cpp" />
85 
+    <ClCompile Include="desmume\utils\AsmJit\base\assembler.cpp" />
86 
+    <ClCompile Include="desmume\utils\AsmJit\base\codegen.cpp" />
87 
+    <ClCompile Include="desmume\utils\AsmJit\base\compiler.cpp" />
88 
+    <ClCompile Include="desmume\utils\AsmJit\base\constpool.cpp" />
89 
+    <ClCompile Include="desmume\utils\AsmJit\base\containers.cpp" />
90 
+    <ClCompile Include="desmume\utils\AsmJit\base\context.cpp" />
91 
+    <ClCompile Include="desmume\utils\AsmJit\base\cpuinfo.cpp" />
92 
+    <ClCompile Include="desmume\utils\AsmJit\base\cputicks.cpp" />
93 
+    <ClCompile Include="desmume\utils\AsmJit\base\error.cpp" />
94 
+    <ClCompile Include="desmume\utils\AsmJit\base\globals.cpp" />
95 
+    <ClCompile Include="desmume\utils\AsmJit\base\logger.cpp" />
96 
+    <ClCompile Include="desmume\utils\AsmJit\base\operand.cpp" />
97 
+    <ClCompile Include="desmume\utils\AsmJit\base\runtime.cpp" />
98 
+    <ClCompile Include="desmume\utils\AsmJit\base\string.cpp" />
99 
+    <ClCompile Include="desmume\utils\AsmJit\base\vmem.cpp" />
100 
+    <ClCompile Include="desmume\utils\AsmJit\base\zone.cpp" />
112 101 
     <ClCompile Include="desmume\addons\slot1_retail.cpp" />
113 102 
     <ClCompile Include="desmume\armcpu.cpp" />
114 103 
     <ClCompile Include="desmume\arm_instructions.cpp" />
... ... 
@@ -135,6 +124,14 @@
135 124 
     <ClCompile Include="desmume\slot1.cpp" />
136 125 
     <ClCompile Include="desmume\SPU.cpp" />
137 126 
     <ClCompile Include="desmume\thumb_instructions.cpp" />
127 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86assembler.cpp" />
128 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86compiler.cpp" />
129 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86context.cpp" />
130 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86cpuinfo.cpp" />
131 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86inst.cpp" />
132 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand.cpp" />
133 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand_regs.cpp" />
134 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86scheduler.cpp" />
138 135 
     <ClCompile Include="desmume\utils\dlditool.cpp" />
139 136 
     <ClCompile Include="desmume\utils\xstring.cpp" />
140 137 
     <ClCompile Include="desmume\version.cpp" />
... ... 
@@ -145,45 +142,33 @@
145 142 
     <ClInclude Include="desmume\arm_jit.h" />
146 143 
     <ClInclude Include="desmume\instructions.h" />
147 144 
     <ClInclude Include="desmume\instruction_attributes.h" />
148 
-    <ClInclude Include="desmume\utils\AsmJit\AsmJit.h" />
149 
-    <ClInclude Include="desmume\utils\AsmJit\Config.h" />
150 
-    <ClInclude Include="desmume\utils\AsmJit\core.h" />
151 
-    <ClInclude Include="desmume\utils\AsmJit\core\apibegin.h" />
152 
-    <ClInclude Include="desmume\utils\AsmJit\core\apiend.h" />
153 
-    <ClInclude Include="desmume\utils\AsmJit\core\assembler.h" />
154 
-    <ClInclude Include="desmume\utils\AsmJit\core\assert.h" />
155 
-    <ClInclude Include="desmume\utils\AsmJit\core\buffer.h" />
156 
-    <ClInclude Include="desmume\utils\AsmJit\core\build.h" />
157 
-    <ClInclude Include="desmume\utils\AsmJit\core\compiler.h" />
158 
-    <ClInclude Include="desmume\utils\AsmJit\core\compilercontext.h" />
159 
-    <ClInclude Include="desmume\utils\AsmJit\core\compilerfunc.h" />
160 
-    <ClInclude Include="desmume\utils\AsmJit\core\compileritem.h" />
161 
-    <ClInclude Include="desmume\utils\AsmJit\core\context.h" />
162 
-    <ClInclude Include="desmume\utils\AsmJit\core\cpuinfo.h" />
163 
-    <ClInclude Include="desmume\utils\AsmJit\core\defs.h" />
164 
-    <ClInclude Include="desmume\utils\AsmJit\core\func.h" />
165 
-    <ClInclude Include="desmume\utils\AsmJit\core\intutil.h" />
166 
-    <ClInclude Include="desmume\utils\AsmJit\core\lock.h" />
167 
-    <ClInclude Include="desmume\utils\AsmJit\core\logger.h" />
168 
-    <ClInclude Include="desmume\utils\AsmJit\core\memorymanager.h" />
169 
-    <ClInclude Include="desmume\utils\AsmJit\core\memorymarker.h" />
170 
-    <ClInclude Include="desmume\utils\AsmJit\core\operand.h" />
171 
-    <ClInclude Include="desmume\utils\AsmJit\core\podvector.h" />
172 
-    <ClInclude Include="desmume\utils\AsmJit\core\stringbuilder.h" />
173 
-    <ClInclude Include="desmume\utils\AsmJit\core\stringutil.h" />
174 
-    <ClInclude Include="desmume\utils\AsmJit\core\virtualmemory.h" />
175 
-    <ClInclude Include="desmume\utils\AsmJit\core\zonememory.h" />
145 
+    <ClInclude Include="desmume\utils\AsmJit\apibegin.h" />
146 
+    <ClInclude Include="desmume\utils\AsmJit\apiend.h" />
147 
+    <ClInclude Include="desmume\utils\AsmJit\asmjit.h" />
148 
+    <ClInclude Include="desmume\utils\AsmJit\base.h" />
149 
+    <ClInclude Include="desmume\utils\AsmJit\base\assembler.h" />
150 
+    <ClInclude Include="desmume\utils\AsmJit\base\codegen.h" />
151 
+    <ClInclude Include="desmume\utils\AsmJit\base\compiler.h" />
152 
+    <ClInclude Include="desmume\utils\AsmJit\base\constpool.h" />
153 
+    <ClInclude Include="desmume\utils\AsmJit\base\containers.h" />
154 
+    <ClInclude Include="desmume\utils\AsmJit\base\context_p.h" />
155 
+    <ClInclude Include="desmume\utils\AsmJit\base\cpuinfo.h" />
156 
+    <ClInclude Include="desmume\utils\AsmJit\base\cputicks.h" />
157 
+    <ClInclude Include="desmume\utils\AsmJit\base\error.h" />
158 
+    <ClInclude Include="desmume\utils\AsmJit\base\globals.h" />
159 
+    <ClInclude Include="desmume\utils\AsmJit\base\intutil.h" />
160 
+    <ClInclude Include="desmume\utils\AsmJit\base\lock.h" />
161 
+    <ClInclude Include="desmume\utils\AsmJit\base\logger.h" />
162 
+    <ClInclude Include="desmume\utils\AsmJit\base\operand.h" />
163 
+    <ClInclude Include="desmume\utils\AsmJit\base\runtime.h" />
164 
+    <ClInclude Include="desmume\utils\AsmJit\base\string.h" />
165 
+    <ClInclude Include="desmume\utils\AsmJit\base\vectypes.h" />
166 
+    <ClInclude Include="desmume\utils\AsmJit\base\vmem.h" />
167 
+    <ClInclude Include="desmume\utils\AsmJit\base\zone.h" />
168 
+    <ClInclude Include="desmume\utils\AsmJit\build.h" />
169 
+    <ClInclude Include="desmume\utils\AsmJit\config.h" />
170 
+    <ClInclude Include="desmume\utils\AsmJit\host.h" />
176 171 
     <ClInclude Include="desmume\utils\AsmJit\x86.h" />
177 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86assembler.h" />
178 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86compiler.h" />
179 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86compilercontext.h" />
180 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86compilerfunc.h" />
181 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86compileritem.h" />
182 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86cpuinfo.h" />
183 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86defs.h" />
184 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86func.h" />
185 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86operand.h" />
186 
-    <ClInclude Include="desmume\utils\AsmJit\x86\x86util.h" />
187 172 
     <ClInclude Include="desmume\armcpu.h" />
188 173 
     <ClInclude Include="desmume\bios.h" />
189 174 
     <ClInclude Include="desmume\bits.h" />
... ... 
@@ -215,6 +200,13 @@
215 200 
     <ClInclude Include="desmume\slot1.h" />
216 201 
     <ClInclude Include="desmume\SPU.h" />
217 202 
     <ClInclude Include="desmume\types.h" />
203 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86assembler.h" />
204 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86compiler.h" />
205 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86context_p.h" />
206 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86cpuinfo.h" />
207 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86inst.h" />
208 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86operand.h" />
209 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86scheduler_p.h" />
218 210 
     <ClInclude Include="desmume\utils\xstring.h" />
219 211 
     <ClInclude Include="desmume\version.h" />
220 212 
   </ItemGroup>
Browse code

Somehow I've had the wrong include directory in the project files all this time, and thus was missing a file as well. Oops.

Naram Qashat authored on 2014/09/08 14:16:23
Showing 1 changed files
src/in_2sf/in_2sf.vcxproj
History View file @ 731415e
... ... 
@@ -50,7 +50,7 @@
50 50 
       <WarningLevel>Level4</WarningLevel>
51 51 
       <Optimization>Disabled</Optimization>
52 52 
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_2SF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;HAVE_LIBZ;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53 
-      <AdditionalIncludeDirectories>G:\Code\my_xsf\src;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
53 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 54 
       <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
55 55 
     </ClCompile>
56 56 
     <Link>
... ... 
@@ -67,7 +67,7 @@
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>G:\Code\my_xsf\src;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
70 
+      <AdditionalIncludeDirectories>..\in_xsf_framework;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71 71 
       <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 72 
     </ClCompile>
73 73 
     <Link>
Browse code

Initial creation of new git repository, this is currently lacking the source files, will be added in the next commit.

Naram Qashat authored on 2013/05/08 14:48:14
Showing 1 changed files
src/in_2sf/in_2sf.vcxproj
History View file @ 8f0a76d
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,233 @@
1 
+<?xml version="1.0" encoding="utf-8"?>
2 
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 
+  <ItemGroup Label="ProjectConfigurations">
4 
+    <ProjectConfiguration Include="Debug|Win32">
5 
+      <Configuration>Debug</Configuration>
6 
+      <Platform>Win32</Platform>
7 
+    </ProjectConfiguration>
8 
+    <ProjectConfiguration Include="Release|Win32">
9 
+      <Configuration>Release</Configuration>
10 
+      <Platform>Win32</Platform>
11 
+    </ProjectConfiguration>
12 
+  </ItemGroup>
13 
+  <PropertyGroup Label="Globals">
14 
+    <ProjectGuid>{1927E848-5CFF-4462-A5AB-2768A390C5F3}</ProjectGuid>
15 
+    <Keyword>Win32Proj</Keyword>
16 
+    <RootNamespace>in_2sf</RootNamespace>
17 
+  </PropertyGroup>
18 
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20 
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
21 
+    <UseDebugLibraries>true</UseDebugLibraries>
22 
+    <CharacterSet>Unicode</CharacterSet>
23 
+  </PropertyGroup>
24 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25 
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
26 
+    <UseDebugLibraries>false</UseDebugLibraries>
27 
+    <WholeProgramOptimization>true</WholeProgramOptimization>
28 
+    <CharacterSet>Unicode</CharacterSet>
29 
+  </PropertyGroup>
30 
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31 
+  <ImportGroup Label="ExtensionSettings">
32 
+  </ImportGroup>
33 
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
34 
+    <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 
+  </ImportGroup>
37 
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38 
+    <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 
+  </ImportGroup>
41 
+  <PropertyGroup Label="UserMacros" />
42 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
43 
+    <LinkIncremental>true</LinkIncremental>
44 
+  </PropertyGroup>
45 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
46 
+    <LinkIncremental>false</LinkIncremental>
47 
+  </PropertyGroup>
48 
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
49 
+    <ClCompile>
50 
+      <WarningLevel>Level4</WarningLevel>
51 
+      <Optimization>Disabled</Optimization>
52 
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_2SF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;HAVE_LIBZ;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53 
+      <AdditionalIncludeDirectories>G:\Code\my_xsf\src;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54 
+      <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
55 
+    </ClCompile>
56 
+    <Link>
57 
+      <SubSystem>Windows</SubSystem>
58 
+      <GenerateDebugInformation>true</GenerateDebugInformation>
59 
+      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
60 
+      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
61 
+    </Link>
62 
+  </ItemDefinitionGroup>
63 
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64 
+    <ClCompile>
65 
+      <WarningLevel>Level4</WarningLevel>
66 
+      <Optimization>MaxSpeed</Optimization>
67 
+      <FunctionLevelLinking>true</FunctionLevelLinking>
68 
+      <IntrinsicFunctions>true</IntrinsicFunctions>
69 
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_2SF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;HAVE_LIBZ;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70 
+      <AdditionalIncludeDirectories>G:\Code\my_xsf\src;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71 
+      <DisableSpecificWarnings>4065;4100;4127;4146;4189;4201;4244;4245;4512;4706;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 
+    </ClCompile>
73 
+    <Link>
74 
+      <SubSystem>Windows</SubSystem>
75 
+      <GenerateDebugInformation>true</GenerateDebugInformation>
76 
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
77 
+      <OptimizeReferences>true</OptimizeReferences>
78 
+      <AdditionalDependencies>zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
79 
+      <AdditionalLibraryDirectories>$(zlibRootDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
80 
+    </Link>
81 
+  </ItemDefinitionGroup>
82 
+  <ItemGroup>
83 
+    <ClCompile Include="desmume\arm_jit.cpp" />
84 
+    <ClCompile Include="desmume\metaspu\SoundTouch\mmx_optimized.cpp" />
85 
+    <ClCompile Include="desmume\utils\AsmJit\core\assembler.cpp" />
86 
+    <ClCompile Include="desmume\utils\AsmJit\core\assert.cpp" />
87 
+    <ClCompile Include="desmume\utils\AsmJit\core\buffer.cpp" />
88 
+    <ClCompile Include="desmume\utils\AsmJit\core\compiler.cpp" />
89 
+    <ClCompile Include="desmume\utils\AsmJit\core\compilercontext.cpp" />
90 
+    <ClCompile Include="desmume\utils\AsmJit\core\compilerfunc.cpp" />
91 
+    <ClCompile Include="desmume\utils\AsmJit\core\compileritem.cpp" />
92 
+    <ClCompile Include="desmume\utils\AsmJit\core\context.cpp" />
93 
+    <ClCompile Include="desmume\utils\AsmJit\core\cpuinfo.cpp" />
94 
+    <ClCompile Include="desmume\utils\AsmJit\core\defs.cpp" />
95 
+    <ClCompile Include="desmume\utils\AsmJit\core\logger.cpp" />
96 
+    <ClCompile Include="desmume\utils\AsmJit\core\memorymanager.cpp" />
97 
+    <ClCompile Include="desmume\utils\AsmJit\core\operand.cpp" />
98 
+    <ClCompile Include="desmume\utils\AsmJit\core\stringbuilder.cpp" />
99 
+    <ClCompile Include="desmume\utils\AsmJit\core\stringutil.cpp" />
100 
+    <ClCompile Include="desmume\utils\AsmJit\core\virtualmemory.cpp" />
101 
+    <ClCompile Include="desmume\utils\AsmJit\core\zonememory.cpp" />
102 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86assembler.cpp" />
103 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86compiler.cpp" />
104 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86compilercontext.cpp" />
105 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86compilerfunc.cpp" />
106 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86compileritem.cpp" />
107 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86cpuinfo.cpp" />
108 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86defs.cpp" />
109 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86func.cpp" />
110 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86operand.cpp" />
111 
+    <ClCompile Include="desmume\utils\AsmJit\x86\x86util.cpp" />
112 
+    <ClCompile Include="desmume\addons\slot1_retail.cpp" />
113 
+    <ClCompile Include="desmume\armcpu.cpp" />
114 
+    <ClCompile Include="desmume\arm_instructions.cpp" />
115 
+    <ClCompile Include="desmume\bios.cpp" />
116 
+    <ClCompile Include="desmume\cp15.cpp" />
117 
+    <ClCompile Include="desmume\emufile.cpp" />
118 
+    <ClCompile Include="desmume\FIFO.cpp" />
119 
+    <ClCompile Include="desmume\firmware.cpp" />
120 
+    <ClCompile Include="desmume\mc.cpp" />
121 
+    <ClCompile Include="desmume\metaspu\metaspu.cpp" />
122 
+    <ClCompile Include="desmume\metaspu\SndOut.cpp" />
123 
+    <ClCompile Include="desmume\metaspu\SoundTouch\AAFilter.cpp" />
124 
+    <ClCompile Include="desmume\metaspu\SoundTouch\cpu_detect_x86_win.cpp" />
125 
+    <ClCompile Include="desmume\metaspu\SoundTouch\FIFOSampleBuffer.cpp" />
126 
+    <ClCompile Include="desmume\metaspu\SoundTouch\FIRFilter.cpp" />
127 
+    <ClCompile Include="desmume\metaspu\SoundTouch\RateTransposer.cpp" />
128 
+    <ClCompile Include="desmume\metaspu\SoundTouch\SoundTouch.cpp" />
129 
+    <ClCompile Include="desmume\metaspu\SoundTouch\sse_optimized.cpp" />
130 
+    <ClCompile Include="desmume\metaspu\SoundTouch\TDStretch.cpp" />
131 
+    <ClCompile Include="desmume\metaspu\Timestretcher.cpp" />
132 
+    <ClCompile Include="desmume\MMU.cpp" />
133 
+    <ClCompile Include="desmume\NDSSystem.cpp" />
134 
+    <ClCompile Include="desmume\readwrite.cpp" />
135 
+    <ClCompile Include="desmume\slot1.cpp" />
136 
+    <ClCompile Include="desmume\SPU.cpp" />
137 
+    <ClCompile Include="desmume\thumb_instructions.cpp" />
138 
+    <ClCompile Include="desmume\utils\dlditool.cpp" />
139 
+    <ClCompile Include="desmume\utils\xstring.cpp" />
140 
+    <ClCompile Include="desmume\version.cpp" />
141 
+    <ClCompile Include="XSFConfig_2SF.cpp" />
142 
+    <ClCompile Include="XSFPlayer_2SF.cpp" />
143 
+  </ItemGroup>
144 
+  <ItemGroup>
145 
+    <ClInclude Include="desmume\arm_jit.h" />
146 
+    <ClInclude Include="desmume\instructions.h" />
147 
+    <ClInclude Include="desmume\instruction_attributes.h" />
148 
+    <ClInclude Include="desmume\utils\AsmJit\AsmJit.h" />
149 
+    <ClInclude Include="desmume\utils\AsmJit\Config.h" />
150 
+    <ClInclude Include="desmume\utils\AsmJit\core.h" />
151 
+    <ClInclude Include="desmume\utils\AsmJit\core\apibegin.h" />
152 
+    <ClInclude Include="desmume\utils\AsmJit\core\apiend.h" />
153 
+    <ClInclude Include="desmume\utils\AsmJit\core\assembler.h" />
154 
+    <ClInclude Include="desmume\utils\AsmJit\core\assert.h" />
155 
+    <ClInclude Include="desmume\utils\AsmJit\core\buffer.h" />
156 
+    <ClInclude Include="desmume\utils\AsmJit\core\build.h" />
157 
+    <ClInclude Include="desmume\utils\AsmJit\core\compiler.h" />
158 
+    <ClInclude Include="desmume\utils\AsmJit\core\compilercontext.h" />
159 
+    <ClInclude Include="desmume\utils\AsmJit\core\compilerfunc.h" />
160 
+    <ClInclude Include="desmume\utils\AsmJit\core\compileritem.h" />
161 
+    <ClInclude Include="desmume\utils\AsmJit\core\context.h" />
162 
+    <ClInclude Include="desmume\utils\AsmJit\core\cpuinfo.h" />
163 
+    <ClInclude Include="desmume\utils\AsmJit\core\defs.h" />
164 
+    <ClInclude Include="desmume\utils\AsmJit\core\func.h" />
165 
+    <ClInclude Include="desmume\utils\AsmJit\core\intutil.h" />
166 
+    <ClInclude Include="desmume\utils\AsmJit\core\lock.h" />
167 
+    <ClInclude Include="desmume\utils\AsmJit\core\logger.h" />
168 
+    <ClInclude Include="desmume\utils\AsmJit\core\memorymanager.h" />
169 
+    <ClInclude Include="desmume\utils\AsmJit\core\memorymarker.h" />
170 
+    <ClInclude Include="desmume\utils\AsmJit\core\operand.h" />
171 
+    <ClInclude Include="desmume\utils\AsmJit\core\podvector.h" />
172 
+    <ClInclude Include="desmume\utils\AsmJit\core\stringbuilder.h" />
173 
+    <ClInclude Include="desmume\utils\AsmJit\core\stringutil.h" />
174 
+    <ClInclude Include="desmume\utils\AsmJit\core\virtualmemory.h" />
175 
+    <ClInclude Include="desmume\utils\AsmJit\core\zonememory.h" />
176 
+    <ClInclude Include="desmume\utils\AsmJit\x86.h" />
177 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86assembler.h" />
178 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86compiler.h" />
179 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86compilercontext.h" />
180 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86compilerfunc.h" />
181 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86compileritem.h" />
182 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86cpuinfo.h" />
183 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86defs.h" />
184 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86func.h" />
185 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86operand.h" />
186 
+    <ClInclude Include="desmume\utils\AsmJit\x86\x86util.h" />
187 
+    <ClInclude Include="desmume\armcpu.h" />
188 
+    <ClInclude Include="desmume\bios.h" />
189 
+    <ClInclude Include="desmume\bits.h" />
190 
+    <ClInclude Include="desmume\cp15.h" />
191 
+    <ClInclude Include="desmume\emufile.h" />
192 
+    <ClInclude Include="desmume\FIFO.h" />
193 
+    <ClInclude Include="desmume\firmware.h" />
194 
+    <ClInclude Include="desmume\matrix.h" />
195 
+    <ClInclude Include="desmume\mc.h" />
196 
+    <ClInclude Include="desmume\mem.h" />
197 
+    <ClInclude Include="desmume\metaspu\metaspu.h" />
198 
+    <ClInclude Include="desmume\metaspu\SndOut.h" />
199 
+    <ClInclude Include="desmume\metaspu\SoundTouch\AAFilter.h" />
200 
+    <ClInclude Include="desmume\metaspu\SoundTouch\cpu_detect.h" />
201 
+    <ClInclude Include="desmume\metaspu\SoundTouch\FIFOSampleBuffer.h" />
202 
+    <ClInclude Include="desmume\metaspu\SoundTouch\FIFOSamplePipe.h" />
203 
+    <ClInclude Include="desmume\metaspu\SoundTouch\FIRFilter.h" />
204 
+    <ClInclude Include="desmume\metaspu\SoundTouch\RateTransposer.h" />
205 
+    <ClInclude Include="desmume\metaspu\SoundTouch\SoundTouch.h" />
206 
+    <ClInclude Include="desmume\metaspu\SoundTouch\STTypes.h" />
207 
+    <ClInclude Include="desmume\metaspu\SoundTouch\TDStretch.h" />
208 
+    <ClInclude Include="desmume\MMU.h" />
209 
+    <ClInclude Include="desmume\MMU_timing.h" />
210 
+    <ClInclude Include="desmume\NDSSystem.h" />
211 
+    <ClInclude Include="desmume\PACKED.h" />
212 
+    <ClInclude Include="desmume\PACKED_END.h" />
213 
+    <ClInclude Include="desmume\readwrite.h" />
214 
+    <ClInclude Include="desmume\registers.h" />
215 
+    <ClInclude Include="desmume\slot1.h" />
216 
+    <ClInclude Include="desmume\SPU.h" />
217 
+    <ClInclude Include="desmume\types.h" />
218 
+    <ClInclude Include="desmume\utils\xstring.h" />
219 
+    <ClInclude Include="desmume\version.h" />
220 
+  </ItemGroup>
221 
+  <ItemGroup>
222 
+    <None Include="desmume\instruction_tabdef.inc" />
223 
+    <None Include="desmume\thumb_tabdef.inc" />
224 
+  </ItemGroup>
225 
+  <ItemGroup>
226 
+    <ProjectReference Include="..\in_xsf_framework\in_xsf_framework.vcxproj">
227 
+      <Project>{9d6d2540-b3dc-462b-bbc0-5b7c32a4d581}</Project>
228 
+    </ProjectReference>
229 
+  </ItemGroup>
230 
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
231 
+  <ImportGroup Label="ExtensionTargets">
232 
+  </ImportGroup>
233 
+</Project>
0 234 
\ No newline at end of file