Skip to content

Commit acb0f0e

Browse files
BrentDaMageBrentDaMage
authored
VS SDL1 project fixes (#567)
1 parent f83762d commit acb0f0e

File tree

3 files changed

+26
-33
lines changed

3 files changed

+26
-33
lines changed

‎projects/visual-studio/NBCraftClient.SDL1/NBCraftClient.SDL1.vcxproj‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,47 +38,49 @@
3838
<PropertyGroup Label="UserMacros" />
3939
<ItemDefinitionGroup>
4040
<ClCompile>
41-
<AdditionalIncludeDirectories>$(MC_ROOT)\platforms\sound\openal;$(SDL1_PATH)\include;$(OPENAL_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
41+
<AdditionalIncludeDirectories>$(MC_ROOT)\platforms\audio\openal;$(SDL1_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
4242
</ClCompile>
4343
<Link>
4444
<SubSystem>Console</SubSystem>
4545
<AdditionalDependencies>SDLmain.lib;%(AdditionalDependencies)</AdditionalDependencies>
46+
<!-- This is not a bug, not everyone is going to have SDL built as debug, and it's just kinda inconvenient for not much benefit -->
47+
<AdditionalLibraryDirectories Condition="$(Configuration.StartsWith('Debug'))">$(SDL1_PATH)\VisualC\SDL\$(Platform)\Release;$(SDL1_PATH)\VisualC\SDLmain\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
48+
<AdditionalLibraryDirectories Condition="$(Configuration.StartsWith('Release'))">$(SDL1_PATH)\VisualC\SDL\$(Platform)\Release;$(SDL1_PATH)\VisualC\SDLmain\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
4649
</Link>
50+
<PostBuildEvent Condition="$(Configuration.StartsWith('Debug'))">
51+
<Command>copy $(SDL1_PATH)\VisualC\SDL\$(Platform)\Release\SDL.dll $(TargetDir) /y</Command>
52+
</PostBuildEvent>
53+
<PostBuildEvent Condition="$(Configuration.StartsWith('Release'))">
54+
<Command>copy $(SDL1_PATH)\VisualC\SDL\$(Platform)\Release\SDL.dll $(TargetDir) /y</Command>
55+
</PostBuildEvent>
4756
</ItemDefinitionGroup>
4857
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
4958
<Link>
50-
<AdditionalLibraryDirectories>$(SDL1_PATH)\VisualC\SDL\Win32\Release;$(SDL1_PATH)\VisualC\SDLmain\Win32\Release;$(OPENAL_PATH)\libs\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
59+
<AdditionalLibraryDirectories>$(OPENAL_PATH)\libs\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
5160
</Link>
52-
<PostBuildEvent>
53-
<Command>copy $(SDL1_PATH)\VisualC\SDL\Win32\Release\SDL.dll $(TargetDir) /y</Command>
54-
</PostBuildEvent>
5561
</ItemDefinitionGroup>
5662
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
5763
<Link>
58-
<AdditionalLibraryDirectories>$(SDL1_PATH)\VisualC\SDL\x64\Release;$(SDL1_PATH)\VisualC\SDLmain\x64\Release;$(OPENAL_PATH)\libs\Win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
64+
<AdditionalLibraryDirectories>$(OPENAL_PATH)\libs\Win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
5965
</Link>
60-
<PostBuildEvent>
61-
<Command>copy $(SDL1_PATH)\VisualC\SDL\x64\Release\SDL.dll $(TargetDir) /y</Command>
62-
</PostBuildEvent>
6366
</ItemDefinitionGroup>
6467
<ItemGroup>
65-
<ClCompile Include="$(MC_ROOT)\platforms\sound\openal\SoundSystemAL.cpp" />
6668
<ClCompile Include="$(MC_ROOT)\platforms\sdl\sdl1\main.cpp" />
6769
<ClCompile Include="$(MC_ROOT)\platforms\sdl\sdl1\base\AppPlatform_sdl1.cpp" />
6870
<ClCompile Include="$(MC_ROOT)\platforms\sdl\sdl1\desktop\AppPlatform_sdl1_desktop.cpp" />
69-
<ClCompile Include="$(MC_ROOT)\platforms\sound\openal\SoundStreamAL.cpp" />
7071
<ClCompile Include="$(MC_ROOT)\platforms\sdl\base\AppPlatform_sdl.cpp" />
7172
</ItemGroup>
7273
<ItemGroup>
7374
<ClInclude Include="$(MC_ROOT)\compat\KeyCodes.hpp" />
7475
<ClInclude Include="$(MC_ROOT)\compat\SDLKeyCodes.h" />
75-
<ClInclude Include="$(MC_ROOT)\platforms\sound\openal\CustomSoundSystem.hpp" />
7676
<ClInclude Include="$(MC_ROOT)\platforms\sdl\sdl1\base\AppPlatform_sdl1.hpp" />
7777
<ClInclude Include="$(MC_ROOT)\platforms\sdl\sdl1\desktop\AppPlatform_sdl1_desktop.hpp" />
78-
<ClInclude Include="$(MC_ROOT)\platforms\sound\openal\SoundStreamAL.hpp" />
7978
<ClInclude Include="$(MC_ROOT)\platforms\sdl\base\AppPlatform_sdl.hpp" />
8079
</ItemGroup>
8180
<ItemGroup>
81+
<ProjectReference Include="..\Audio.OpenAL\Audio.OpenAL.vcxproj">
82+
<Project>{e6c837a7-ef58-4628-a0d6-a8aee0a63754}</Project>
83+
</ProjectReference>
8284
<ProjectReference Include="..\Client\Client.vcxproj">
8385
<Project>{a6e03dca-99f6-45b8-800d-73060ae407fc}</Project>
8486
</ProjectReference>

‎projects/visual-studio/NBCraftClient.SDL1/NBCraftClient.SDL1.vcxproj.filters‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,9 @@
2424
<ClCompile Include="$(MC_ROOT)\platforms\sdl\sdl1\main.cpp">
2525
<Filter>Source Files</Filter>
2626
</ClCompile>
27-
<ClCompile Include="$(MC_ROOT)\platforms\sound\openal\SoundSystemAL.cpp">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
3027
<ClCompile Include="$(MC_ROOT)\platforms\sdl\sdl1\base\AppPlatform_sdl1.cpp">
3128
<Filter>Source Files</Filter>
3229
</ClCompile>
33-
<ClCompile Include="$(MC_ROOT)\platforms\sound\openal\SoundStreamAL.cpp">
34-
<Filter>Source Files</Filter>
35-
</ClCompile>
3630
<ClCompile Include="$(MC_ROOT)\platforms\sdl\base\AppPlatform_sdl.cpp">
3731
<Filter>Source Files</Filter>
3832
</ClCompile>
@@ -44,18 +38,12 @@
4438
<ClInclude Include="$(MC_ROOT)\compat\KeyCodes.hpp">
4539
<Filter>Header Files\Compatibility</Filter>
4640
</ClInclude>
47-
<ClInclude Include="$(MC_ROOT)\platforms\sound\openal\CustomSoundSystem.hpp">
48-
<Filter>Header Files</Filter>
49-
</ClInclude>
5041
<ClInclude Include="$(MC_ROOT)\compat\SDLKeyCodes.h">
5142
<Filter>Header Files\Compatibility</Filter>
5243
</ClInclude>
5344
<ClInclude Include="$(MC_ROOT)\platforms\sdl\sdl1\base\AppPlatform_sdl1.hpp">
5445
<Filter>Header Files</Filter>
5546
</ClInclude>
56-
<ClInclude Include="$(MC_ROOT)\platforms\sound\openal\SoundStreamAL.hpp">
57-
<Filter>Header Files</Filter>
58-
</ClInclude>
5947
<ClInclude Include="$(MC_ROOT)\platforms\sdl\base\AppPlatform_sdl.hpp">
6048
<Filter>Header Files</Filter>
6149
</ClInclude>

‎projects/visual-studio/NBCraftClient.SDL2/NBCraftClient.SDL2.vcxproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,26 @@
4343
<Link>
4444
<SubSystem>Console</SubSystem>
4545
<AdditionalDependencies>SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
46+
<!-- This is not a bug, not everyone is going to have SDL built as debug, and it's just kinda inconvenient for not much benefit -->
47+
<AdditionalLibraryDirectories Condition="$(Configuration.StartsWith('Debug'))">$(SDL2_PATH)\VisualC\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
48+
<AdditionalLibraryDirectories Condition="$(Configuration.StartsWith('Release'))">$(SDL2_PATH)\VisualC\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
4649
</Link>
50+
<PostBuildEvent Condition="$(Configuration.StartsWith('Debug'))">
51+
<Command>copy $(SDL2_PATH)\VisualC\$(Platform)\Release\SDL2.dll $(TargetDir) /y</Command>
52+
</PostBuildEvent>
53+
<PostBuildEvent Condition="$(Configuration.StartsWith('Release'))">
54+
<Command>copy $(SDL2_PATH)\VisualC\$(Platform)\Release\SDL2.dll $(TargetDir) /y</Command>
55+
</PostBuildEvent>
4756
</ItemDefinitionGroup>
4857
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
4958
<Link>
50-
<AdditionalLibraryDirectories>$(SDL2_PATH)\VisualC\Win32\Release;$(OPENAL_PATH)\libs\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
59+
<AdditionalLibraryDirectories>$(OPENAL_PATH)\libs\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
5160
</Link>
52-
<PostBuildEvent>
53-
<Command>copy $(SDL2_PATH)\VisualC\Win32\Release\SDL2.dll $(TargetDir) /y</Command>
54-
</PostBuildEvent>
5561
</ItemDefinitionGroup>
5662
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
5763
<Link>
58-
<AdditionalLibraryDirectories>$(SDL2_PATH)\VisualC\x64\Release;$(OPENAL_PATH)\libs\Win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
64+
<AdditionalLibraryDirectories>$(OPENAL_PATH)\libs\Win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
5965
</Link>
60-
<PostBuildEvent>
61-
<Command>copy $(SDL2_PATH)\VisualC\x64\Release\SDL2.dll $(TargetDir) /y</Command>
62-
</PostBuildEvent>
6366
</ItemDefinitionGroup>
6467
<ItemGroup>
6568
<ClCompile Include="$(MC_ROOT)\platforms\sdl\sdl2\main.cpp" />

0 commit comments

Comments
 (0)