Skip to content

Commit b503879

Browse files
LumpBloom7LumpBloom7
authored
Project file improvements and retarget (#32)
* Make both projects submodule friendly * Minor adjustment to BF include path * Avoid undefining SDL_Main * Release builds now use the Windows subsystem * Fix solution projects not being able to load when packages are missing * Retarget projects to v142 toolset * Use C++2017 standard instead of the latest draft * Update azure-pipelines.yml config * Remove appveyor.yml
1 parent ed6c798 commit b503879

7 files changed

Lines changed: 61 additions & 94 deletions

File tree

‎BloomFramework/BloomFramework.vcxproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,33 @@
2323
<ProjectGuid>{C640C874-D67E-4B31-AF02-378FE5C4D3A3}</ProjectGuid>
2424
<RootNamespace>
2525
</RootNamespace>
26-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
<ProjectName>BloomFramework</ProjectName>
2828
</PropertyGroup>
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3131
<ConfigurationType>DynamicLibrary</ConfigurationType>
3232
<UseDebugLibraries>true</UseDebugLibraries>
33-
<PlatformToolset>v141</PlatformToolset>
33+
<PlatformToolset>v142</PlatformToolset>
3434
<CharacterSet>MultiByte</CharacterSet>
3535
</PropertyGroup>
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
3838
<UseDebugLibraries>false</UseDebugLibraries>
39-
<PlatformToolset>v141</PlatformToolset>
39+
<PlatformToolset>v142</PlatformToolset>
4040
<WholeProgramOptimization>true</WholeProgramOptimization>
4141
<CharacterSet>MultiByte</CharacterSet>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
4545
<UseDebugLibraries>true</UseDebugLibraries>
46-
<PlatformToolset>v141</PlatformToolset>
46+
<PlatformToolset>v142</PlatformToolset>
4747
<CharacterSet>MultiByte</CharacterSet>
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5050
<ConfigurationType>DynamicLibrary</ConfigurationType>
5151
<UseDebugLibraries>false</UseDebugLibraries>
52-
<PlatformToolset>v141</PlatformToolset>
52+
<PlatformToolset>v142</PlatformToolset>
5353
<WholeProgramOptimization>true</WholeProgramOptimization>
5454
<CharacterSet>MultiByte</CharacterSet>
5555
</PropertyGroup>
@@ -95,9 +95,9 @@
9595
<ConformanceMode>true</ConformanceMode>
9696
<PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
98-
<AdditionalIncludeDirectories>..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
98+
<AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9999
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
100-
<LanguageStandard>stdcpplatest</LanguageStandard>
100+
<LanguageStandard>stdcpp17</LanguageStandard>
101101
<DiagnosticsFormat>Caret</DiagnosticsFormat>
102102
</ClCompile>
103103
<Link>
@@ -112,9 +112,9 @@
112112
<SDLCheck>true</SDLCheck>
113113
<ConformanceMode>true</ConformanceMode>
114114
<PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115-
<AdditionalIncludeDirectories>..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116116
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
117-
<LanguageStandard>stdcpplatest</LanguageStandard>
117+
<LanguageStandard>stdcpp17</LanguageStandard>
118118
<DiagnosticsFormat>Caret</DiagnosticsFormat>
119119
</ClCompile>
120120
<Link />
@@ -132,9 +132,9 @@
132132
<SDLCheck>true</SDLCheck>
133133
<ConformanceMode>true</ConformanceMode>
134134
<PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135-
<AdditionalIncludeDirectories>..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
135+
<AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136136
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
137-
<LanguageStandard>stdcpplatest</LanguageStandard>
137+
<LanguageStandard>stdcpp17</LanguageStandard>
138138
<DiagnosticsFormat>Caret</DiagnosticsFormat>
139139
</ClCompile>
140140
<Link>
@@ -152,9 +152,9 @@
152152
<SDLCheck>true</SDLCheck>
153153
<ConformanceMode>true</ConformanceMode>
154154
<PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155-
<AdditionalIncludeDirectories>..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155+
<AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
156156
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
157-
<LanguageStandard>stdcpplatest</LanguageStandard>
157+
<LanguageStandard>stdcpp17</LanguageStandard>
158158
<DiagnosticsFormat>Caret</DiagnosticsFormat>
159159
</ClCompile>
160160
<Link>
@@ -224,26 +224,26 @@
224224
</ItemGroup>
225225
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
226226
<ImportGroup Label="ExtensionTargets">
227-
<Import Project="..\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets" Condition="Exists('..\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets')" />
228-
<Import Project="..\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets" Condition="Exists('..\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets')" />
229-
<Import Project="..\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets" Condition="Exists('..\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets')" />
230-
<Import Project="..\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets" Condition="Exists('..\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets')" />
231-
<Import Project="..\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets" Condition="Exists('..\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets')" />
232-
<Import Project="..\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets" Condition="Exists('..\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets')" />
233-
<Import Project="..\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets" Condition="Exists('..\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets')" />
234-
<Import Project="..\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets" Condition="Exists('..\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets')" />
227+
<Import Project="$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets')" />
228+
<Import Project="$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets')" />
229+
<Import Project="$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets')" />
230+
<Import Project="$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets')" />
231+
<Import Project="$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets')" />
232+
<Import Project="$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets')" />
233+
<Import Project="$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets')" />
234+
<Import Project="$(SolutionDir)\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets')" />
235235
</ImportGroup>
236236
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
237237
<PropertyGroup>
238238
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
239239
</PropertyGroup>
240-
<Error Condition="!Exists('..\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets'))" />
241-
<Error Condition="!Exists('..\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets'))" />
242-
<Error Condition="!Exists('..\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets'))" />
243-
<Error Condition="!Exists('..\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets'))" />
244-
<Error Condition="!Exists('..\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets'))" />
245-
<Error Condition="!Exists('..\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets'))" />
246-
<Error Condition="!Exists('..\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets'))" />
247-
<Error Condition="!Exists('..\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets'))" />
240+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets'))" />
241+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets'))" />
242+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets'))" />
243+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets'))" />
244+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets'))" />
245+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets'))" />
246+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets'))" />
247+
<Error Condition="!Exists('$(SolutionDir)\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_ttf.nuget.2.0.15\build\native\sdl2_ttf.nuget.targets'))" />
248248
</Target>
249249
</Project>

‎BloomFramework/include/Exception.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <exception>
44
#include <string_view>
5+
#include <iostream>
56

67
namespace bloom {
78
class Exception : public std::exception {

‎BloomFramework/include/stdIncludes.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
#include "SDL_image.h"
1717
#include "SDL_ttf.h"
1818
#include "SDL_mixer.h"
19-
#undef main // undef it because SDL_main function assumed not to throw exceptions
2019

2120
#include "entt/entt.hpp"

0 commit comments

Comments
 (0)