From 948eb8205e62dd379f410f2db4261150a9fd9760 Mon Sep 17 00:00:00 2001
From: SanyaSho <68691958+SanyaSho@users.noreply.github.com>
Date: Tue, 17 Oct 2023 22:31:13 +0300
Subject: [PATCH] Fix for commit 50cef3971612a73b3907978ea1ffa177a80eae81

---
 joltphysics/joltphysics_avx2.vpc      |  8 +++++---
 joltphysics/joltphysics_settings.vpc  |  2 +-
 joltphysics/joltphysics_sse2.vpc      |  8 +++++---
 joltphysics/joltphysics_sse42.vpc     |  8 +++++---
 vphysics_jolt/vphysics_jolt_avx2.vpc  | 10 +++++-----
 vphysics_jolt/vphysics_jolt_sse2.vpc  | 10 +++++-----
 vphysics_jolt/vphysics_jolt_sse42.vpc | 10 +++++-----
 7 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/joltphysics/joltphysics_avx2.vpc b/joltphysics/joltphysics_avx2.vpc
index 1d856f9..8cbe155 100644
--- a/joltphysics/joltphysics_avx2.vpc
+++ b/joltphysics/joltphysics_avx2.vpc
@@ -4,9 +4,11 @@
 //	Project Script
 //-----------------------------------------------------------------------------
 
-$Macro PROJNAME				"joltphysics_avx2"
+$Macro PROJNAME "joltphysics_avx2"
 
-$Conditional VOLT_AVX2		"1"
-$Macro VOLTARCH				"AVX2"
+$Conditional VOLT_SSE2 "0"
+$Conditional VOLT_SSE42 "0"
+$Conditional VOLT_AVX2 "1"
+$Macro VOLTARCH "AVX2"
 
 $Include "joltphysics_inc.vpc"
diff --git a/joltphysics/joltphysics_settings.vpc b/joltphysics/joltphysics_settings.vpc
index 922c8fe..18964ba 100644
--- a/joltphysics/joltphysics_settings.vpc
+++ b/joltphysics/joltphysics_settings.vpc
@@ -17,7 +17,7 @@ $Configuration
 		// Feature test stuff for the AVX2 build
 		$PreprocessorDefinitions		"$BASE;JPH_USE_SSE4_1;JPH_USE_SSE4_2;JPH_USE_AVX;JPH_USE_AVX2;JPH_USE_LZCNT;JPH_USE_TZCNT;JPH_USE_F16C;JPH_USE_FMADD"	[$VOLT_AVX2]
 		$GCC_ExtraCompilerFlags			"$BASE -msse4.1 -msse4.2 -mavx2 -mlzcnt -mf16c -mfma -mbmi"	[$VOLT_AVX2]
-		$EnableEnhancedInstructionSet	"Advanced Vector Extensions 2 (/arch:AVX2)"					[$VOLT_AVX2]
+		$EnableEnhancedInstructionSet	"Advanced Vector Extensions 2 (/arch:AVX2)"					[$WIN32 && $VOLT_AVX2]
 
 		// Feature test stuff for the SSE 4.2 build
 		$PreprocessorDefinitions		"$BASE;JPH_USE_SSE4_1;JPH_USE_SSE4_2"			[$VOLT_SSE42]
diff --git a/joltphysics/joltphysics_sse2.vpc b/joltphysics/joltphysics_sse2.vpc
index 5bc4399..b57ed15 100644
--- a/joltphysics/joltphysics_sse2.vpc
+++ b/joltphysics/joltphysics_sse2.vpc
@@ -4,9 +4,11 @@
 //	Project Script
 //-----------------------------------------------------------------------------
 
-$Macro PROJNAME				"joltphysics_sse2"
+$Macro PROJNAME "joltphysics_sse2"
 
-$Conditional VOLT_SSE2		"1"
-$Macro VOLTARCH				"SSE2"
+$Conditional VOLT_SSE2 "1"
+$Conditional VOLT_SSE42 "0"
+$Conditional VOLT_AVX2 "0"
+$Macro VOLTARCH "SSE2"
 
 $Include "joltphysics_inc.vpc"
diff --git a/joltphysics/joltphysics_sse42.vpc b/joltphysics/joltphysics_sse42.vpc
index b89db27..fbb7d2a 100644
--- a/joltphysics/joltphysics_sse42.vpc
+++ b/joltphysics/joltphysics_sse42.vpc
@@ -4,9 +4,11 @@
 //	Project Script
 //-----------------------------------------------------------------------------
 
-$Macro PROJNAME				"joltphysics_sse42"
+$Macro PROJNAME "joltphysics_sse42"
 
-$Conditional VOLT_SSE42		"1"
-$Macro VOLTARCH				"SSE42"
+$Conditional VOLT_SSE2 "0"
+$Conditional VOLT_SSE42 "1"
+$Conditional VOLT_AVX2 "0"
+$Macro VOLTARCH "SSE42"
 
 $Include "joltphysics_inc.vpc"
diff --git a/vphysics_jolt/vphysics_jolt_avx2.vpc b/vphysics_jolt/vphysics_jolt_avx2.vpc
index 4110cd5..78893e2 100644
--- a/vphysics_jolt/vphysics_jolt_avx2.vpc
+++ b/vphysics_jolt/vphysics_jolt_avx2.vpc
@@ -4,11 +4,11 @@
 //	Project Script
 //-----------------------------------------------------------------------------
 
-$Macro PROJNAME				"vphysics_jolt_avx2"
+$Macro PROJNAME "vphysics_jolt_avx2"
 
-$Conditional VOLT_SSE2      "0"
-$Conditional VOLT_SSE42     "0"
-$Conditional VOLT_AVX2		"1"
-$Macro VOLTARCH				"AVX2"
+$Conditional VOLT_SSE2 "0"
+$Conditional VOLT_SSE42 "0"
+$Conditional VOLT_AVX2 "1"
+$Macro VOLTARCH "AVX2"
 
 $Include "vphysics_jolt_inc.vpc"
diff --git a/vphysics_jolt/vphysics_jolt_sse2.vpc b/vphysics_jolt/vphysics_jolt_sse2.vpc
index abb3d1b..bc82f1b 100644
--- a/vphysics_jolt/vphysics_jolt_sse2.vpc
+++ b/vphysics_jolt/vphysics_jolt_sse2.vpc
@@ -4,11 +4,11 @@
 //	Project Script
 //-----------------------------------------------------------------------------
 
-$Macro PROJNAME				"vphysics_jolt_sse2"
+$Macro PROJNAME "vphysics_jolt_sse2"
 
-$Conditional VOLT_SSE2      "1"
-$Conditional VOLT_SSE42     "0"
-$Conditional VOLT_AVX2		"0"
-$Macro VOLTARCH				"SSE2"
+$Conditional VOLT_SSE2 "1"
+$Conditional VOLT_SSE42 "0"
+$Conditional VOLT_AVX2 "0"
+$Macro VOLTARCH "SSE2"
 
 $Include "vphysics_jolt_inc.vpc"
diff --git a/vphysics_jolt/vphysics_jolt_sse42.vpc b/vphysics_jolt/vphysics_jolt_sse42.vpc
index 8976c8f..083ed3a 100644
--- a/vphysics_jolt/vphysics_jolt_sse42.vpc
+++ b/vphysics_jolt/vphysics_jolt_sse42.vpc
@@ -4,11 +4,11 @@
 //	Project Script
 //-----------------------------------------------------------------------------
 
-$Macro PROJNAME				"vphysics_jolt_sse42"
+$Macro PROJNAME "vphysics_jolt_sse42"
 
-$Conditional VOLT_SSE2      "0"
-$Conditional VOLT_SSE42     "1"
-$Conditional VOLT_AVX2		"0"
-$Macro VOLTARCH				"SSE42"
+$Conditional VOLT_SSE2 "0"
+$Conditional VOLT_SSE42 "1"
+$Conditional VOLT_AVX2 "0"
+$Macro VOLTARCH "SSE42"
 
 $Include "vphysics_jolt_inc.vpc"