Add configurations for MacOS

This commit is contained in:
liuhaibo.2020 2020-04-30 14:41:41 +08:00
parent b790bb7315
commit 8eb4c2e1ff
5 changed files with 64 additions and 3 deletions

1
.gitignore vendored
View File

@ -8,7 +8,6 @@ Release/
# Application folders
.vs
.vscode
# vs2010
ipch/

32
.vscode/c_cpp_properties.json vendored Normal file
View File

@ -0,0 +1,32 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/src/**"
],
"defines": [
"TARGET_OS_MAC"
],
"macFrameworkPath": [
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"cppStandard": "c++14",
"intelliSenseMode": "clang-x64"
},
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/src/**"
],
"defines": [],
"compilerPath": "/usr/bin/gcc",
"cStandard": "c11",
"cppStandard": "c++14",
"intelliSenseMode": "clang-x64"
}
],
"version": 4
}

4
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"files.autoGuessEncoding": true,
"files.encoding": "gb2312"
}

View File

@ -268,7 +268,7 @@ inline bool operator<(const SmartPtr<_Ty, _ProxyTy>& lhs, const SmartPtr<_UTy, _
}
// template class cannot specialize std::swap,
// so implement a Swap Function in kiwano namespace
// so implement a swap function in kiwano namespace
template <class _Ty, class _ProxyTy>
inline void swap(SmartPtr<_Ty, _ProxyTy>& lhs, SmartPtr<_Ty, _ProxyTy>& rhs) noexcept
{

View File

@ -77,7 +77,7 @@
//
/////////////////////////////////////////////////////////////
#ifdef KGE_PLATFORM_WINDOWS
#if defined(KGE_PLATFORM_WINDOWS)
#if KGE_RENDER_ENGINE == KGE_RENDER_ENGINE_NONE
# undef KGE_RENDER_ENGINE
@ -157,6 +157,32 @@ KGE_SUPPRESS_WARNING(4251)
#include <wincodec.h>
#include <windows.h>
#elif defined(KGE_PLATFORM_MACOS)
#if KGE_RENDER_ENGINE == KGE_RENDER_ENGINE_NONE
# undef KGE_RENDER_ENGINE
# define KGE_RENDER_ENGINE KGE_RENDER_ENGINE_OPENGL
#endif
#define KGE_DEPRECATED(...)
#define KGE_SUPPRESS_WARNING_PUSH
#define KGE_SUPPRESS_WARNING(CODE)
#define KGE_SUPPRESS_WARNING_POP
#ifndef KGE_API
# if defined(KGE_USE_DLL)
# define KGE_API
# elif defined(KGE_EXPORT_DLL)
# define KGE_API
# endif
#endif
#ifndef KGE_API
/* Building or calling Kiwano as a static library */
# define KGE_API
#endif
#else
#if KGE_RENDER_ENGINE == KGE_RENDER_ENGINE_DIRECTX