From 2dd22d024ac62bd28bc3f1479eef6854240576a1 Mon Sep 17 00:00:00 2001
From: Mikko Mononen <memononen@gmail.com>
Date: Sun, 24 Oct 2010 13:22:31 +0000
Subject: [PATCH] gnumake object files stored in gnumake/objects.

---
 Makefile                            | 11 ++++++++---
 RecastDemo/Build/GNUMake/Common.mk  |  4 ++--
 RecastDemo/Build/GNUMake/Program.mk |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 35a4cc0..6f93a0d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,25 @@
 BIN = RecastDemo/Bin
 BUILD = RecastDemo/Build/GNUMake
+OBJ = $(BUILD)/Objects
 
 # Add new targets here and add a corresponding
 # .mk file to RecastDemo/Build/GNUMake
 TARGETS = DebugUtils Detour Recast RecastDemo
 
 # Dependencies
-RecastDemo: DebugUtils Detour Recast
+RecastDemo: $(OBJ) DebugUtils Detour Recast
+
+$(OBJ):
+	mkdir -p $(OBJ)
 
 all: $(TARGETS)
 $(TARGETS):
-	make BIN=$(BIN) BUILD=$(BUILD) -f $(BUILD)/$(@).mk
+	make BIN=$(BIN) BUILD=$(BUILD) OBJ=$(OBJ) -f $(BUILD)/$(@).mk
 
 CLEAN_TARGETS = $(foreach target,$(TARGETS),$(target)-clean)
 clean: $(CLEAN_TARGETS)
+	rm -rf $(OBJ)
 $(CLEAN_TARGETS): %-clean:
-	make BIN=$(BIN) BUILD=$(BUILD) -f $(BUILD)/$(*).mk clean
+	make BIN=$(BIN) BUILD=$(BUILD) OBJ=$(OBJ) -f $(BUILD)/$(*).mk clean
 
 .PHONY: all clean $(TARGETS) $(CLEAN_TARGETS)
\ No newline at end of file
diff --git a/RecastDemo/Build/GNUMake/Common.mk b/RecastDemo/Build/GNUMake/Common.mk
index 5aa4740..85f7772 100644
--- a/RecastDemo/Build/GNUMake/Common.mk
+++ b/RecastDemo/Build/GNUMake/Common.mk
@@ -1,7 +1,7 @@
-OBJECTS = $(patsubst $(NAME)/Source/%.cpp,$(BIN)/%.o,$(wildcard $(NAME)/Source/*.cpp))
+OBJECTS = $(patsubst $(NAME)/Source/%.cpp,$(OBJ)/%.o,$(wildcard $(NAME)/Source/*.cpp))
 CPPFLAGS += -I$(NAME)/Include
 
-$(BIN)/%.o: $(NAME)/Source/%.cpp
+$(OBJ)/%.o: $(NAME)/Source/%.cpp
 	c++ $(CPPFLAGS) -c -o $@ $<
 
 .PHONY: clean
\ No newline at end of file
diff --git a/RecastDemo/Build/GNUMake/Program.mk b/RecastDemo/Build/GNUMake/Program.mk
index f44634f..62f600d 100644
--- a/RecastDemo/Build/GNUMake/Program.mk
+++ b/RecastDemo/Build/GNUMake/Program.mk
@@ -4,4 +4,4 @@ $(BIN)/$(NAME): $(OBJECTS)
 	c++ $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
 
 clean:
-	rm -f $(BIN)/$(NAME).a $(BIN)/$(NAME)
\ No newline at end of file
+	rm -f $(BIN)/$(NAME).a $(OBJECTS)
\ No newline at end of file