Skip to content

Commit

Permalink
Update CMakePresets and Build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
egorodet committed Feb 9, 2023
1 parent a67bb6f commit 7c0d516
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Build/Unix/Build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ CMAKE_FLAGS="$CMAKE_FLAGS \
-DMETHANE_VERSION_MINOR=$BUILD_VERSION_MINOR \
-DMETHANE_GFX_VULKAN_ENABLED:BOOL=$VULKAN_BUILD_FLAG \
-DMETHANE_SHADERS_CODEVIEW_ENABLED:BOOL=ON \
-DMETHANE_SHADERS_VALIDATION_ENABLED:BOOL=ON \
-DMETHANE_RHI_PIMPL_INLINE_ENABLED:BOOL=ON \
-DMETHANE_PRECOMPILED_HEADERS_ENABLED:BOOL=ON \
-DMETHANE_RUN_TESTS_DURING_BUILD:BOOL=OFF \
-DMETHANE_COMMAND_DEBUG_GROUPS_ENABLED:BOOL=ON \
-DMETHANE_LOGGING_ENABLED:BOOL=OFF \
Expand Down
3 changes: 2 additions & 1 deletion Build/Windows/Build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ SET CMAKE_FLAGS= ^
-DASTEROIDS_VERSION_MINOR=%BUILD_VERSION_MINOR% ^
-DMETHANE_GFX_VULKAN_ENABLED:BOOL=%VULKAN_API_ENABLED% ^
-DMETHANE_SHADERS_CODEVIEW_ENABLED:BOOL=ON ^
-DMETHANE_SHADERS_VALIDATION_ENABLED:BOOL=ON ^
-DMETHANE_RHI_PIMPL_INLINE_ENABLED:BOOL=ON ^
-DMETHANE_PRECOMPILED_HEADERS_ENABLED:BOOL=ON ^
-DMETHANE_RUN_TESTS_DURING_BUILD:BOOL=OFF ^
-DMETHANE_COMMAND_DEBUG_GROUPS_ENABLED:BOOL=ON ^
-DMETHANE_LOGGING_ENABLED:BOOL=OFF ^
Expand Down
19 changes: 18 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
"name": "VS2022-Win64-DX-Scan",
"displayName": "Scan - VS2022 - Windows x64 (DirectX)",
"description": "Scanning configuration using Visual Studio 2019 generator for Windows x64 (DirectX)",
"generator": "Visual Studio 16 2019",
"generator": "Visual Studio 17 2022",
"inherits": [
"Ninja-Scan",
"VS2022-Win64-DX-Default"
Expand Down Expand Up @@ -1018,6 +1018,23 @@
"configuration": "Debug"
},

{
"name": "VS2022-Win64-DX-Scan",
"displayName": "Scan - VS2022 - Windows x64 (DirectX)",
"description": "Scanning build with Visual Studio 2022 for Windows x64 (DirectX)",
"inherits": [ "Windows-Build" ],
"configurePreset": "VS2022-Win64-DX-Scan",
"configuration": "Debug"
},
{
"name": "VS2022-Win32-DX-Scan",
"displayName": "Scan - VS2022 - Windows x86 (DirectX)",
"description": "Scanning build with Visual Studio 2022 for Windows x86 (DirectX)",
"inherits": [ "Windows-Build" ],
"configurePreset": "VS2022-Win32-DX-Scan",
"configuration": "Debug"
},

{
"name": "VS2019-Win64-VK-Debug",
"displayName": "Debug - VS2019 - Windows x64 (Vulkan)",
Expand Down

0 comments on commit 7c0d516

Please sign in to comment.