Fixes thekla atlas mingw-w64 build
This commit is contained in:
parent
e3fd61b638
commit
f55162ac1d
|
@ -67,7 +67,7 @@ if env['builtin_thekla_atlas']:
|
||||||
if env.msvc:
|
if env.msvc:
|
||||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_WIN32", "-DNV_CC_MSVC", "-DPOSH_COMPILER_MSVC" ])
|
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_WIN32", "-DNV_CC_MSVC", "-DPOSH_COMPILER_MSVC" ])
|
||||||
else:
|
else:
|
||||||
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_MINGW", "-DNV_CC_GNUC", "-DPOSH_COMPILER_GCC"])
|
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_MINGW", "-DNV_CC_GNUC", "-DPOSH_COMPILER_GCC", "-U__STRICT_ANSI__"])
|
||||||
env.Append(LIBS=["dbghelp"])
|
env.Append(LIBS=["dbghelp"])
|
||||||
|
|
||||||
# Godot source files
|
# Godot source files
|
||||||
|
|
|
@ -308,6 +308,10 @@ Files extracted from the upstream source:
|
||||||
- Relevant sources from src/
|
- Relevant sources from src/
|
||||||
- License.txt
|
- License.txt
|
||||||
|
|
||||||
|
Important: Some files have Godot-made changes, those
|
||||||
|
changes are marked with `// -- GODOT --` comments.
|
||||||
|
|
||||||
|
|
||||||
## nanosvg
|
## nanosvg
|
||||||
|
|
||||||
- Upstream: https://github.com/memononen/nanosvg
|
- Upstream: https://github.com/memononen/nanosvg
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
# define VC_EXTRALEAN
|
# define VC_EXTRALEAN
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
# include <direct.h>
|
# include <direct.h>
|
||||||
|
// -- GODOT start -
|
||||||
# include <crtdbg.h>
|
# include <crtdbg.h>
|
||||||
# if _MSC_VER < 1300
|
# if _MSC_VER < 1300
|
||||||
# define DECLSPEC_DEPRECATED
|
# define DECLSPEC_DEPRECATED
|
||||||
|
@ -24,6 +25,7 @@
|
||||||
// VC7: ships with updated headers
|
// VC7: ships with updated headers
|
||||||
# include <dbghelp.h>
|
# include <dbghelp.h>
|
||||||
# endif
|
# endif
|
||||||
|
// -- GODOT end -
|
||||||
# pragma comment(lib,"dbghelp.lib")
|
# pragma comment(lib,"dbghelp.lib")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -107,8 +109,9 @@ namespace
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// -- GODOT start -
|
||||||
#if NV_OS_WIN32 || NV_OS_DURANGO
|
#if NV_OS_WIN32 || NV_OS_DURANGO
|
||||||
|
// -- GODOT end -
|
||||||
|
|
||||||
// We should try to simplify the top level filter as much as possible.
|
// We should try to simplify the top level filter as much as possible.
|
||||||
// http://www.nynaeve.net/?p=128
|
// http://www.nynaeve.net/?p=128
|
||||||
|
|
|
@ -19,7 +19,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NV_FASTCALL __attribute__((fastcall))
|
#define NV_FASTCALL __attribute__((fastcall))
|
||||||
|
// -- GODOT start -
|
||||||
#define NV_FORCEINLINE __attribute__((always_inline)) inline
|
#define NV_FORCEINLINE __attribute__((always_inline)) inline
|
||||||
|
// -- GODOT end -
|
||||||
#define NV_DEPRECATED __attribute__((deprecated))
|
#define NV_DEPRECATED __attribute__((deprecated))
|
||||||
|
|
||||||
#if __GNUC__ > 2
|
#if __GNUC__ > 2
|
||||||
|
|
Loading…
Reference in New Issue