Skip to content

Commit a294d58

Browse files
madebrmadebr
committed
VisualC project updates
1 parent d9b6dd3 commit a294d58

File tree

6 files changed

+165
-280
lines changed

6 files changed

+165
-280
lines changed

‎VisualC/SDL_mixer.vcxproj

Lines changed: 111 additions & 132 deletions
Large diffs are not rendered by default.

‎VisualC/native_midi/native_midi.vcxproj

Lines changed: 13 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="'$(SolutionDir)'==''">$(ProjectDir)..\</SolutionDir>
5+
</PropertyGroup>
36
<ItemGroup Label="ProjectConfigurations">
47
<ProjectConfiguration Include="Debug|Win32">
58
<Configuration>Debug</Configuration>
@@ -43,32 +46,16 @@
4346
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4447
<ImportGroup Label="ExtensionSettings">
4548
</ImportGroup>
46-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
47-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
49-
</ImportGroup>
50-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
51-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
53-
</ImportGroup>
54-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
55-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
57-
</ImportGroup>
58-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
59-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
61-
</ImportGroup>
6249
<PropertyGroup Label="UserMacros" />
6350
<PropertyGroup>
6451
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
65-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
52+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
6653
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
67-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
54+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
6855
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
69-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
56+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
7057
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
71-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
58+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
7259
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
7360
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
7461
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -97,91 +84,57 @@
9784
</PropertyGroup>
9885
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9986
<ClCompile>
100-
<AdditionalIncludeDirectories>..\..\include;..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10188
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10289
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
10390
<WarningLevel>Level3</WarningLevel>
10491
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
10592
</ClCompile>
106-
<ResourceCompile>
107-
<Culture>0x0409</Culture>
108-
</ResourceCompile>
109-
<Bscmake />
11093
</ItemDefinitionGroup>
11194
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
11295
<ClCompile>
11396
<Optimization>Disabled</Optimization>
114-
<AdditionalIncludeDirectories>..\..\include;..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11598
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
11699
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
117100
<WarningLevel>Level3</WarningLevel>
118101
<DebugInformationFormat>OldStyle</DebugInformationFormat>
119102
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
120103
</ClCompile>
121-
<ResourceCompile>
122-
<Culture>0x0409</Culture>
123-
</ResourceCompile>
124-
<Bscmake />
125104
</ItemDefinitionGroup>
126105
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
127106
<Midl>
128107
<TargetEnvironment>X64</TargetEnvironment>
129108
</Midl>
130109
<ClCompile>
131-
<AdditionalIncludeDirectories>..\..\include;..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
110+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132111
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133112
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
134113
<WarningLevel>Level3</WarningLevel>
135114
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
136115
</ClCompile>
137-
<ResourceCompile>
138-
<Culture>0x0409</Culture>
139-
</ResourceCompile>
140-
<Bscmake />
141116
</ItemDefinitionGroup>
142117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
143118
<Midl>
144119
<TargetEnvironment>X64</TargetEnvironment>
145120
</Midl>
146121
<ClCompile>
147122
<Optimization>Disabled</Optimization>
148-
<AdditionalIncludeDirectories>..\..\include;..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\codecs\native_midi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
149124
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150125
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
151126
<WarningLevel>Level3</WarningLevel>
152127
<DebugInformationFormat>OldStyle</DebugInformationFormat>
153128
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
154129
</ClCompile>
155-
<ResourceCompile>
156-
<Culture>0x0409</Culture>
157-
</ResourceCompile>
158-
<Bscmake />
159130
</ItemDefinitionGroup>
160131
<ItemGroup>
161132
<ClInclude Include="..\..\src\codecs\native_midi\native_midi.h" />
162133
<ClInclude Include="..\..\src\codecs\native_midi\native_midi_common.h" />
163134
</ItemGroup>
164135
<ItemGroup>
165-
<ClCompile Include="..\..\src\codecs\native_midi\native_midi_common.c">
166-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
168-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
169-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
170-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
172-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
173-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
174-
</ClCompile>
175-
<ClCompile Include="..\..\src\codecs\native_midi\native_midi_win32.c">
176-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
177-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
178-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
179-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
180-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
181-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
182-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
183-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
184-
</ClCompile>
136+
<ClCompile Include="..\..\src\codecs\native_midi\native_midi_common.c" />
137+
<ClCompile Include="..\..\src\codecs\native_midi\native_midi_win32.c" />
185138
</ItemGroup>
186139
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
187140
<ImportGroup Label="ExtensionTargets">

‎VisualC/pkg-support/cmake/sdl2_mixer-config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set_package_properties(SDL2_mixer PROPERTIES
77
DESCRIPTION "SDL_mixer is a sample multi-channel audio mixer library"
88
)
99

10-
cmake_minimum_required(VERSION 3.0)
10+
cmake_minimum_required(VERSION 3.0...3.5)
1111

1212
set(SDL2_mixer_FOUND TRUE)
1313

‎VisualC/playmus/playmus.vcxproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="'$(SolutionDir)'==''">$(ProjectDir)..\</SolutionDir>
5+
</PropertyGroup>
36
<ItemGroup Label="ProjectConfigurations">
47
<ProjectConfiguration Include="Debug|Win32">
58
<Configuration>Debug</Configuration>
@@ -126,7 +129,6 @@
126129
<GenerateDebugInformation>true</GenerateDebugInformation>
127130
<SubSystem>Windows</SubSystem>
128131
</Link>
129-
<Bscmake />
130132
</ItemDefinitionGroup>
131133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
132134
<Midl>
@@ -156,7 +158,6 @@
156158
<GenerateDebugInformation>true</GenerateDebugInformation>
157159
<SubSystem>Windows</SubSystem>
158160
</Link>
159-
<Bscmake />
160161
</ItemDefinitionGroup>
161162
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
162163
<Midl>
@@ -182,7 +183,6 @@
182183
<AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
183184
<SubSystem>Windows</SubSystem>
184185
</Link>
185-
<Bscmake />
186186
</ItemDefinitionGroup>
187187
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
188188
<Midl>
@@ -209,7 +209,6 @@
209209
<AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
210210
<SubSystem>Windows</SubSystem>
211211
</Link>
212-
<Bscmake />
213212
</ItemDefinitionGroup>
214213
<ItemGroup>
215214
<ClCompile Include="..\..\playmus.c">

‎VisualC/playwave/playwave.vcxproj

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="'$(SolutionDir)'==''">$(ProjectDir)..\</SolutionDir>
5+
</PropertyGroup>
36
<ItemGroup Label="ProjectConfigurations">
47
<ProjectConfiguration Include="Debug|Win32">
58
<Configuration>Debug</Configuration>
@@ -43,22 +46,6 @@
4346
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4447
<ImportGroup Label="ExtensionSettings">
4548
</ImportGroup>
46-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
47-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
49-
</ImportGroup>
50-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
51-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
53-
</ImportGroup>
54-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
55-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
57-
</ImportGroup>
58-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
59-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60-
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
61-
</ImportGroup>
6249
<PropertyGroup Label="UserMacros" />
6350
<PropertyGroup>
6451
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
@@ -123,7 +110,6 @@
123110
<AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
124111
<SubSystem>Windows</SubSystem>
125112
</Link>
126-
<Bscmake />
127113
</ItemDefinitionGroup>
128114
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
129115
<Midl>
@@ -149,7 +135,6 @@
149135
<AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
150136
<SubSystem>Windows</SubSystem>
151137
</Link>
152-
<Bscmake />
153138
</ItemDefinitionGroup>
154139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
155140
<Midl>
@@ -178,7 +163,6 @@
178163
<GenerateDebugInformation>true</GenerateDebugInformation>
179164
<SubSystem>Windows</SubSystem>
180165
</Link>
181-
<Bscmake />
182166
</ItemDefinitionGroup>
183167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
184168
<Midl>
@@ -207,7 +191,6 @@
207191
<GenerateDebugInformation>true</GenerateDebugInformation>
208192
<SubSystem>Windows</SubSystem>
209193
</Link>
210-
<Bscmake />
211194
</ItemDefinitionGroup>
212195
<ItemGroup>
213196
<ClCompile Include="..\..\playwave.c">

0 commit comments

Comments
 (0)