Merge pull request #23 from Wizzard033/master

Fixed for compiling with MinGW

cimgui/Makefile

@@ -32,6 +32,17 @@ ifeq ($(UNAME_S), Darwin) #APPLE
 	CFLAGS = $(CXXFLAGS)
 endif
 
+ifeq ($(OS), Windows_NT)
+	ECHO_MESSAGE = "Windows"
+
+	OUTPUTNAME = cimgui.dll
+	CXXFLAGS = -I../../
+	CXXFLAGS += -Wall
+	CXXFLAGS += -shared
+	LINKFLAGS = -limm32
+	CFLAGS = $(CXXFLAGS)
+endif
+
 .cpp.o:
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 

cimgui/cimgui.h

@@ -3,7 +3,9 @@
 
 #if defined _WIN32 || defined __CYGWIN__
 #define API __declspec(dllexport)
+#ifndef __GNUC__
 #define snprintf sprintf_s
+#endif
 #else
 #define API
 #endif