diff --git a/BloomFramework/BloomFramework.vcxproj b/BloomFramework/BloomFramework.vcxproj
index f722cce7..50fcde3c 100644
--- a/BloomFramework/BloomFramework.vcxproj
+++ b/BloomFramework/BloomFramework.vcxproj
@@ -23,33 +23,33 @@
{C640C874-D67E-4B31-AF02-378FE5C4D3A3}
- 10.0.17134.0
+ 10.0
BloomFramework
DynamicLibrary
true
- v141
+ v142
MultiByte
DynamicLibrary
false
- v141
+ v142
true
MultiByte
DynamicLibrary
true
- v141
+ v142
MultiByte
DynamicLibrary
false
- v141
+ v142
true
MultiByte
@@ -95,9 +95,9 @@
true
BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)
false
- ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
+ $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
@@ -112,9 +112,9 @@
true
true
BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)
- ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
+ $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
@@ -132,9 +132,9 @@
true
true
BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)
- ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
+ $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
@@ -152,9 +152,9 @@
true
true
BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)
- ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
+ $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
@@ -224,26 +224,26 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
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}.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BloomFramework/include/Exception.h b/BloomFramework/include/Exception.h
index 02220d2e..b486b37b 100644
--- a/BloomFramework/include/Exception.h
+++ b/BloomFramework/include/Exception.h
@@ -2,6 +2,7 @@
#include
#include
+#include
namespace bloom {
class Exception : public std::exception {
diff --git a/BloomFramework/include/stdIncludes.h b/BloomFramework/include/stdIncludes.h
index e292f21e..d5016ddd 100644
--- a/BloomFramework/include/stdIncludes.h
+++ b/BloomFramework/include/stdIncludes.h
@@ -16,6 +16,5 @@
#include "SDL_image.h"
#include "SDL_ttf.h"
#include "SDL_mixer.h"
-#undef main // undef it because SDL_main function assumed not to throw exceptions
#include "entt/entt.hpp"
\ No newline at end of file
diff --git a/Test Bench/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj
index b1e0b238..facda3ba 100644
--- a/Test Bench/Test Bench.vcxproj
+++ b/Test Bench/Test Bench.vcxproj
@@ -22,19 +22,19 @@
15.0
{69BCBA61-1EF9-4E33-92FB-DC40D2F2319C}
TestBench
- 10.0.17134.0
+ 10.0
Application
true
- v141
+ v142
MultiByte
Application
false
- v141
+ v142
true
MultiByte
@@ -42,12 +42,12 @@
Application
true
MultiByte
- v141
+ v142
Application
false
- v141
+ v142
true
MultiByte
@@ -93,7 +93,7 @@
true
..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions)
@@ -103,6 +103,7 @@
%(AdditionalDependencies)
+ Console
@@ -114,7 +115,7 @@
..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
false
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions)
@@ -138,7 +139,7 @@
..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
false
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions)
@@ -146,6 +147,7 @@
true
true
%(AdditionalDependencies)
+ Windows
(robocopy "$(ProjectDir)data\\" "$(OutDir)data\\" /S /NDL /NJH /NJS /nc /ns /np) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0
@@ -163,7 +165,7 @@
..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories)
false
/Zc:__cplusplus %(AdditionalOptions)
- stdcpplatest
+ stdcpp17
Caret
BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions)
@@ -171,6 +173,7 @@
true
true
%(AdditionalDependencies)
+ Windows
(robocopy "$(ProjectDir)data\\" "$(OutDir)data\\" /S /NDL /NJH /NJS /nc /ns /np) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0
@@ -208,26 +211,26 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
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}.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Test Bench/main.cpp b/Test Bench/main.cpp
index 898153e0..724b913e 100644
--- a/Test Bench/main.cpp
+++ b/Test Bench/main.cpp
@@ -143,14 +143,12 @@ void test_drawer(const std::filesystem::path& dataDir) {
// Test SpriteText2
std::string deltaTimeText{ "fps: " };
-
// If manual control of entities is required, this is the method to do so.
auto & testGOpos = testRegistry.get(testGO.getEntityID());
auto & testGOsize = testRegistry.get(testGO.getEntityID());
int testX = rstep(10), testY = rstep(10);
-
while (game->isRunning()) {
testGOpos.x += testX;
testGOpos.y += testY;
@@ -185,8 +183,7 @@ void test_drawer(const std::filesystem::path& dataDir) {
game->destroy();
}
-
-int main() {
+int main(int argc, char* argv[]) {
SetConsoleCP(CP_UTF8); SetConsoleOutputCP(CP_UTF8);
try {
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 5d8ad98a..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: 0.0.{build}-{branch}
-
-clone_depth: 1
-
-pull_requests:
- do_not_increment_build_number: true
-
-install:
-- cmd: git submodule update --init --recursive
-
-image: Visual Studio 2017
-
-matrix:
- fast_finish: false
-
-platform:
- - x64
- - x86
-
-configuration:
- - Debug
- - Release
-
-before_build:
-- cmd: nuget restore
-
-build:
- verbosity: minimal
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a8a3995c..c3dec048 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,7 +13,7 @@ pr:
- '*'
pool:
- vmImage: 'VS2017-Win2016'
+ vmImage: 'windows-2019'
demands:
- 'msbuild'
- 'visualstudio'
@@ -41,11 +41,6 @@ steps:
lfs: true
submodules: 'recursive'
-- task: NuGetToolInstaller@0
- displayName: 'Use NuGet 4.4.1'
- inputs:
- versionSpec: '4.4.1'
-
- task: NuGetCommand@2
displayName: 'Restore NuGet packages'
inputs:
@@ -56,6 +51,6 @@ steps:
displayName: 'Build solution'
inputs:
solution: '$(solution)'
- vsVersion: '15.0'
+ vsVersion: '16.0'
platform: '$(buildPlatform)'
configuration: '$(buildConfiguration)'
\ No newline at end of file