Merge branch 'master' of ssh://pgornicz@cpu22.student.cs.uwaterloo.ca/~/.git-repos...

diff --git a/configs/keys.cfg b/configs/keys.cfg
new file mode 100644 (file)
index 0000000..0c6a8f3
--- /dev/null
+++ b/configs/keys.cfg
@@ -0,0 +1,2 @@
+follow=f
+well=space

diff --git a/configs/test2.cfg b/configs/test2.cfg
index baf64f5..baeb151 100644 (file)
--- a/configs/test2.cfg
+++ b/configs/test2.cfg
@@ -1,2 +1,2 @@
-follow=k
-well=LCtrl
+# follow=k
+# well=LCtrl

diff --git a/src/Makefile b/src/Makefile
index 14cc64b..342a14e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,7 @@ WORKINGDIR  := ..
 TARGETNAME  := run_physics
 TARGET      := ${WORKINGDIR}/${TARGETNAME}
 
-SRCS := # simply to keep every line below the same
+SRCS := # := start
 
 DIRS := # := start
 DIRS += .
@@ -36,7 +36,6 @@ DEPS    := ${SRCS:.cpp=.d}
 DEPS    := $(addprefix ${DEPSDIR},${DEPS})
 
 BLDDIRS := $(addprefix ${DEPSDIR},${DIRS}) $(addprefix ${OBJSDIR},${DIRS})
-BLDDIRS := $(addsuffix /,${BLDDIRS})
 
 
 VERBOSE := 0
@@ -128,7 +127,7 @@ cgdb: all
 
 .PHONY: val
 val: all
-       cd ${WORKINGDIR}; valgrind ${VALFLAGS} ${TARGETNAME}
+       cd ${WORKINGDIR}; valgrind ${VALFLAGS} ./${TARGETNAME}
 
 .PHONY: prof
 prof: run

diff --git a/src/config/reader.cpp b/src/config/reader.cpp
index f3dbdd1..e8757dd 100644 (file)
--- a/src/config/reader.cpp
+++ b/src/config/reader.cpp
@@ -43,7 +43,7 @@ void createKeyMap();
 /// ***** Private Variables *****
 
 const char* configDir = "configs/";
-const char* testFile = "test2.cfg";
+const char* testFile = "keys.cfg";
 
 /// ***** Public Methods *****