diff --git a/cimgui/Makefile b/cimgui/Makefile
new file mode 100644
index 0000000..7a45ba3
--- /dev/null
+++ b/cimgui/Makefile
@@ -0,0 +1,36 @@
+#
+# Cross Platform Makefile
+# Compatible with Ubuntu 14.04.1 and Mac OS X
+
+OBJS = cimgui.o
+OBJS += ../imgui/imgui.o
+
+UNAME_S := $(shell uname -s)
+
+ifeq ($(UNAME_S), Linux) #LINUX
+	ECHO_MESSAGE = "Linux"
+
+	CXXFLAGS = -I../../ `pkg-config --cflags glfw3`
+	CXXFLAGS += -Wall
+	CFLAGS = $(CXXFLAGS)
+endif
+
+ifeq ($(UNAME_S), Darwin) #APPLE
+	ECHO_MESSAGE = "Mac OS X"
+
+	CXXFLAGS = -I/usr/local/include
+	CXXFLAGS += -Wall
+	CFLAGS = $(CXXFLAGS)
+endif
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+all:imgui_example
+	@echo Build complete for $(ECHO_MESSAGE)
+
+imgui_example:$(OBJS)
+	$(CXX) -dynamiclib -current_version 1.0 -o cimgui.dylib $(OBJS) $(CXXFLAGS)
+
+clean:
+	rm $(OBJS)
\ No newline at end of file
diff --git a/cimgui/cimgui.cpp b/cimgui/cimgui.cpp
index 5911d18..be4b97d 100644
--- a/cimgui/cimgui.cpp
+++ b/cimgui/cimgui.cpp
@@ -1,7 +1,11 @@
 
 #include "../imgui/imgui.h"
 
+#if defined _WIN32 || defined __CYGWIN__
 #define API __declspec(dllexport)
+#else
+#define API
+#endif
 
 extern "C" API ImGuiIO* ImGui_GetIO()
 {