Skip to content

Commit 7012ff0

Browse files
authored
Merge pull request #26 from g8kig/main
Allow Visual Studio 17 (2022) builds using Ninja build tool.
2 parents ecd9db3 + 277ef4f commit 7012ff0

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

prj/CMakeCompilers.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ if (WIN32)
9393
set(CMAKE_PACKAGE_GEN "NSIS" CACHE STRING "Package generator utility")
9494
set_property(CACHE CMAKE_PACKAGE_GEN PROPERTY STRINGS "NSIS;TGZ")
9595

96-
# Enhaced instruction set x86 Processors
96+
# Enhanced instruction set x86 Processors
9797
if (${NAPPGUI_ARCH} STREQUAL "x86")
98-
if (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v80")
98+
if (Z${CMAKE_VS_PLATFORM_TOOLSET}Z STREQUAL "ZZ")
99+
# add_definitions(/arch:SSE2)
100+
elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v80")
99101
# Not Set in VS2005 is /arch:IA32
100102
elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v90")
101103
add_definitions(/arch:SSE)

prj/CMakeVSCheckVersion.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ macro(checkVisualStudioVersion)
5656
set(CMAKE_VS_PLATFORM_TOOLSET "v90")
5757
else()
5858
# Plaform Toolset Macro
59-
if (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v143")
59+
if (Z${CMAKE_VS_PLATFORM_TOOLSET}Z STREQUAL "ZZ")
60+
set(VS_TOOLSET_NUMBER 1430)
61+
elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v143")
6062
set(VS_TOOLSET_NUMBER 1430)
6163
elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v142")
6264
set(VS_TOOLSET_NUMBER 1420)

0 commit comments

Comments
 (0)