From: Patrik Gornicz Date: Sat, 1 Aug 2009 20:44:21 +0000 (-0400) Subject: added bear to include folder X-Git-Tag: libbear-premerge~30 X-Git-Url: http://gitweb.pgornicz.com/?a=commitdiff_plain;h=ba8b591134b6d01acb92aa61062f5aa33e12fbd9;p=libbear.git added bear to include folder --- diff --git a/lib/inc/Autolock.h b/lib/include/bear/Autolock.h similarity index 100% rename from lib/inc/Autolock.h rename to lib/include/bear/Autolock.h diff --git a/lib/inc/Lock.h b/lib/include/bear/Lock.h similarity index 100% rename from lib/inc/Lock.h rename to lib/include/bear/Lock.h diff --git a/lib/inc/Ticks.h b/lib/include/bear/Ticks.h similarity index 100% rename from lib/inc/Ticks.h rename to lib/include/bear/Ticks.h diff --git a/lib/inc/Timer.h b/lib/include/bear/Timer.h similarity index 100% rename from lib/inc/Timer.h rename to lib/include/bear/Timer.h diff --git a/lib/inc/Vector2.h b/lib/include/bear/Vector2.h similarity index 100% rename from lib/inc/Vector2.h rename to lib/include/bear/Vector2.h diff --git a/lib/inc/debug.h b/lib/include/bear/debug.h similarity index 100% rename from lib/inc/debug.h rename to lib/include/bear/debug.h diff --git a/lib/inc/mathw.h b/lib/include/bear/mathw.h similarity index 100% rename from lib/inc/mathw.h rename to lib/include/bear/mathw.h diff --git a/lib/vars.mk b/lib/vars.mk index d739f7d..0bc5a81 100644 --- a/lib/vars.mk +++ b/lib/vars.mk @@ -22,7 +22,7 @@ OBJSDIR_$P := ${CURDIR}${G_OBJSDIR} BINDIR_$P := ${CURDIR}${G_BINDIR} -T_INCDIRS_$P := ${SRCSDIR_$P} ${CURDIR}inc/ +T_INCDIRS_$P := ${SRCSDIR_$P} ${CURDIR}include/bear/ INCFLAGS_$P := $(addprefix -I, ${T_INCDIRS_$P}) T_INCDIRS_$P := diff --git a/tests/src/1/main.cpp b/tests/src/1/main.cpp index 55575e6..c023630 100644 --- a/tests/src/1/main.cpp +++ b/tests/src/1/main.cpp @@ -1,5 +1,5 @@ -#include "debug.h" +#include "bear/debug.h" int main() { diff --git a/tests/src/printTrace/main.cpp b/tests/src/printTrace/main.cpp index 41c12ac..f8c525c 100644 --- a/tests/src/printTrace/main.cpp +++ b/tests/src/printTrace/main.cpp @@ -1,5 +1,5 @@ -#include "debug.h" +#include "bear/debug.h" void test() { diff --git a/tests/vars.mk b/tests/vars.mk index b52d8c7..3a08d67 100644 --- a/tests/vars.mk +++ b/tests/vars.mk @@ -10,7 +10,7 @@ OBJSDIR_$P := ${CURDIR}${G_OBJSDIR} BINDIR_$P := ${CURDIR}${G_BINDIR} # HACK -T_INCDIRS_$P := lib/inc/ +T_INCDIRS_$P := lib/include/ INCFLAGS_$P := $(addprefix -I, ${T_INCDIRS_$P}) T_INCDIRS_$P := # empty