update

Makefile.in

@@ -87,8 +87,8 @@ DISTDIR = dist
 DOCDIR  = doc
 
 SRCDIRS += $(shell find $(SRCDIR) -type d)
-INCDIRS += $(INCDIR) $(DEPDIR) $(DEPDIR)/include $(SRCDIRS)
-LIBDIRS += $(LIBDIR) $(DEPDIR)/lib $(DEPDIR)/lib/$(TARGET_PLATFORM)
+override INCDIRS += $(INCDIR) $(DEPDIR) $(DEPDIR)/include
+override LIBDIRS += $(LIBDIR) $(DEPDIR)/lib $(DEPDIR)/lib/$(TARGET_PLATFORM)
 
 # CPPFLAGS
 ifeq ($(OS), Windows)
@@ -102,6 +102,7 @@ ifeq ($(BUILD_TYPE), DEBUG)
 endif
 CPPFLAGS += $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(addprefix -I, $(INCDIRS))
+CPPFLAGS += $(addprefix -I, $(SRCDIRS))
 
 # LDFLAGS
 ifeq ($(OS), Windows)

base/hlog.c

@@ -17,7 +17,7 @@ static char     s_logbuf[LOG_BUFSIZE];
 
 // for thread-safe
 #include "hmutex.h"
-#ifdef _MSC_VER
+#ifdef OS_WIN
 static hmutex_t  s_mutex;
 static honce_t   s_once = HONCE_INIT;
 static void WINAPI __mutex_init() {

base/hmutex.h

@@ -3,7 +3,7 @@
 
 #include "hplatform.h"
 
-#ifdef _WIN32
+#ifdef OS_WIN
 #define hmutex_t            CRITICAL_SECTION
 #define hmutex_init         InitializeCriticalSection
 #define hmutex_destroy      DeleteCriticalSection