Skip to content

Commit 594fe06

Browse files
icculusicculus
committed
msvc: Updated Visual Studio project files, fixes for MSVC compiler warnings.
1 parent e3a46e9 commit 594fe06

File tree

10 files changed

+85
-901
lines changed

10 files changed

+85
-901
lines changed

‎VisualC/SDL_mixer.sln

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_mixer", "SDL_mixer.vcx
66
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
77
EndProjectSection
88
EndProject
9-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi.vcxproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}"
10-
EndProject
11-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus.vcxproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}"
12-
ProjectSection(ProjectDependencies) = postProject
13-
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
14-
EndProjectSection
15-
EndProject
16-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave.vcxproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}"
17-
ProjectSection(ProjectDependencies) = postProject
18-
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
19-
EndProjectSection
20-
EndProject
219
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity.vcxproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}"
2210
EndProject
2311
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3", "..\external\SDL\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
@@ -38,30 +26,6 @@ Global
3826
{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.Build.0 = Release|Win32
3927
{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.ActiveCfg = Release|x64
4028
{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.Build.0 = Release|x64
41-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.ActiveCfg = Debug|Win32
42-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.Build.0 = Debug|Win32
43-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.ActiveCfg = Debug|x64
44-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.Build.0 = Debug|x64
45-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.ActiveCfg = Release|Win32
46-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.Build.0 = Release|Win32
47-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.ActiveCfg = Release|x64
48-
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.Build.0 = Release|x64
49-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.ActiveCfg = Debug|Win32
50-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.Build.0 = Debug|Win32
51-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.ActiveCfg = Debug|x64
52-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.Build.0 = Debug|x64
53-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.ActiveCfg = Release|Win32
54-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.Build.0 = Release|Win32
55-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.ActiveCfg = Release|x64
56-
{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.Build.0 = Release|x64
57-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.ActiveCfg = Debug|Win32
58-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.Build.0 = Debug|Win32
59-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.ActiveCfg = Debug|x64
60-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.Build.0 = Debug|x64
61-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.ActiveCfg = Release|Win32
62-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.Build.0 = Release|Win32
63-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.ActiveCfg = Release|x64
64-
{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.Build.0 = Release|x64
6529
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.ActiveCfg = Debug|Win32
6630
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.Build.0 = Debug|Win32
6731
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.ActiveCfg = Debug|x64

‎VisualC/SDL_mixer.vcxproj

Lines changed: 25 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -213,27 +213,8 @@
213213
</ItemDefinitionGroup>
214214
<ItemGroup>
215215
<ClInclude Include="..\include\SDL3_mixer\SDL_mixer.h" />
216-
<ClInclude Include="..\src\effects_internal.h" />
217-
<ClInclude Include="..\src\mixer.h" />
218-
<ClInclude Include="..\src\music.h" />
219-
<ClInclude Include="..\src\utils.h" />
220-
<ClInclude Include="..\src\codecs\load_aiff.h" />
221-
<ClInclude Include="..\src\codecs\load_sndfile.h" />
222-
<ClInclude Include="..\src\codecs\load_voc.h" />
223-
<ClInclude Include="..\src\codecs\mp3utils.h" />
224-
<ClInclude Include="..\src\codecs\music_drflac.h" />
225-
<ClInclude Include="..\src\codecs\music_drmp3.h" />
226-
<ClInclude Include="..\src\codecs\music_flac.h" />
227-
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
228-
<ClInclude Include="..\src\codecs\music_gme.h" />
229-
<ClInclude Include="..\src\codecs\music_mpg123.h" />
230-
<ClInclude Include="..\src\codecs\music_nativemidi.h" />
231-
<ClInclude Include="..\src\codecs\music_ogg.h" />
232-
<ClInclude Include="..\src\codecs\music_opus.h" />
233-
<ClInclude Include="..\src\codecs\music_timidity.h" />
234-
<ClInclude Include="..\src\codecs\music_wav.h" />
235-
<ClInclude Include="..\src\codecs\music_wavpack.h" />
236-
<ClInclude Include="..\src\codecs\music_xmp.h" />
216+
<ClInclude Include="..\src\SDL_mixer_internal.h" />
217+
<ClInclude Include="..\src\SDL_mixer_loader.h" />
237218
</ItemGroup>
238219
<ItemGroup>
239220
<ResourceCompile Include="..\src\version.rc">
@@ -244,14 +225,6 @@
244225
</ResourceCompile>
245226
</ItemGroup>
246227
<ItemGroup>
247-
<ProjectReference Include="native_midi\native_midi.vcxproj">
248-
<Project>{ebda67ca-4a23-4f22-bfbc-b8dbe0580d4f}</Project>
249-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
250-
<Private>false</Private>
251-
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
252-
<LinkLibraryDependencies>true</LinkLibraryDependencies>
253-
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
254-
</ProjectReference>
255228
<ProjectReference Include="timidity\timidity.vcxproj">
256229
<Project>{b162b6f1-e876-4d5f-a1f6-e3a6dc2f4a2c}</Project>
257230
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -433,32 +406,6 @@
433406
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
434407
</CustomBuild>
435408
</ItemGroup>
436-
<ItemGroup>
437-
<ClCompile Include="..\src\effect_position.c" />
438-
<ClCompile Include="..\src\effect_stereoreverse.c" />
439-
<ClCompile Include="..\src\effects_internal.c" />
440-
<ClCompile Include="..\src\mixer.c" />
441-
<ClCompile Include="..\src\music.c" />
442-
<ClCompile Include="..\src\utils.c" />
443-
<ClCompile Include="..\src\codecs\load_aiff.c" />
444-
<ClCompile Include="..\src\codecs\load_sndfile.c" />
445-
<ClCompile Include="..\src\codecs\load_voc.c" />
446-
<ClCompile Include="..\src\codecs\mp3utils.c" />
447-
<ClCompile Include="..\src\codecs\music_drflac.c" />
448-
<ClCompile Include="..\src\codecs\music_drmp3.c" />
449-
<ClCompile Include="..\src\codecs\music_flac.c" />
450-
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
451-
<ClCompile Include="..\src\codecs\music_gme.c" />
452-
<ClCompile Include="..\src\codecs\music_mpg123.c" />
453-
<ClCompile Include="..\src\codecs\music_nativemidi.c" />
454-
<ClCompile Include="..\src\codecs\music_ogg.c" />
455-
<ClCompile Include="..\src\codecs\music_ogg_stb.c" />
456-
<ClCompile Include="..\src\codecs\music_opus.c" />
457-
<ClCompile Include="..\src\codecs\music_timidity.c" />
458-
<ClCompile Include="..\src\codecs\music_wav.c" />
459-
<ClCompile Include="..\src\codecs\music_wavpack.c" />
460-
<ClCompile Include="..\src\codecs\music_xmp.c" />
461-
</ItemGroup>
462409
<ItemGroup>
463410
<CustomBuild Include="external\optional\x64\libgme.dll">
464411
<FileType>Document</FileType>
@@ -497,6 +444,29 @@
497444
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
498445
</CustomBuild>
499446
</ItemGroup>
447+
<ItemGroup>
448+
<ClCompile Include="..\src\decoder_aiff.c" />
449+
<ClCompile Include="..\src\decoder_au.c" />
450+
<ClCompile Include="..\src\decoder_drflac.c" />
451+
<ClCompile Include="..\src\decoder_drmp3.c" />
452+
<ClCompile Include="..\src\decoder_flac.c" />
453+
<ClCompile Include="..\src\decoder_fluidsynth.c" />
454+
<ClCompile Include="..\src\decoder_gme.c" />
455+
<ClCompile Include="..\src\decoder_mpg123.c" />
456+
<ClCompile Include="..\src\decoder_opus.c" />
457+
<ClCompile Include="..\src\decoder_raw.c" />
458+
<ClCompile Include="..\src\decoder_sinewave.c" />
459+
<ClCompile Include="..\src\decoder_stb_vorbis.c" />
460+
<ClCompile Include="..\src\decoder_timidity.c" />
461+
<ClCompile Include="..\src\decoder_voc.c" />
462+
<ClCompile Include="..\src\decoder_vorbis.c" />
463+
<ClCompile Include="..\src\decoder_wav.c" />
464+
<ClCompile Include="..\src\decoder_wavpack.c" />
465+
<ClCompile Include="..\src\decoder_xmp.c" />
466+
<ClCompile Include="..\src\SDL_mixer.c" />
467+
<ClCompile Include="..\src\SDL_mixer_metadata_tags.c" />
468+
<ClCompile Include="..\src\SDL_mixer_spatialization.c" />
469+
</ItemGroup>
500470
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
501471
<ImportGroup Label="ExtensionTargets">
502472
</ImportGroup>

‎VisualC/SDL_mixer.vcxproj.filters

Lines changed: 34 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,10 @@
44
<ClInclude Include="..\include\SDL3_mixer\SDL_mixer.h">
55
<Filter>Public Headers</Filter>
66
</ClInclude>
7-
<ClInclude Include="..\src\utils.h">
7+
<ClInclude Include="..\src\SDL_mixer_internal.h">
88
<Filter>Sources</Filter>
99
</ClInclude>
10-
<ClInclude Include="..\src\effects_internal.h">
11-
<Filter>Sources</Filter>
12-
</ClInclude>
13-
<ClInclude Include="..\src\mixer.h">
14-
<Filter>Sources</Filter>
15-
</ClInclude>
16-
<ClInclude Include="..\src\music.h">
17-
<Filter>Sources</Filter>
18-
</ClInclude>
19-
<ClInclude Include="..\src\codecs\load_aiff.h">
20-
<Filter>Sources</Filter>
21-
</ClInclude>
22-
<ClInclude Include="..\src\codecs\load_sndfile.h">
23-
<Filter>Sources</Filter>
24-
</ClInclude>
25-
<ClInclude Include="..\src\codecs\load_voc.h">
26-
<Filter>Sources</Filter>
27-
</ClInclude>
28-
<ClInclude Include="..\src\codecs\mp3utils.h">
29-
<Filter>Sources</Filter>
30-
</ClInclude>
31-
<ClInclude Include="..\src\codecs\music_drflac.h">
32-
<Filter>Sources</Filter>
33-
</ClInclude>
34-
<ClInclude Include="..\src\codecs\music_drmp3.h">
35-
<Filter>Sources</Filter>
36-
</ClInclude>
37-
<ClInclude Include="..\src\codecs\music_flac.h">
38-
<Filter>Sources</Filter>
39-
</ClInclude>
40-
<ClInclude Include="..\src\codecs\music_fluidsynth.h">
41-
<Filter>Sources</Filter>
42-
</ClInclude>
43-
<ClInclude Include="..\src\codecs\music_gme.h">
44-
<Filter>Sources</Filter>
45-
</ClInclude>
46-
<ClInclude Include="..\src\codecs\music_mpg123.h">
47-
<Filter>Sources</Filter>
48-
</ClInclude>
49-
<ClInclude Include="..\src\codecs\music_nativemidi.h">
50-
<Filter>Sources</Filter>
51-
</ClInclude>
52-
<ClInclude Include="..\src\codecs\music_ogg.h">
53-
<Filter>Sources</Filter>
54-
</ClInclude>
55-
<ClInclude Include="..\src\codecs\music_opus.h">
56-
<Filter>Sources</Filter>
57-
</ClInclude>
58-
<ClInclude Include="..\src\codecs\music_timidity.h">
59-
<Filter>Sources</Filter>
60-
</ClInclude>
61-
<ClInclude Include="..\src\codecs\music_wav.h">
62-
<Filter>Sources</Filter>
63-
</ClInclude>
64-
<ClInclude Include="..\src\codecs\music_wavpack.h">
65-
<Filter>Sources</Filter>
66-
</ClInclude>
67-
<ClInclude Include="..\src\codecs\music_xmp.h">
10+
<ClInclude Include="..\src\SDL_mixer_loader.h">
6811
<Filter>Sources</Filter>
6912
</ClInclude>
7013
</ItemGroup>
@@ -129,114 +72,81 @@
12972
<CustomBuild Include="external\optional\x86\LICENSE.xmp.txt">
13073
<Filter>x86</Filter>
13174
</CustomBuild>
75+
<CustomBuild Include="external\optional\x64\libxmp.dll" />
76+
<CustomBuild Include="external\optional\x64\libogg-0.dll" />
77+
<CustomBuild Include="external\optional\x64\libopus-0.dll" />
78+
<CustomBuild Include="external\optional\x64\libopusfile-0.dll" />
79+
<CustomBuild Include="external\optional\x64\libwavpack-1.dll" />
80+
<CustomBuild Include="external\optional\x64\LICENSE.xmp.txt" />
81+
<CustomBuild Include="external\optional\x64\LICENSE.ogg-vorbis.txt" />
82+
<CustomBuild Include="external\optional\x64\LICENSE.opus.txt" />
83+
<CustomBuild Include="external\optional\x64\LICENSE.opusfile.txt" />
84+
<CustomBuild Include="external\optional\x64\LICENSE.wavpack.txt" />
85+
<CustomBuild Include="external\optional\x64\LICENSE.gme.txt" />
13286
</ItemGroup>
13387
<ItemGroup>
134-
<ClCompile Include="..\src\utils.c">
135-
<Filter>Sources</Filter>
136-
</ClCompile>
137-
<ClCompile Include="..\src\effects_internal.c">
138-
<Filter>Sources</Filter>
139-
</ClCompile>
140-
<ClCompile Include="..\src\effect_position.c">
141-
<Filter>Sources</Filter>
142-
</ClCompile>
143-
<ClCompile Include="..\src\effect_stereoreverse.c">
88+
<ClCompile Include="..\src\decoder_aiff.c">
14489
<Filter>Sources</Filter>
14590
</ClCompile>
146-
<ClCompile Include="..\src\mixer.c">
91+
<ClCompile Include="..\src\decoder_au.c">
14792
<Filter>Sources</Filter>
14893
</ClCompile>
149-
<ClCompile Include="..\src\music.c">
94+
<ClCompile Include="..\src\decoder_drflac.c">
15095
<Filter>Sources</Filter>
15196
</ClCompile>
152-
<ClCompile Include="..\src\codecs\load_aiff.c">
97+
<ClCompile Include="..\src\decoder_drmp3.c">
15398
<Filter>Sources</Filter>
15499
</ClCompile>
155-
<ClCompile Include="..\src\codecs\load_sndfile.c">
100+
<ClCompile Include="..\src\decoder_flac.c">
156101
<Filter>Sources</Filter>
157102
</ClCompile>
158-
<ClCompile Include="..\src\codecs\load_voc.c">
103+
<ClCompile Include="..\src\decoder_fluidsynth.c">
159104
<Filter>Sources</Filter>
160105
</ClCompile>
161-
<ClCompile Include="..\src\codecs\mp3utils.c">
106+
<ClCompile Include="..\src\decoder_gme.c">
162107
<Filter>Sources</Filter>
163108
</ClCompile>
164-
<ClCompile Include="..\src\codecs\music_drflac.c">
109+
<ClCompile Include="..\src\decoder_mpg123.c">
165110
<Filter>Sources</Filter>
166111
</ClCompile>
167-
<ClCompile Include="..\src\codecs\music_drmp3.c">
112+
<ClCompile Include="..\src\decoder_opus.c">
168113
<Filter>Sources</Filter>
169114
</ClCompile>
170-
<ClCompile Include="..\src\codecs\music_flac.c">
115+
<ClCompile Include="..\src\decoder_raw.c">
171116
<Filter>Sources</Filter>
172117
</ClCompile>
173-
<ClCompile Include="..\src\codecs\music_fluidsynth.c">
118+
<ClCompile Include="..\src\decoder_sinewave.c">
174119
<Filter>Sources</Filter>
175120
</ClCompile>
176-
<ClCompile Include="..\src\codecs\music_gme.c">
121+
<ClCompile Include="..\src\decoder_stb_vorbis.c">
177122
<Filter>Sources</Filter>
178123
</ClCompile>
179-
<ClCompile Include="..\src\codecs\music_mpg123.c">
124+
<ClCompile Include="..\src\decoder_timidity.c">
180125
<Filter>Sources</Filter>
181126
</ClCompile>
182-
<ClCompile Include="..\src\codecs\music_nativemidi.c">
127+
<ClCompile Include="..\src\decoder_voc.c">
183128
<Filter>Sources</Filter>
184129
</ClCompile>
185-
<ClCompile Include="..\src\codecs\music_ogg.c">
130+
<ClCompile Include="..\src\decoder_vorbis.c">
186131
<Filter>Sources</Filter>
187132
</ClCompile>
188-
<ClCompile Include="..\src\codecs\music_ogg_stb.c">
133+
<ClCompile Include="..\src\decoder_wav.c">
189134
<Filter>Sources</Filter>
190135
</ClCompile>
191-
<ClCompile Include="..\src\codecs\music_opus.c">
136+
<ClCompile Include="..\src\decoder_wavpack.c">
192137
<Filter>Sources</Filter>
193138
</ClCompile>
194-
<ClCompile Include="..\src\codecs\music_timidity.c">
139+
<ClCompile Include="..\src\decoder_xmp.c">
195140
<Filter>Sources</Filter>
196141
</ClCompile>
197-
<ClCompile Include="..\src\codecs\music_wav.c">
142+
<ClCompile Include="..\src\SDL_mixer.c">
198143
<Filter>Sources</Filter>
199144
</ClCompile>
200-
<ClCompile Include="..\src\codecs\music_wavpack.c">
145+
<ClCompile Include="..\src\SDL_mixer_metadata_tags.c">
201146
<Filter>Sources</Filter>
202147
</ClCompile>
203-
<ClCompile Include="..\src\codecs\music_xmp.c">
148+
<ClCompile Include="..\src\SDL_mixer_spatialization.c">
204149
<Filter>Sources</Filter>
205150
</ClCompile>
206151
</ItemGroup>
207-
<ItemGroup>
208-
<None Include="external\optional\x64\libogg-0.dll">
209-
<Filter>x64</Filter>
210-
</None>
211-
<None Include="external\optional\x64\libopus-0.dll">
212-
<Filter>x64</Filter>
213-
</None>
214-
<None Include="external\optional\x64\libopusfile-0.dll">
215-
<Filter>x64</Filter>
216-
</None>
217-
<None Include="external\optional\x64\libwavpack-1.dll">
218-
<Filter>x64</Filter>
219-
</None>
220-
<None Include="external\optional\x64\libxmp.dll">
221-
<Filter>x64</Filter>
222-
</None>
223-
<None Include="external\optional\x64\LICENSE.gme.txt">
224-
<Filter>x64</Filter>
225-
</None>
226-
<None Include="external\optional\x64\LICENSE.ogg-vorbis.txt">
227-
<Filter>x64</Filter>
228-
</None>
229-
<None Include="external\optional\x64\LICENSE.opus.txt">
230-
<Filter>x64</Filter>
231-
</None>
232-
<None Include="external\optional\x64\LICENSE.opusfile.txt">
233-
<Filter>x64</Filter>
234-
</None>
235-
<None Include="external\optional\x64\LICENSE.wavpack.txt">
236-
<Filter>x64</Filter>
237-
</None>
238-
<None Include="external\optional\x64\LICENSE.xmp.txt">
239-
<Filter>x64</Filter>
240-
</None>
241-
</ItemGroup>
242152
</Project>

0 commit comments

Comments
 (0)