1 files changed, 18 insertions, 33 deletions
diff --git a/Makefile b/Makefile
index d8f241e..32de232 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,12 @@
-CC := gcc
 CXX := g++
 LINKER := g++
-ASM := nasm
 SRCDIR := ./src
 BINDIR := ./build
 EXE := $(BINDIR)/blackshades
 
 CFLAGS := -O2 -Wall -g $(shell sdl-config --cflags) -I$(SRCDIR)
 CXXFLAGS := $(CFLAGS)
-LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lGL -lGLU -lopenal -lalut # -framework QuickTime
+LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lGL -lGLU -lopenal -lalut
 
 # Don't want ogg?
 #CFLAGS += -DNOOGG
@@ -20,60 +18,47 @@ SRCS := Camera.cpp \
         Fog.cpp \
         Frustum.cpp \
         GameDraw.cpp \
-	GameInitDispose.cpp \
-	GameLoop.cpp \
-	GameTick.cpp \
+        GameInitDispose.cpp \
+        GameLoop.cpp \
+        GameTick.cpp \
         Globals.cpp \
-	MacInput.cpp \
-	Main.cpp \
+        MacInput.cpp \
+        Main.cpp \
         Maths.cpp \
-	Models.cpp \
-	Person.cpp \
+        Models.cpp \
+        Person.cpp \
         Quaternions.cpp \
-	Serialize.cpp \
-	Skeleton.cpp \
+        Serialize.cpp \
+        Skeleton.cpp \
         Sprites.cpp \
-	Support.cpp \
+        Support.cpp \
         TGALoader.cpp \
         Text.cpp \
-	Timer.cpp \
-	Textures.cpp
+        Timer.cpp \
+        Textures.cpp
 
-OBJS1 := $(SRCS:.c=.o)
-OBJS2 := $(OBJS1:.cpp=.o)
-OBJS3 := $(OBJS2:.asm=.o)
-OBJS := $(foreach f,$(OBJS3),$(BINDIR)/$(f))
+OBJS := $(foreach f,$(SRCS:.cpp=.o),$(BINDIR)/$(f))
 SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f))
 
 CLEANUP = $(wildcard *.exe) $(wildcard *.obj) \
           $(wildcard $(BINDIR)/*.exe) $(wildcard $(BINDIR)/*.obj) \
           $(wildcard *~) $(wildcard *.err) \
-          $(wildcard .\#*) core $(EXE)
+          $(wildcard .\#*) $(EXE)
 
 # Rules for compiling individual source files...
 
 $(BINDIR)/%.o: $(SRCDIR)/%.cpp
 	$(CXX) -c -o $@ $< $(CXXFLAGS)
 
-$(BINDIR)/%.o: $(SRCDIR)/%.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-$(BINDIR)/%.o: $(SRCDIR)/%.asm
-	$(ASM) $(ASMFLAGS) -o $@ $<
-
-.PHONY: all bindir blackshades
+.PHONY: all clean
 all: $(EXE)
 
 $(EXE): $(BINDIR) $(OBJS)
 	$(LINKER) -o $(EXE) $(OBJS) $(LDFLAGS)
 
-$(BINDIR) :
-	$(MAKE) bindir
-
-bindir:
+$(BINDIR):
 	mkdir -p $(BINDIR)
-
-distclean: clean
+	make $(BINDIR)
 
 clean:
 	rm -f $(CLEANUP)