From fedc420c1939306fdf37bc6967123efa478af763 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Fri, 14 Aug 2015 18:02:39 +1000
Subject: [PATCH] Merged common/ui into common/graphics

---
 common/{ui => graphics}/button.cpp    |  0
 common/{ui => graphics}/button.hpp    |  0
 common/{ui => graphics}/text_box.cpp  |  0
 common/{ui => graphics}/text_box.hpp  |  0
 common/{ui => graphics}/text_line.cpp |  0
 common/{ui => graphics}/text_line.hpp |  0
 common/makefile                       |  1 -
 common/ui/makefile                    | 32 ---------------------------
 8 files changed, 33 deletions(-)
 rename common/{ui => graphics}/button.cpp (100%)
 rename common/{ui => graphics}/button.hpp (100%)
 rename common/{ui => graphics}/text_box.cpp (100%)
 rename common/{ui => graphics}/text_box.hpp (100%)
 rename common/{ui => graphics}/text_line.cpp (100%)
 rename common/{ui => graphics}/text_line.hpp (100%)
 delete mode 100644 common/ui/makefile

diff --git a/common/ui/button.cpp b/common/graphics/button.cpp
similarity index 100%
rename from common/ui/button.cpp
rename to common/graphics/button.cpp
diff --git a/common/ui/button.hpp b/common/graphics/button.hpp
similarity index 100%
rename from common/ui/button.hpp
rename to common/graphics/button.hpp
diff --git a/common/ui/text_box.cpp b/common/graphics/text_box.cpp
similarity index 100%
rename from common/ui/text_box.cpp
rename to common/graphics/text_box.cpp
diff --git a/common/ui/text_box.hpp b/common/graphics/text_box.hpp
similarity index 100%
rename from common/ui/text_box.hpp
rename to common/graphics/text_box.hpp
diff --git a/common/ui/text_line.cpp b/common/graphics/text_line.cpp
similarity index 100%
rename from common/ui/text_line.cpp
rename to common/graphics/text_line.cpp
diff --git a/common/ui/text_line.hpp b/common/graphics/text_line.hpp
similarity index 100%
rename from common/ui/text_line.hpp
rename to common/graphics/text_line.hpp
diff --git a/common/makefile b/common/makefile
index e2d1029..dcfef9b 100644
--- a/common/makefile
+++ b/common/makefile
@@ -4,5 +4,4 @@ all:
 	$(MAKE) -C graphics
 	$(MAKE) -C map
 	$(MAKE) -C network
-	$(MAKE) -C ui
 	$(MAKE) -C utilities
diff --git a/common/ui/makefile b/common/ui/makefile
deleted file mode 100644
index 03a0db8..0000000
--- a/common/ui/makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#config
-INCLUDES+=. ../graphics
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#output
-OUTDIR=../..
-OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<