Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: use vs2022 #263

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ jobs:
run: |
make MAKE_JOBS=2 crown-launcher-linux-release64
windows:
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
- name: luajit
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
cd "3rdparty\luajit\src"
.\msvcbuild.bat
- name: luajit-copy-libs
Expand All @@ -150,31 +150,31 @@ jobs:
- name: windows-generate-projects
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
scripts\genie\bin\windows\genie --file=scripts\genie.lua --with-tools --no-editor vs2019
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
scripts\genie\bin\windows\genie --file=scripts\genie.lua --with-tools --no-editor vs2022
- name: windows-make-debug64
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
devenv build/projects/vs2019/crown.sln /Build "debug|x64" /Project crown
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
devenv build/projects/vs2022/crown.sln /Build "debug|x64" /Project crown
- name: windows-test-debug64
shell: cmd
run: |
build\windows64\bin\crown-debug.exe --run-unit-tests
- name: windows-make-development64
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
devenv build/projects/vs2019/crown.sln /Build "development|x64" /Project crown
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
devenv build/projects/vs2022/crown.sln /Build "development|x64" /Project crown
- name: windows-test-development64
shell: cmd
run: |
build\windows64\bin\crown-development.exe --run-unit-tests
- name: windows-make-release64
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
devenv build/projects/vs2019/crown.sln /Build "release|x64" /Project crown
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
devenv build/projects/vs2022/crown.sln /Build "release|x64" /Project crown
- name: windows-test-release64
shell: cmd
run: |
Expand Down
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