diff --git a/Makefile b/Makefile
index 2b11aac..4022d35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 OS = LINUX
 #OS = MACOSX
+#OS = MACOSX_CLANG
 #OS = WINDOWS
 
 ifeq ($(OS), LINUX)
@@ -9,6 +10,7 @@ CXX = g++
 CFLAGS = -O2 -Wall -D$(OS)
 CXXFLAGS = $(CFLAGS) `$(WXCONFIG) --cppflags`
 LDFLAGS =
+SFLAG = -s
 WXCONFIG = ~/wxwidgets/3.0.2.gtk2-opengl/bin/wx-config
 CLILIBS = -lglut -lGLU -lGL -lm
 MAKEFLAGS = --jobs=12
@@ -20,6 +22,17 @@ CXX = g++-4.2
 CFLAGS = -O2 -Wall -D$(OS)
 CXXFLAGS = $(CFLAGS) `$(WXCONFIG) --cppflags`
 WXCONFIG = ~/wxwidgets/3.0.2.mac-opengl/bin/wx-config
+SFLAG = -s
+CLILIBS = -lglut -lGLU -lGL -lm
+
+else ifeq ($(OS), MACOSX_CLANG)
+ALL = gui.app
+CC = /usr/bin/clang
+CXX = /usr/bin/clang++
+CFLAGS = -O2 -Wall -DMACOSX
+WXCONFIG = wx-config
+CXXFLAGS = $(CFLAGS) `$(WXCONFIG) --cppflags`
+SFLAG =
 CLILIBS = -lglut -lGLU -lGL -lm
 
 else ifeq ($(OS), WINDOWS)
@@ -29,6 +42,7 @@ CXX = i686-w64-mingw32-g++
 CFLAGS = -O2 -Wall -D$(OS)
 CXXFLAGS = $(CFLAGS) `$(WXCONFIG) --cppflags`
 LDFLAGS = -static -static-libgcc
+SFLAG = -s
 WXCONFIG = ~/wxwidgets/3.0.2.mingw-opengl/bin/wx-config
 CLILIBS = -lglut32 -lglu32 -lopengl32 -lm
 VERSION = 0.01
@@ -40,7 +54,7 @@ OBJS = visualize.o serialdata.o rawdata.o magcal.o matrix.o fusion.o quality.o m
 all: $(ALL)
 
 gui: gui.o portlist.o $(OBJS)
-	$(CXX) -s $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(WXCONFIG) --libs all,opengl`
+	$(CXX) $(SFLAG) $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(WXCONFIG) --libs all,opengl`
 
 gui.exe: gui
 	cp gui $@