Merge pull request #26 from g8kig/main

Allow Visual Studio 17 (2022) builds using Ninja build tool.
frang75 · Nov 26, 2022 · 7012ff0 · 7012ff0
2 parents ecd9db3 + 277ef4f
commit 7012ff0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/prj/CMakeCompilers.txt b/prj/CMakeCompilers.txt
@@ -93,9 +93,11 @@ if (WIN32)
         set(CMAKE_PACKAGE_GEN "NSIS" CACHE STRING "Package generator utility")
         set_property(CACHE CMAKE_PACKAGE_GEN PROPERTY STRINGS "NSIS;TGZ")
 
-        # Enhaced instruction set x86 Processors
+        # Enhanced instruction set x86 Processors
         if (${NAPPGUI_ARCH} STREQUAL "x86")
-            if (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v80")
+            if (Z${CMAKE_VS_PLATFORM_TOOLSET}Z STREQUAL "ZZ")
+                # add_definitions(/arch:SSE2)            
+            elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v80")
                 # Not Set in VS2005 is /arch:IA32
             elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v90")
                 add_definitions(/arch:SSE)

diff --git a/prj/CMakeVSCheckVersion.txt b/prj/CMakeVSCheckVersion.txt
@@ -56,7 +56,9 @@ macro(checkVisualStudioVersion)
 		set(CMAKE_VS_PLATFORM_TOOLSET "v90")
 	else()
 		# Plaform Toolset Macro
-		if (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v143")
+		if (Z${CMAKE_VS_PLATFORM_TOOLSET}Z STREQUAL "ZZ")
+			set(VS_TOOLSET_NUMBER 1430)
+		elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v143")
 			set(VS_TOOLSET_NUMBER 1430)
 		elseif (${CMAKE_VS_PLATFORM_TOOLSET} STREQUAL "v142")
 			set(VS_TOOLSET_NUMBER 1420)