Fix mingw build for thekla_atlas
This commit is contained in:
parent
55962ce28f
commit
5387613c7b
3 changed files with 16 additions and 14 deletions
|
@ -59,11 +59,15 @@ if env['builtin_thekla_atlas']:
|
|||
env_thekla_unwrap.Append(CXXFLAGS="-std=gnu++11")
|
||||
|
||||
if env["platform"] == 'x11':
|
||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX"])
|
||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX", "-DPOSH_COMPILER_GCC"])
|
||||
elif env["platform"] == 'osx':
|
||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_DARWIN"])
|
||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_DARWIN", "-DPOSH_COMPILER_GCC"])
|
||||
elif env["platform"] == 'windows':
|
||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_WIN32"])
|
||||
if env.msvc:
|
||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_WIN32", "-DNV_CC_MSVC", "-DPOSH_COMPILER_MSVC" ])
|
||||
else:
|
||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_MINGW", "-DNV_CC_GNUC", "-DPOSH_COMPILER_GCC"])
|
||||
env.Append(LIBS=["dbghelp"])
|
||||
|
||||
# Godot source files
|
||||
env_thekla_unwrap.add_source_files(env.modules_sources, "*.cpp")
|
||||
|
|
4
thirdparty/thekla_atlas/nvcore/Debug.cpp
vendored
4
thirdparty/thekla_atlas/nvcore/Debug.cpp
vendored
|
@ -14,7 +14,6 @@
|
|||
# define VC_EXTRALEAN
|
||||
# include <windows.h>
|
||||
# include <direct.h>
|
||||
# if NV_CC_MSVC
|
||||
# include <crtdbg.h>
|
||||
# if _MSC_VER < 1300
|
||||
# define DECLSPEC_DEPRECATED
|
||||
|
@ -25,7 +24,6 @@
|
|||
// VC7: ships with updated headers
|
||||
# include <dbghelp.h>
|
||||
# endif
|
||||
# endif
|
||||
# pragma comment(lib,"dbghelp.lib")
|
||||
#endif
|
||||
|
||||
|
@ -110,7 +108,7 @@ namespace
|
|||
#endif
|
||||
|
||||
|
||||
#if (NV_OS_WIN32 && NV_CC_MSVC) || NV_OS_DURANGO
|
||||
#if NV_OS_WIN32 || NV_OS_DURANGO
|
||||
|
||||
// We should try to simplify the top level filter as much as possible.
|
||||
// http://www.nynaeve.net/?p=128
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#endif
|
||||
|
||||
#define NV_FASTCALL __attribute__((fastcall))
|
||||
#define NV_FORCEINLINE __attribute__((always_inline))
|
||||
#define NV_FORCEINLINE __attribute__((always_inline)) inline
|
||||
#define NV_DEPRECATED __attribute__((deprecated))
|
||||
|
||||
#if __GNUC__ > 2
|
||||
|
|
Loading…
Reference in a new issue