Skip to content

Commit

Permalink
*: use vs2022
Browse files Browse the repository at this point in the history
  • Loading branch information
dbartolini committed Jan 31, 2025
1 parent 255b416 commit 3340960
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions docs/hackers/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,16 @@ Windows (VS Code)

4. :ref:`Build for Windows (VS Code) <build_vs_code>`.

Windows (VS 2019)
Windows (VS 2022)
-----------------

1. Install Visual Studio 2019:
1. Install Visual Studio 2022:

* https://visualstudio.microsoft.com/downloads

2. If you want to build tools, :ref:`install Windows (MSYS2) <pre_windows_msys2>`.

3. :ref:`Build for Windows (VS 2019)<build_vs_2019>`.
3. :ref:`Build for Windows (VS 2022)<build_vs_2022>`.

Build
=====
Expand Down Expand Up @@ -158,12 +158,12 @@ Open Visual Studio Code Shell:
$env:MINGW = "C:\\msys64\\mingw64"
make tools-mingw-release64 MAKE_JOBS=4
.. _build_vs_2019:
.. _build_vs_2022:

Windows (VS 2019)
Windows (VS 2022)
-----------------

1. Open Visual Studio 2019 Command Prompt:
1. Open Visual Studio 2022 Command Prompt:

.. code::
Expand Down
32 changes: 16 additions & 16 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ build/mingw64/bin/shaderc.exe: \
-@install -m775 -D 3rdparty/bgfx/.build/win64_mingw-gcc/bin/shadercRelease.exe $@

build/windows64/bin/texturec.exe: \
build/projects/vs2019
devenv.com 3rdparty/bimg/.build/projects/vs2019/bimg.sln $(ARG_PREFIX)Build "Release|x64" $(ARG_PREFIX)Project texturec.vcxproj
-@install -m775 -D 3rdparty/bimg/.build/win64_vs2019/bin/texturecRelease.exe $@
build/projects/vs2022
devenv.com 3rdparty/bimg/.build/projects/vs2022/bimg.sln $(ARG_PREFIX)Build "Release|x64" $(ARG_PREFIX)Project texturec.vcxproj
-@install -m775 -D 3rdparty/bimg/.build/win64_vs2022/bin/texturecRelease.exe $@
build/windows64/bin/shaderc.exe: \
build/projects/vs2019
devenv.com 3rdparty/bgfx/.build/projects/vs2019/bgfx.sln $(ARG_PREFIX)Build "Release|x64" $(ARG_PREFIX)Project shaderc.vcxproj
-@install -m775 -D 3rdparty/bgfx/.build/win64_vs2019/bin/shadercRelease.exe $@
build/projects/vs2022
devenv.com 3rdparty/bgfx/.build/projects/vs2022/bgfx.sln $(ARG_PREFIX)Build "Release|x64" $(ARG_PREFIX)Project shaderc.vcxproj
-@install -m775 -D 3rdparty/bgfx/.build/win64_vs2022/bin/shadercRelease.exe $@

build/projects/android-arm:
$(GENIE) --gfxapi=gles3 --compiler=android-arm gmake
Expand Down Expand Up @@ -216,22 +216,22 @@ mingw: \
mingw-development64 \
mingw-release64

build/projects/vs2019:
$(GENIE) --file=3rdparty/bgfx/scripts/genie.lua --with-tools vs2019
$(GENIE) --file=3rdparty/bimg/scripts/genie.lua --with-tools vs2019
$(GENIE) --gfxapi=d3d11 --with-tools --no-editor vs2019
build/projects/vs2022:
$(GENIE) --file=3rdparty/bgfx/scripts/genie.lua --with-tools vs2022
$(GENIE) --file=3rdparty/bimg/scripts/genie.lua --with-tools vs2022
$(GENIE) --gfxapi=d3d11 --with-tools --no-editor vs2022
windows-debug64: \
build/projects/vs2019 \
build/projects/vs2022 \
build/windows64/bin/luajit.exe
devenv.com build/projects/vs2019/crown.sln $(ARG_PREFIX)Build "debug|x64" $(ARG_PREFIX)Project crown
devenv.com build/projects/vs2022/crown.sln $(ARG_PREFIX)Build "debug|x64" $(ARG_PREFIX)Project crown
windows-development64: \
build/projects/vs2019 \
build/projects/vs2022 \
build/windows64/bin/luajit.exe
devenv.com build/projects/vs2019/crown.sln $(ARG_PREFIX)Build "development|x64" $(ARG_PREFIX)Project crown
devenv.com build/projects/vs2022/crown.sln $(ARG_PREFIX)Build "development|x64" $(ARG_PREFIX)Project crown
windows-release64: \
build/projects/vs2019 \
build/projects/vs2022 \
build/windows64/bin/luajit.exe
devenv.com build/projects/vs2019/crown.sln $(ARG_PREFIX)Build "release|x64" $(ARG_PREFIX)Project crown
devenv.com build/projects/vs2022/crown.sln $(ARG_PREFIX)Build "release|x64" $(ARG_PREFIX)Project crown

crown-editor-theme:
cd tools/level_editor/resources/theme/Adwaita && ./parse-sass.sh
Expand Down
4 changes: 2 additions & 2 deletions scripts/toolchain.lua
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ function toolchain(build_dir, lib_dir)
premake.gcc.llvm = true
location(build_dir .. "projects/wasm")
end
elseif _ACTION == "vs2017"
or _ACTION == "vs2019"
elseif _ACTION == "vs2019"
or _ACTION == "vs2022"
then

if not os.is("windows") then
Expand Down

0 comments on commit 3340960

Please sign in to comment.