Browse code

Add CMake scripts in preparation for wxWidgets changes.

(One downside here, zlib's CMake script renames its zconf.h... which in turn means that the submodule now thinks there are uncommitted changes. :/)

Naram Qashat authored on 2021/03/28 19:43:33
Showing 1 changed files
... ...
@@ -128,6 +128,9 @@
128 128
       <Project>{9d6d2540-b3dc-462b-bbc0-5b7c32a4d581}</Project>
129 129
     </ProjectReference>
130 130
   </ItemGroup>
131
+  <ItemGroup>
132
+    <Text Include="CMakeLists.txt" />
133
+  </ItemGroup>
131 134
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
132 135
   <ImportGroup Label="ExtensionTargets">
133 136
   </ImportGroup>
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
... ...
@@ -52,7 +52,7 @@
52 52
       <Optimization>Disabled</Optimization>
53 53
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;_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>4100;4127;4244;4245;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
55
+      <DisableSpecificWarnings>4100;4127;4244;4245;4310;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_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70 70
       <AdditionalIncludeDirectories>..\in_xsf_framework;..\in_xsf_framework\zlib;..\in_xsf_framework\winamp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71
-      <DisableSpecificWarnings>4100;4127;4244;4245;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
71
+      <DisableSpecificWarnings>4100;4127;4244;4245;4310;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
... ...
@@ -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>
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
... ...
@@ -50,7 +50,7 @@
50 50
       <WarningLevel>Level4</WarningLevel>
51 51
       <Optimization>Disabled</Optimization>
52 52
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;IN_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;_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>4100;4127;4244;4245;4310;%(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_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;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>4100;4127;4244;4245;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
72 72
     </ClCompile>
73 73
     <Link>
Browse code

[SNSF] Massive code cleanup, as well as removing as much unused code/variables as possible.

Naram Qashat authored on 2013/05/23 06:02:16
Showing 1 changed files
... ...
@@ -83,7 +83,6 @@
83 83
     <ClCompile Include="snes9x\apu\apu.cpp" />
84 84
     <ClCompile Include="snes9x\apu\SNES_SPC.cpp" />
85 85
     <ClCompile Include="snes9x\apu\SNES_SPC_misc.cpp" />
86
-    <ClCompile Include="snes9x\apu\SNES_SPC_state.cpp" />
87 86
     <ClCompile Include="snes9x\apu\SPC_DSP.cpp" />
88 87
     <ClCompile Include="snes9x\cpu.cpp" />
89 88
     <ClCompile Include="snes9x\cpuexec.cpp" />
... ...
@@ -105,7 +104,6 @@
105 104
     <ClInclude Include="snes9x\apu\blargg_common.h" />
106 105
     <ClInclude Include="snes9x\apu\blargg_config.h" />
107 106
     <ClInclude Include="snes9x\apu\blargg_endian.h" />
108
-    <ClInclude Include="snes9x\apu\blargg_source.h" />
109 107
     <ClInclude Include="snes9x\apu\hermite_resampler.h" />
110 108
     <ClInclude Include="snes9x\apu\linear_resampler.h" />
111 109
     <ClInclude Include="snes9x\apu\resampler.h" />
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
1 1
new file mode 100644
... ...
@@ -0,0 +1,137 @@
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>{C643848D-8ECB-4B45-9089-1F7DC4ED0451}</ProjectGuid>
15
+    <Keyword>Win32Proj</Keyword>
16
+    <RootNamespace>in_snsf</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_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53
+      <AdditionalIncludeDirectories>G:\Code\my_xsf\src;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54
+      <DisableSpecificWarnings>4100;4127;4244;4245;4310;%(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_SNSF_EXPORTS;_CRT_SECURE_NO_WARNINGS;WINAMP_PLUGIN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70
+      <AdditionalIncludeDirectories>G:\Code\my_xsf\src;$(zlibRootDir)\include;$(WinampSDKDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71
+      <DisableSpecificWarnings>4100;4127;4244;4245;4310;%(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="snes9x\apu\apu.cpp" />
84
+    <ClCompile Include="snes9x\apu\SNES_SPC.cpp" />
85
+    <ClCompile Include="snes9x\apu\SNES_SPC_misc.cpp" />
86
+    <ClCompile Include="snes9x\apu\SNES_SPC_state.cpp" />
87
+    <ClCompile Include="snes9x\apu\SPC_DSP.cpp" />
88
+    <ClCompile Include="snes9x\cpu.cpp" />
89
+    <ClCompile Include="snes9x\cpuexec.cpp" />
90
+    <ClCompile Include="snes9x\cpuops.cpp" />
91
+    <ClCompile Include="snes9x\dma.cpp" />
92
+    <ClCompile Include="snes9x\globals.cpp" />
93
+    <ClCompile Include="snes9x\memmap.cpp" />
94
+    <ClCompile Include="snes9x\ppu.cpp" />
95
+    <ClCompile Include="snes9x\sdd1.cpp" />
96
+    <ClCompile Include="XSFConfig_SNSF.cpp" />
97
+    <ClCompile Include="XSFPlayer_SNSF.cpp" />
98
+  </ItemGroup>
99
+  <ItemGroup>
100
+    <ClInclude Include="snes9x\apu\bspline_resampler.h" />
101
+    <ClInclude Include="snes9x\apu\osculating_resampler.h" />
102
+    <ClInclude Include="snes9x\apu\sinc_resampler.h" />
103
+    <ClInclude Include="snes9x\65c816.h" />
104
+    <ClInclude Include="snes9x\apu\apu.h" />
105
+    <ClInclude Include="snes9x\apu\blargg_common.h" />
106
+    <ClInclude Include="snes9x\apu\blargg_config.h" />
107
+    <ClInclude Include="snes9x\apu\blargg_endian.h" />
108
+    <ClInclude Include="snes9x\apu\blargg_source.h" />
109
+    <ClInclude Include="snes9x\apu\hermite_resampler.h" />
110
+    <ClInclude Include="snes9x\apu\linear_resampler.h" />
111
+    <ClInclude Include="snes9x\apu\resampler.h" />
112
+    <ClInclude Include="snes9x\apu\ring_buffer.h" />
113
+    <ClInclude Include="snes9x\apu\SNES_SPC.h" />
114
+    <ClInclude Include="snes9x\apu\SPC_CPU.h" />
115
+    <ClInclude Include="snes9x\apu\SPC_DSP.h" />
116
+    <ClInclude Include="snes9x\cpuaddr.h" />
117
+    <ClInclude Include="snes9x\cpuexec.h" />
118
+    <ClInclude Include="snes9x\cpumacro.h" />
119
+    <ClInclude Include="snes9x\cpuops.h" />
120
+    <ClInclude Include="snes9x\dma.h" />
121
+    <ClInclude Include="snes9x\getset.h" />
122
+    <ClInclude Include="snes9x\memmap.h" />
123
+    <ClInclude Include="snes9x\port.h" />
124
+    <ClInclude Include="snes9x\ppu.h" />
125
+    <ClInclude Include="snes9x\sdd1.h" />
126
+    <ClInclude Include="snes9x\snes9x.h" />
127
+    <ClInclude Include="XSFConfig_SNSF.h" />
128
+  </ItemGroup>
129
+  <ItemGroup>
130
+    <ProjectReference Include="..\in_xsf_framework\in_xsf_framework.vcxproj">
131
+      <Project>{9d6d2540-b3dc-462b-bbc0-5b7c32a4d581}</Project>
132
+    </ProjectReference>
133
+  </ItemGroup>
134
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
135
+  <ImportGroup Label="ExtensionTargets">
136
+  </ImportGroup>
137
+</Project>
0 138
\ No newline at end of file