diff --git a/projects/3rd-party/Box2D/libBox2D.vcxproj b/projects/3rd-party/Box2D/libBox2D.vcxproj
index 4b720688..399de3ea 100644
--- a/projects/3rd-party/Box2D/libBox2D.vcxproj
+++ b/projects/3rd-party/Box2D/libBox2D.vcxproj
@@ -156,6 +156,7 @@
true
../../../src/3rd-party;
false
+ false
Windows
@@ -174,6 +175,7 @@
true
../../../src/3rd-party;
false
+ false
Windows
diff --git a/projects/3rd-party/curl/libcurl.vcxproj b/projects/3rd-party/curl/libcurl.vcxproj
index a20337f3..586609bd 100644
--- a/projects/3rd-party/curl/libcurl.vcxproj
+++ b/projects/3rd-party/curl/libcurl.vcxproj
@@ -73,6 +73,7 @@
true
../../../src/3rd-party;
false
+ false
Windows
@@ -91,6 +92,7 @@
true
../../../src/3rd-party;
false
+ false
Windows
diff --git a/projects/3rd-party/imgui/libimgui.vcxproj b/projects/3rd-party/imgui/libimgui.vcxproj
index d968c315..419ab6b3 100644
--- a/projects/3rd-party/imgui/libimgui.vcxproj
+++ b/projects/3rd-party/imgui/libimgui.vcxproj
@@ -73,6 +73,7 @@
true
../../../src/3rd-party;
false
+ false
Windows
@@ -91,6 +92,7 @@
true
../../../src/3rd-party;
false
+ false
Windows
diff --git a/projects/kiwano-audio/kiwano-audio.vcxproj b/projects/kiwano-audio/kiwano-audio.vcxproj
index 8cc7bd78..62c33fae 100644
--- a/projects/kiwano-audio/kiwano-audio.vcxproj
+++ b/projects/kiwano-audio/kiwano-audio.vcxproj
@@ -75,6 +75,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
@@ -94,6 +95,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
diff --git a/projects/kiwano-imgui/kiwano-imgui.vcxproj b/projects/kiwano-imgui/kiwano-imgui.vcxproj
index 80440720..3381e130 100644
--- a/projects/kiwano-imgui/kiwano-imgui.vcxproj
+++ b/projects/kiwano-imgui/kiwano-imgui.vcxproj
@@ -74,6 +74,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
@@ -93,6 +94,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
diff --git a/projects/kiwano-network/kiwano-network.vcxproj b/projects/kiwano-network/kiwano-network.vcxproj
index 51202a6b..3e752139 100644
--- a/projects/kiwano-network/kiwano-network.vcxproj
+++ b/projects/kiwano-network/kiwano-network.vcxproj
@@ -70,6 +70,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
@@ -89,6 +90,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
diff --git a/projects/kiwano-physics/kiwano-physics.vcxproj b/projects/kiwano-physics/kiwano-physics.vcxproj
index 9d90c735..d4888d5b 100644
--- a/projects/kiwano-physics/kiwano-physics.vcxproj
+++ b/projects/kiwano-physics/kiwano-physics.vcxproj
@@ -80,6 +80,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
@@ -99,6 +100,7 @@
../../src;
false
/utf-8 %(AdditionalOptions)
+ false
Windows
diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj
index 6364baf3..01aa81e5 100644
--- a/projects/kiwano/kiwano.vcxproj
+++ b/projects/kiwano/kiwano.vcxproj
@@ -232,6 +232,7 @@
false
../../src;
/utf-8 %(AdditionalOptions)
+ false
Windows
@@ -251,6 +252,7 @@
false
../../src;
/utf-8 %(AdditionalOptions)
+ false
Windows
diff --git a/src/kiwano/macros.h b/src/kiwano/macros.h
index 850fdb88..fd5ab8a7 100644
--- a/src/kiwano/macros.h
+++ b/src/kiwano/macros.h
@@ -55,6 +55,14 @@
#define KGE_GET_MAJOR_VERSION(VERSION) ((VERSION & 0x00F0) >> 4)
#define KGE_GET_MINOR_VERSION(VERSION) (VERSION & 0x000F)
+#if defined(DEBUG) || defined(_DEBUG)
+# define KGE_DEBUG
+#endif
+
+#ifndef KGE_ASSERT
+# define KGE_ASSERT(COND) assert(COND)
+#endif
+
#define KGE_NOT_USED(VAR) ((void)VAR)
#define KGE_RENDER_ENGINE_NONE 0
@@ -76,41 +84,6 @@
# define KGE_RENDER_ENGINE KGE_RENDER_ENGINE_DIRECTX
#endif
-#ifdef _MSC_VER
-# ifndef KGE_VS_VER
-# define KGE_VS_VER _MSC_VER
-# define KGE_VS_2013 1800
-# define KGE_VS_2015 1900
-# define KGE_VS_2017 1900
-# define KGE_VS_2019 1920
-# endif
-
-# if KGE_VS_VER < KGE_VS_2015
-# error Kiwano only supports Visual Studio 2015 and above
-# endif
-
-# if defined(KGE_VS_VER) && KGE_VS_VER > KGE_VS_2013
-# define KGE_HAS_LITERALS
-# endif
-
-#endif
-
-#if defined(DEBUG) || defined(_DEBUG)
-# define KGE_DEBUG
-#endif
-
-#ifndef KGE_ASSERT
-# ifdef KGE_DEBUG
-# define KGE_ASSERT(EXPR) \
- do \
- { \
- (void)((!!(EXPR)) || (_wassert(_CRT_WIDE(#EXPR), _CRT_WIDE(__FUNCTION__), (unsigned)(__LINE__)), 0)); \
- } while (0)
-# else
-# define KGE_ASSERT __noop
-# endif
-#endif
-
#define KGE_DEPRECATED(...) __declspec(deprecated(__VA_ARGS__))
#define KGE_SUPPRESS_WARNING_PUSH __pragma(warning(push))
@@ -137,6 +110,23 @@
KGE_SUPPRESS_WARNING(4251)
#endif
+#ifdef _MSC_VER
+# ifndef KGE_VS_VER
+# define KGE_VS_VER _MSC_VER
+# define KGE_VS_2013 1800
+# define KGE_VS_2015 1900
+# define KGE_VS_2017 1900
+# define KGE_VS_2019 1920
+# endif
+
+# if KGE_VS_VER < KGE_VS_2015
+# error Kiwano only supports Visual Studio 2015 and above
+# endif
+
+# if defined(KGE_VS_VER) && KGE_VS_VER > KGE_VS_2013
+# define KGE_HAS_LITERALS
+# endif
+#endif
#ifndef WINVER
# define WINVER 0x0700 // Allow use of features specific to Windows 7 or later