From 17ab1e2a623c28a74cfbf201a8823eca7f877c4d Mon Sep 17 00:00:00 2001 From: Markus Stephanides Date: Sun, 3 Sep 2023 21:06:01 +0200 Subject: [PATCH] Update Makefile and Build Docs from VS2017 to VS2019 (#3170) * Update build.rst * Update makefile --- docs/build.rst | 20 ++++++++++---------- makefile | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/docs/build.rst b/docs/build.rst index 04bf628ae..3fd670d25 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -28,17 +28,17 @@ Enter bgfx directory: cd bgfx -Generate Visual Studio 2017 project files: +Generate Visual Studio 2019 project files: :: - ..\bx\tools\bin\windows\genie --with-examples vs2017 + ..\bx\tools\bin\windows\genie --with-examples vs2019 -Open bgfx solution in Visual Studio 2017: +Open bgfx solution in Visual Studio 2019: :: - start .build\projects\vs2017\bgfx.sln + start .build\projects\vs2019\bgfx.sln .. note:: For more detailed prerequisites and build steps on other platforms see below. @@ -111,17 +111,17 @@ Configuration is ``-[32/64]``. For example: Windows ~~~~~~~ -Visual Studio 2017 command line: +Visual Studio 2019 command line: :: - make vs2017-release64 + make vs2019-release64 -Visual Studio 2017 IDE: +Visual Studio 2019 IDE: :: - start .build/projects/vs2017/bgfx.sln + start .build/projects/vs2019/bgfx.sln Xcode ~~~~~ @@ -162,7 +162,7 @@ WinRT / UWP :: - ..\bx\tools\bin\windows\genie --vs=winstore100 vs2017 + ..\bx\tools\bin\windows\genie --vs=winstore100 vs2019 Build the resulting solution and deploy to device. @@ -185,7 +185,7 @@ To build bgfx project files for tools, use ``--with-tools`` option: :: - ..\bx\tools\bin\windows\genie --with-tools vs2017 + ..\bx\tools\bin\windows\genie --with-tools vs2019 Alternative build systems diff --git a/makefile b/makefile index 70c61f259..06e6573e1 100644 --- a/makefile +++ b/makefile @@ -40,8 +40,8 @@ clean: ## Clean all intermediate files. @mkdir .build projgen: ## Generate project files for all configurations. - $(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2017 - $(GENIE) --with-tools --with-combined-examples --vs=winstore100 vs2017 + $(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2019 + $(GENIE) --with-tools --with-combined-examples --vs=winstore100 vs2019 $(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-gcc gmake $(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=linux-gcc gmake $(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-x64 gmake @@ -156,29 +156,29 @@ mingw-clang-release64: .build/projects/gmake-mingw-clang ## Build - MinGW Clang $(MAKE) -R -C .build/projects/gmake-mingw-clang config=release64 mingw-clang: mingw-clang-debug32 mingw-clang-release32 mingw-clang-debug64 mingw-clang-release64 ## Build - MinGW Clang x86/x64 Debug and Release -.build/projects/vs2017: - $(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2017 -vs2017-debug32: .build/projects/vs2017 ## Build - vs2017 x86 Debug - devenv .build/projects/vs2017/bgfx.sln /Build "Debug|Win32" -vs2017-release32: .build/projects/vs2017 ## Build - vs2017 x86 Release - devenv .build/projects/vs2017/bgfx.sln /Build "Release|Win32" -vs2017-debug64: .build/projects/vs2017 ## Build - vs2017 x64 Debug - devenv .build/projects/vs2017/bgfx.sln /Build "Debug|x64" -vs2017-release64: .build/projects/vs2017 ## Build - vs2017 x64 Release - devenv .build/projects/vs2017/bgfx.sln /Build "Release|x64" -vs2017: vs2017-debug32 vs2017-release32 vs2017-debug64 vs2017-release64 ## Build - vs2017 x86/x64 Debug and Release +.build/projects/vs2019: + $(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2019 +vs2019-debug32: .build/projects/vs2019 ## Build - vs2019 x86 Debug + devenv .build/projects/vs2019/bgfx.sln /Build "Debug|Win32" +vs2019-release32: .build/projects/vs2019 ## Build - vs2019 x86 Release + devenv .build/projects/vs2019/bgfx.sln /Build "Release|Win32" +vs2019-debug64: .build/projects/vs2019 ## Build - vs2019 x64 Debug + devenv .build/projects/vs2019/bgfx.sln /Build "Debug|x64" +vs2019-release64: .build/projects/vs2019 ## Build - vs2019 x64 Release + devenv .build/projects/vs2019/bgfx.sln /Build "Release|x64" +vs2019: vs2019-debug32 vs2019-release32 vs2019-debug64 vs2019-release64 ## Build - vs2019 x86/x64 Debug and Release -.build/projects/vs2017-winstore100: - $(GENIE) --with-combined-examples --vs=winstore100 vs2017 -vs2017-winstore100-debug32: .build/projects/vs2017-winstore100 ## Build - vs2017-winstore100 x86 Debug - devenv .build/projects/vs2017-winstore100/bgfx.sln /Build "Debug|Win32" -vs2017-winstore100-release32: .build/projects/vs2017-winstore100 ## Build - vs2017-winstore100 x86 Release - devenv .build/projects/vs2017-winstore100/bgfx.sln /Build "Release|Win32" -vs2017-winstore100-debug64: .build/projects/vs2017-winstore100 ## Build - vs2017-winstore100 x64 Debug - devenv .build/projects/vs2017-winstore100/bgfx.sln /Build "Debug|x64" -vs2017-winstore100-release64: .build/projects/vs2017-winstore100 ## Build - vs2017-winstore100 x64 Release - devenv .build/projects/vs2017-winstore100/bgfx.sln /Build "Release|x64" -vs2017-winstore100: vs2017-winstore100-debug32 vs2017-winstore100-release32 vs2017-winstore100-debug64 vs2017-winstore100-release64 ## Build - vs2017-winstore100 x86/x64 Debug and Release +.build/projects/vs2019-winstore100: + $(GENIE) --with-combined-examples --vs=winstore100 vs2019 +vs2019-winstore100-debug32: .build/projects/vs2019-winstore100 ## Build - vs2019-winstore100 x86 Debug + devenv .build/projects/vs2019-winstore100/bgfx.sln /Build "Debug|Win32" +vs2019-winstore100-release32: .build/projects/vs2019-winstore100 ## Build - vs2019-winstore100 x86 Release + devenv .build/projects/vs2019-winstore100/bgfx.sln /Build "Release|Win32" +vs2019-winstore100-debug64: .build/projects/vs2019-winstore100 ## Build - vs2019-winstore100 x64 Debug + devenv .build/projects/vs2019-winstore100/bgfx.sln /Build "Debug|x64" +vs2019-winstore100-release64: .build/projects/vs2019-winstore100 ## Build - vs2019-winstore100 x64 Release + devenv .build/projects/vs2019-winstore100/bgfx.sln /Build "Release|x64" +vs2019-winstore100: vs2019-winstore100-debug32 vs2019-winstore100-release32 vs2019-winstore100-debug64 vs2019-winstore100-release64 ## Build - vs2019-winstore100 x86/x64 Debug and Release .build/projects/gmake-osx-x64: $(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-x64 gmake