Moved osx project setup to own directory

Author: Rasmus Rønn Nielsen

.gitignore

@@ -1,3 +1,3 @@
 .DS_Store
-/MakefileSettings
+/osx_project/MakefileSettings
 *.sublime-workspace

Makefile renamed to osx_project/Makefile

@@ -8,12 +8,14 @@ COMMON_FLAGS += -DDEBUG
 PRODUCT_DIR = $(BUILD_DIR)/products
 OBJECTS_DIR = $(BUILD_DIR)/objects
 
-COMMON_SOURCES = code/common/memory.cpp code/common/network.cpp code/common/serialization.cpp code/lib/assert.cpp code/common/network_messages.cpp code/common/conversion.cpp
-COMMON_HEADER_INCLUDES = -iquote code
+CODE_ROOT = ../code
+
+COMMON_SOURCES = $(CODE_ROOT)/common/memory.cpp $(CODE_ROOT)/common/network.cpp $(CODE_ROOT)/common/serialization.cpp $(CODE_ROOT)/lib/assert.cpp $(CODE_ROOT)/common/network_messages.cpp $(CODE_ROOT)/common/conversion.cpp
+COMMON_HEADER_INCLUDES = -iquote $(CODE_ROOT)
 
 SERVER_PRODUCT_DIR = $(PRODUCT_DIR)/LockstepServer.app
 SERVER_BINARY = $(SERVER_PRODUCT_DIR)/Contents/MacOS/LockstepServer
-SERVER_SOURCES = $(COMMON_SOURCES) code/server/main.cpp code/server/network.cpp code/server/client_set.cpp code/server/network_events.cpp code/server/network_commands.cpp code/lib/chunk_ring_buffer.cpp code/lib/byte_ring_buffer.cpp
+SERVER_SOURCES = $(COMMON_SOURCES) $(CODE_ROOT)/server/main.cpp $(CODE_ROOT)/server/network.cpp $(CODE_ROOT)/server/client_set.cpp $(CODE_ROOT)/server/network_events.cpp $(CODE_ROOT)/server/network_commands.cpp $(CODE_ROOT)/lib/chunk_ring_buffer.cpp $(CODE_ROOT)/lib/byte_ring_buffer.cpp
 SERVER_OBJS = $(patsubst %.cpp, $(OBJECTS_DIR)/%.o, $(SERVER_SOURCES))
 SERVER_DEPS = $(sort $(patsubst %, %.deps, $(SERVER_OBJS)))
 
@@ -24,8 +26,8 @@ CLIENT_INFO_PLIST = client_info.plist
 CLIENT_PRODUCT_DIR = $(PRODUCT_DIR)/LockstepClient.app
 CLIENT_CONTENTS_DIR = $(SERVER_PRODUCT_DIR)/Contents
 CLIENT_BINARY = $(CLIENT_CONTENTS_DIR)/MacOS/LockstepClient
-CLIENT_CPP_SOURCES = $(COMMON_SOURCES) code/client/posix_network.cpp code/lib/chunk_ring_buffer.cpp code/lib/chunk_list.cpp code/lib/byte_ring_buffer.cpp code/client/network_events.cpp code/client/network_commands.cpp code/client/client.cpp
-CLIENT_OBJ_CPP_SOURCES = code/client/osx_main.mm
+CLIENT_CPP_SOURCES = $(COMMON_SOURCES) $(CODE_ROOT)/client/posix_network.cpp $(CODE_ROOT)/lib/chunk_ring_buffer.cpp $(CODE_ROOT)/lib/chunk_list.cpp $(CODE_ROOT)/lib/byte_ring_buffer.cpp $(CODE_ROOT)/client/network_events.cpp $(CODE_ROOT)/client/network_commands.cpp $(CODE_ROOT)/client/client.cpp
+CLIENT_OBJ_CPP_SOURCES = $(CODE_ROOT)/client/osx_main.mm
 CLIENT_CPP_OBJS = $(patsubst %.cpp, $(OBJECTS_DIR)/%.o, $(CLIENT_CPP_SOURCES))
 CLIENT_CPP_CPP_OBJS = $(patsubst %.mm, $(OBJECTS_DIR)/%.o, $(CLIENT_OBJ_CPP_SOURCES))
 CLIENT_OBJS = $(CLIENT_CPP_OBJS) $(CLIENT_CPP_CPP_OBJS)
@@ -40,12 +42,12 @@ TEST_SOURCES =\
 	test/chunk_ring_buffer_test.cpp\
 	test/client_set_iterator_test.cpp\
 	test/chunk_list_test.cpp\
-	code/lib/assert.cpp\
-	code/lib/byte_ring_buffer.cpp\
-	code/lib/chunk_list.cpp\
-	code/lib/chunk_ring_buffer.cpp\
-	code/common/serialization.cpp\
-	code/server/client_set.cpp
+	$(CODE_ROOT)/lib/assert.cpp\
+	$(CODE_ROOT)/lib/byte_ring_buffer.cpp\
+	$(CODE_ROOT)/lib/chunk_list.cpp\
+	$(CODE_ROOT)/lib/chunk_ring_buffer.cpp\
+	$(CODE_ROOT)/common/serialization.cpp\
+	$(CODE_ROOT)/server/client_set.cpp
 TEST_OBJS = $(patsubst %.cpp, $(OBJECTS_DIR)/%.o, $(TEST_SOURCES))
 TEST_DEPS = $(sort $(patsubst %, %.deps, $(TEST_OBJS)))
 

client_info.plist renamed to osx_project/client_info.plist

@@ -2,7 +2,7 @@
   "folders":
   [
     {
-      "path": "."
+      "path": "../."
     }
   ],
   "build_systems": [