Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update KGE_ASSERT macro

This commit is contained in:
Nomango 2020-02-17 23:11:17 +08:00
parent 72e176a314
commit f319f47d38
9 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/3rd-party/Box2D/libBox2D.vcxproj vendored
View File

@ -156,6 +156,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -174,6 +175,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

2
projects/3rd-party/curl/libcurl.vcxproj vendored
View File

@ -73,6 +73,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -91,6 +92,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

2
projects/3rd-party/imgui/libimgui.vcxproj vendored
View File

@ -73,6 +73,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -91,6 +92,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

2
projects/kiwano-audio/kiwano-audio.vcxproj
View File

@ -75,6 +75,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -94,6 +95,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

2
projects/kiwano-imgui/kiwano-imgui.vcxproj
View File

@ -74,6 +74,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -93,6 +94,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

2
projects/kiwano-network/kiwano-network.vcxproj
View File

@ -70,6 +70,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -89,6 +90,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

2
projects/kiwano-physics/kiwano-physics.vcxproj
View File

@ -80,6 +80,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -99,6 +100,7 @@
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

2
projects/kiwano/kiwano.vcxproj
View File

@ -232,6 +232,7 @@
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -251,6 +252,7 @@
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<UseFullPaths>false</UseFullPaths>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

60
src/kiwano/macros.h
View File

@ -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