fix windows build
This commit is contained in:
parent
1dfbc55f83
commit
6fca141605
4
Makefile
4
Makefile
|
@ -159,8 +159,8 @@ endif
|
||||||
OBJDIR = $(BIN)/obj
|
OBJDIR = $(BIN)/obj
|
||||||
|
|
||||||
# All other sources
|
# All other sources
|
||||||
OBJS != find source/engine -type f -name '*.c' | grep -vE 'test|tool|example'
|
OBJS != find source/engine -type f -name '*.c' | grep -vE 'test|tool|example|fuzz|main'
|
||||||
CPPOBJS != find source/engine -type f -name '*.cpp' | grep -vE 'test|tool|example'
|
CPPOBJS != find source/engine -type f -name '*.cpp' | grep -vE 'test|tool|example|fuzz|main'
|
||||||
OBJS += $(CPPOBJS)
|
OBJS += $(CPPOBJS)
|
||||||
OBJS += $(shell find source/engine -type f -name '*.m')
|
OBJS += $(shell find source/engine -type f -name '*.m')
|
||||||
OBJS := $(patsubst %.cpp, %.o, $(OBJS))
|
OBJS := $(patsubst %.cpp, %.o, $(OBJS))
|
||||||
|
|
|
@ -284,7 +284,7 @@ SCHED_API void scheduler_stop(struct scheduler*, int doWait);
|
||||||
/* windows requires Windows.h even if you use mingw */
|
/* windows requires Windows.h even if you use mingw */
|
||||||
#if defined(_WIN32) || (defined(__MINGW32__) || defined(__MINGW64__))
|
#if defined(_WIN32) || (defined(__MINGW32__) || defined(__MINGW64__))
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <Windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* make sure atomic and pointer types have correct size */
|
/* make sure atomic and pointer types have correct size */
|
||||||
|
|
Loading…
Reference in a new issue