From 135e650ec8f7a79069af929f9a0d38753f026f96 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Tue, 10 Jun 2014 00:38:00 +1000
Subject: [PATCH] Moved the map API to the map directory

---
 common/makefile                       |  1 -
 common/{script => map}/pager_api.cpp  |  0
 common/{script => map}/pager_api.hpp  |  0
 common/{script => map}/region_api.cpp |  0
 common/{script => map}/region_api.hpp |  0
 common/script/makefile                | 37 ---------------------------
 {common/script => server}/linit.cpp   |  0
 7 files changed, 38 deletions(-)
 rename common/{script => map}/pager_api.cpp (100%)
 rename common/{script => map}/pager_api.hpp (100%)
 rename common/{script => map}/region_api.cpp (100%)
 rename common/{script => map}/region_api.hpp (100%)
 delete mode 100644 common/script/makefile
 rename {common/script => server}/linit.cpp (100%)

diff --git a/common/makefile b/common/makefile
index 0e48688..b670b7d 100644
--- a/common/makefile
+++ b/common/makefile
@@ -3,7 +3,6 @@ all:
 	$(MAKE) -C graphics
 	$(MAKE) -C map
 	$(MAKE) -C network
-	$(MAKE) -C script
 	$(MAKE) -C ui
 	$(MAKE) -C utilities
 
diff --git a/common/script/pager_api.cpp b/common/map/pager_api.cpp
similarity index 100%
rename from common/script/pager_api.cpp
rename to common/map/pager_api.cpp
diff --git a/common/script/pager_api.hpp b/common/map/pager_api.hpp
similarity index 100%
rename from common/script/pager_api.hpp
rename to common/map/pager_api.hpp
diff --git a/common/script/region_api.cpp b/common/map/region_api.cpp
similarity index 100%
rename from common/script/region_api.cpp
rename to common/map/region_api.cpp
diff --git a/common/script/region_api.hpp b/common/map/region_api.hpp
similarity index 100%
rename from common/script/region_api.hpp
rename to common/map/region_api.hpp
diff --git a/common/script/makefile b/common/script/makefile
deleted file mode 100644
index 7cab524..0000000
--- a/common/script/makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../map ../utilities
-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 $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all
diff --git a/common/script/linit.cpp b/server/linit.cpp
similarity index 100%
rename from common/script/linit.cpp
rename to server/linit.cpp