diff --git a/cimgui/Makefile b/cimgui/Makefile index a14d2df..349cb40 100644 --- a/cimgui/Makefile +++ b/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 $@ $< diff --git a/cimgui/cimgui.h b/cimgui/cimgui.h index e708a50..4dad982 100644 --- a/cimgui/cimgui.h +++ b/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