Moved library files into a lib directory

diff --git a/Makefile b/Makefile
index 3921dde..89794b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,5 +18,5 @@ RULESMK := rules.mk
 include ${VARSMK}
 
 # include all of the dir.mk
-include src/${DIRMK}
+include lib/${DIRMK}
 

diff --git a/src/dir.mk b/lib/dir.mk
similarity index 61%
rename from src/dir.mk
rename to lib/dir.mk
index d9cbf1c..4a35efd 100644 (file)
--- a/src/dir.mk
+++ b/lib/dir.mk
@@ -1,16 +1,15 @@
 
-CURDIR  := src/
-SRCPATH :=
+CURDIR  := lib/
+#SRCPATH := # Not used at this level
 
 include ${CURDIR}${VARSMK}
-include ${CURDIR}${FILESMK}
 
 # steps on variables
-include $(addprefix ${SRCSDIR},$(addsuffix ${DIRMK},${NEWDIRS}))
+include ${SRCSDIR}${DIRMK}
 
 # Restore variables
-CURDIR  := src/
-SRCPATH :=
+CURDIR  := lib/
+#SRCPATH := # Not used at this level
 
 include ${CURDIR}${RULESMK}
 

diff --git a/inc/Autolock.h b/lib/inc/Autolock.h
similarity index 100%
rename from inc/Autolock.h
rename to lib/inc/Autolock.h

diff --git a/inc/Lock.h b/lib/inc/Lock.h
similarity index 100%
rename from inc/Lock.h
rename to lib/inc/Lock.h

diff --git a/inc/Ticks.h b/lib/inc/Ticks.h
similarity index 100%
rename from inc/Ticks.h
rename to lib/inc/Ticks.h

diff --git a/inc/Timer.h b/lib/inc/Timer.h
similarity index 100%
rename from inc/Timer.h
rename to lib/inc/Timer.h

diff --git a/inc/Vector2.h b/lib/inc/Vector2.h
similarity index 100%
rename from inc/Vector2.h
rename to lib/inc/Vector2.h

diff --git a/inc/debug.h b/lib/inc/debug.h
similarity index 100%
rename from inc/debug.h
rename to lib/inc/debug.h

diff --git a/inc/mathw.h b/lib/inc/mathw.h
similarity index 100%
rename from inc/mathw.h
rename to lib/inc/mathw.h

diff --git a/src/rules.mk b/lib/rules.mk
similarity index 100%
rename from src/rules.mk
rename to lib/rules.mk

diff --git a/src/Ticks.cpp b/lib/src/Ticks.cpp
similarity index 100%
rename from src/Ticks.cpp
rename to lib/src/Ticks.cpp

diff --git a/src/Timer.cpp b/lib/src/Timer.cpp
similarity index 100%
rename from src/Timer.cpp
rename to lib/src/Timer.cpp

diff --git a/src/Vector2.cpp b/lib/src/Vector2.cpp
similarity index 100%
rename from src/Vector2.cpp
rename to lib/src/Vector2.cpp

diff --git a/src/debug.cpp b/lib/src/debug.cpp
similarity index 100%
rename from src/debug.cpp
rename to lib/src/debug.cpp

diff --git a/lib/src/dir.mk b/lib/src/dir.mk
new file mode 100644 (file)
index 0000000..0b75341
--- /dev/null
+++ b/lib/src/dir.mk
@@ -0,0 +1,6 @@
+
+CURDIR  := lib/src/
+SRCPATH :=
+
+include ${CURDIR}${FILESMK}
+include $(addprefix ${SRCSDIR},$(addsuffix ${DIRMK},${NEWDIRS}))

diff --git a/src/files.mk b/lib/src/files.mk
similarity index 100%
rename from src/files.mk
rename to lib/src/files.mk

diff --git a/src/locks/Autolock.cpp b/lib/src/locks/Autolock.cpp
similarity index 100%
rename from src/locks/Autolock.cpp
rename to lib/src/locks/Autolock.cpp

diff --git a/src/locks/Lock.cpp b/lib/src/locks/Lock.cpp
similarity index 100%
rename from src/locks/Lock.cpp
rename to lib/src/locks/Lock.cpp

diff --git a/src/locks/dir.mk b/lib/src/locks/dir.mk
similarity index 81%
rename from src/locks/dir.mk
rename to lib/src/locks/dir.mk
index 5af7edd..96bf61d 100644 (file)
--- a/src/locks/dir.mk
+++ b/lib/src/locks/dir.mk
@@ -1,5 +1,5 @@
 
-CURDIR  := src/locks/
+CURDIR  := lib/src/locks/
 SRCPATH := locks/
 
 include ${CURDIR}${FILESMK}

diff --git a/src/locks/files.mk b/lib/src/locks/files.mk
similarity index 100%
rename from src/locks/files.mk
rename to lib/src/locks/files.mk

diff --git a/src/mathw.cpp b/lib/src/mathw.cpp
similarity index 100%
rename from src/mathw.cpp
rename to lib/src/mathw.cpp

diff --git a/src/vars.mk b/lib/vars.mk
similarity index 83%
rename from src/vars.mk
rename to lib/vars.mk
index 1b1eb80..1fcbca2 100644 (file)
--- a/src/vars.mk
+++ b/lib/vars.mk
@@ -1,25 +1,25 @@
 
-SRCSDIR := src/
-DEPSDIR := deps/
-INCDIRS := ${SRCSDIR} inc/
+SRCSDIR := ${CURDIR}src/
+DEPSDIR := ${CURDIR}deps/
+INCDIRS := ${SRCSDIR} ${CURDIR}inc/
 
 ifeq (${BUILD},WIN32)
-    OBJSDIR := objs-mingw32/
+    OBJSDIR := ${CURDIR}objs-mingw32/
 else
 ifeq (${BUILD},FINAL)
-    OBJSDIR := objs/
+    OBJSDIR := ${CURDIR}objs/
 else
-    OBJSDIR := objsd/
+    OBJSDIR := ${CURDIR}objsd/
 endif
 endif
 
 ifeq (${BUILD},WIN32)
-    WORKINGDIR  := bin-mingw32/
+    WORKINGDIR  := ${CURDIR}bin-mingw32/
 else
 ifeq (${BUILD},FINAL)
-    WORKINGDIR  := bin/
+    WORKINGDIR  := ${CURDIR}bin/
 else
-    WORKINGDIR  := bind/
+    WORKINGDIR  := ${CURDIR}bind/
 endif
 endif