Imported updates from Codebase

client/makefile

@@ -3,23 +3,7 @@ CXXFLAGS+=-std=c++11 -DDEBUG
 LIB=-lmingw32 -lSDLmain -lSDL -lwsock32 -lWS2_32
 
 #source
-SRC=base_scene.cpp \
-    scene_manager.cpp \
-    test_systems.cpp \
-    splash.cpp \
-    main_menu.cpp \
-    in_game.cpp \
-    lobby.cpp \
-    combat.cpp \
-    surface_manager.cpp \
-    image.cpp \
-    sprite_sheet.cpp \
-    player.cpp \
-    player_manager.cpp \
-    config_utility.cpp \
-    network.cpp \
-    network_tcp.cpp \
-    main.cpp
+SRC=$(filter-out unit.cpp, $(wildcard *.cpp))
 
 #objects
 OBJDIR=obj
@@ -27,7 +11,7 @@ OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o))
 
 #output
 OUTDIR=out
-OUT=$(addprefix $(OUTDIR)/,a)
+OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
@@ -44,7 +28,7 @@ $(OUTDIR):
 	mkdir $(OUTDIR)
 
 $(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $(@) $<
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 clean:
 	$(RM) *.o *.a *.exe