From f6824651810e577087e2a0c485b10e89416eabd8 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Sat, 30 Mar 2019 12:52:19 +0800 Subject: [PATCH 01/11] Make both projects submodule friendly Before it would complain about Nuget packages not being installed because it wasn't looking for it relative to `$(SolutionDir)`. --- BloomFramework/BloomFramework.vcxproj | 32 +++++++++++++-------------- Test Bench/Test Bench.vcxproj | 32 +++++++++++++-------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/BloomFramework/BloomFramework.vcxproj b/BloomFramework/BloomFramework.vcxproj index f69dc7ee..3c79fc29 100644 --- a/BloomFramework/BloomFramework.vcxproj +++ b/BloomFramework/BloomFramework.vcxproj @@ -225,26 +225,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/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj index b1e0b238..0dad2210 100644 --- a/Test Bench/Test Bench.vcxproj +++ b/Test Bench/Test Bench.vcxproj @@ -208,26 +208,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 From d436a2b82cc4fba91c34a3f790a394a5591b1988 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Sat, 30 Mar 2019 13:03:41 +0800 Subject: [PATCH 02/11] Minor adjustment to BF include path Don't have to change TestBench includes and enTT directory because it is more reliable to use the current paths. --- BloomFramework/BloomFramework.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BloomFramework/BloomFramework.vcxproj b/BloomFramework/BloomFramework.vcxproj index 3c79fc29..9d0d1e0a 100644 --- a/BloomFramework/BloomFramework.vcxproj +++ b/BloomFramework/BloomFramework.vcxproj @@ -95,7 +95,7 @@ true BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions) false - ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) + $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) stdcpplatest Caret @@ -112,7 +112,7 @@ true true BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions) - ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) + $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) stdcpplatest Caret @@ -132,7 +132,7 @@ true true BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions) - ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) + $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) stdcpplatest Caret @@ -152,7 +152,7 @@ true true BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions) - ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) + $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) stdcpplatest Caret From 88342db6278ffa0d528671f7b147aa6da7baf8c3 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Fri, 7 Jun 2019 13:52:07 +0800 Subject: [PATCH 03/11] Correctly set all build configurations' subsystem --- Test Bench/Test Bench.vcxproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Test Bench/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj index 0dad2210..f8620617 100644 --- a/Test Bench/Test Bench.vcxproj +++ b/Test Bench/Test Bench.vcxproj @@ -103,6 +103,7 @@ %(AdditionalDependencies) + Console @@ -146,6 +147,7 @@ true true %(AdditionalDependencies) + Console (robocopy "$(ProjectDir)data\\" "$(OutDir)data\\" /S /NDL /NJH /NJS /nc /ns /np) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 @@ -171,6 +173,7 @@ true true %(AdditionalDependencies) + Console (robocopy "$(ProjectDir)data\\" "$(OutDir)data\\" /S /NDL /NJH /NJS /nc /ns /np) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 From 46a442174a343f2899f30b1bf22074f333b23965 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Fri, 7 Jun 2019 13:53:21 +0800 Subject: [PATCH 04/11] Avoid undefining SDL_Main It also allows us to use the Windows subsystem without issues. --- BloomFramework/include/stdIncludes.h | 1 - Test Bench/main.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) 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/main.cpp b/Test Bench/main.cpp index 542bb662..404f3374 100644 --- a/Test Bench/main.cpp +++ b/Test Bench/main.cpp @@ -185,8 +185,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 { From 563472cb364dc3a8968f768feec4abee1de0cea8 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Fri, 7 Jun 2019 13:56:32 +0800 Subject: [PATCH 05/11] Release builds now use the Windows subsystem --- Test Bench/Test Bench.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Test Bench/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj index f8620617..7d089a9a 100644 --- a/Test Bench/Test Bench.vcxproj +++ b/Test Bench/Test Bench.vcxproj @@ -147,7 +147,7 @@ true true %(AdditionalDependencies) - Console + Windows (robocopy "$(ProjectDir)data\\" "$(OutDir)data\\" /S /NDL /NJH /NJS /nc /ns /np) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 @@ -173,7 +173,7 @@ true true %(AdditionalDependencies) - Console + Windows (robocopy "$(ProjectDir)data\\" "$(OutDir)data\\" /S /NDL /NJH /NJS /nc /ns /np) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 From df6aaf27900006a7969abeddaa3785fdd0ad5e3e Mon Sep 17 00:00:00 2001 From: "derrick.timmermans@outlook.com" Date: Fri, 16 Aug 2019 15:45:37 +0800 Subject: [PATCH 06/11] Fix solution projects not being able to load when packages are missing This will result in a cross-dependent situation where the packages cannot be downloaded without loading the project, but the projects need the packages to be downloaded before being able to load. --- BloomFramework/BloomFramework.vcxproj | 16 ++++++++-------- Test Bench/Test Bench.vcxproj | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/BloomFramework/BloomFramework.vcxproj b/BloomFramework/BloomFramework.vcxproj index 9d0d1e0a..cb28abd6 100644 --- a/BloomFramework/BloomFramework.vcxproj +++ b/BloomFramework/BloomFramework.vcxproj @@ -225,14 +225,14 @@ - - - - - - - - + + + + + + + + diff --git a/Test Bench/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj index 7d089a9a..db6383ac 100644 --- a/Test Bench/Test Bench.vcxproj +++ b/Test Bench/Test Bench.vcxproj @@ -211,14 +211,14 @@ - - - - - - - - + + + + + + + + From 22e82b639fe5a9520614d83d832b07806ac922f6 Mon Sep 17 00:00:00 2001 From: "derrick.timmermans@outlook.com" Date: Fri, 16 Aug 2019 16:11:30 +0800 Subject: [PATCH 07/11] Retarget projects to v142 toolset --- BloomFramework/BloomFramework.vcxproj | 10 +++++----- Test Bench/Test Bench.vcxproj | 10 +++++----- Test Bench/main.cpp | 2 -- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/BloomFramework/BloomFramework.vcxproj b/BloomFramework/BloomFramework.vcxproj index cb28abd6..1b3358bc 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 diff --git a/Test Bench/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj index db6383ac..921607ea 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 diff --git a/Test Bench/main.cpp b/Test Bench/main.cpp index 404f3374..d8826a82 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; From c80eef4dd94a031cd490e018880e6d0c77b5240d Mon Sep 17 00:00:00 2001 From: "derrick.timmermans@outlook.com" Date: Fri, 16 Aug 2019 17:30:38 +0800 Subject: [PATCH 08/11] Use C++2017 standard instead of the latest draft We will have to resolve all those issues ahead of C++20 at some point... --- BloomFramework/BloomFramework.vcxproj | 4 ++-- BloomFramework/include/Exception.h | 2 +- Test Bench/Test Bench.vcxproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BloomFramework/BloomFramework.vcxproj b/BloomFramework/BloomFramework.vcxproj index 1b3358bc..7d392e18 100644 --- a/BloomFramework/BloomFramework.vcxproj +++ b/BloomFramework/BloomFramework.vcxproj @@ -134,7 +134,7 @@ BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions) $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret @@ -154,7 +154,7 @@ BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions) $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret diff --git a/BloomFramework/include/Exception.h b/BloomFramework/include/Exception.h index c654cb13..08a03761 100644 --- a/BloomFramework/include/Exception.h +++ b/BloomFramework/include/Exception.h @@ -2,7 +2,7 @@ #include #include -#include "stdIncludes.h" +#include namespace bloom { class BLOOMFRAMEWORK_API std::exception; diff --git a/Test Bench/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj index 921607ea..e72ac12c 100644 --- a/Test Bench/Test Bench.vcxproj +++ b/Test Bench/Test Bench.vcxproj @@ -139,7 +139,7 @@ ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) false /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions) @@ -165,7 +165,7 @@ ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) false /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions) From 9429fcf5a2e0097595dff9fe3e311cf48e51fa09 Mon Sep 17 00:00:00 2001 From: "derrick.timmermans@outlook.com" Date: Fri, 16 Aug 2019 16:59:38 +0800 Subject: [PATCH 09/11] Use C++2017 on Debug configs as well I'm such a fucking retard... --- BloomFramework/BloomFramework.vcxproj | 4 ++-- Test Bench/Test Bench.vcxproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BloomFramework/BloomFramework.vcxproj b/BloomFramework/BloomFramework.vcxproj index 7d392e18..9193ab55 100644 --- a/BloomFramework/BloomFramework.vcxproj +++ b/BloomFramework/BloomFramework.vcxproj @@ -97,7 +97,7 @@ false $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret @@ -114,7 +114,7 @@ BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions) $(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret diff --git a/Test Bench/Test Bench.vcxproj b/Test Bench/Test Bench.vcxproj index e72ac12c..facda3ba 100644 --- a/Test Bench/Test Bench.vcxproj +++ b/Test Bench/Test Bench.vcxproj @@ -93,7 +93,7 @@ true ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions) @@ -115,7 +115,7 @@ ..\BloomFramework\include\;..\entt\src\;%(AdditionalIncludeDirectories) false /Zc:__cplusplus %(AdditionalOptions) - stdcpplatest + stdcpp17 Caret BLOOM_DEBUG;_MBCS;%(PreprocessorDefinitions) From 6475c40b3ca47312d4f6ed78c77f8163de49ddd9 Mon Sep 17 00:00:00 2001 From: Anatoly Pitikin Date: Fri, 16 Aug 2019 13:57:13 +0300 Subject: [PATCH 10/11] Update azure-pipelines.yml config Switch from VS2017 to VS2019, small config cleaning --- azure-pipelines.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 From 4d09f3f6af86bf7e43fe150e5b1268b6ea11b4e5 Mon Sep 17 00:00:00 2001 From: Anatoly Pitikin Date: Fri, 16 Aug 2019 14:04:54 +0300 Subject: [PATCH 11/11] Remove appveyor.yml Since I don't want to update it too :) Use Azure Piplines instead --- appveyor.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 appveyor.yml 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