From 1a54a8116759a91b5db6c79bb57c1921d6840e68 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 20 Jan 2013 23:43:58 +0000 Subject: [PATCH] sys: move thread.h to the sys/ directory. --- src/Makefile.am | 3 +-- src/core.h | 2 +- src/{thread => lol/sys}/thread.h | 2 +- src/lolcore.vcxproj | 8 +++++--- src/{thread => sys}/threadbase.h | 0 5 files changed, 8 insertions(+), 7 deletions(-) rename src/{thread => lol/sys}/thread.h (96%) rename src/{thread => sys}/threadbase.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 72d463c4..c47f1a1e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,8 +46,6 @@ liblol_a_SOURCES = \ \ base/hash.cpp base/string.cpp \ \ - thread/threadbase.h thread/thread.h \ - \ math/vector.cpp math/real.cpp math/half.cpp math/trig.cpp \ math/geometry.cpp \ \ @@ -74,6 +72,7 @@ liblol_a_SOURCES = \ mesh/mesh.cpp mesh/mesh.h \ \ sys/init.cpp \ + sys/threadbase.h sys/thread.h \ \ image/image.cpp image/image.h image/image-private.h \ image/codec/gdiplus-image.cpp \ diff --git a/src/core.h b/src/core.h index 0bb7bf7b..9fa9788e 100644 --- a/src/core.h +++ b/src/core.h @@ -89,12 +89,12 @@ static inline int isnan(float f) #include #include +#include #include #include "numeric.h" #include "timer.h" -#include "thread/thread.h" // Static classes #include "log.h" diff --git a/src/thread/thread.h b/src/lol/sys/thread.h similarity index 96% rename from src/thread/thread.h rename to src/lol/sys/thread.h index be415a82..7e4d4a0a 100644 --- a/src/thread/thread.h +++ b/src/lol/sys/thread.h @@ -19,7 +19,7 @@ #if defined __CELLOS_LV2__ # include "platform/ps3/threadbase.h" #else -# include "threadbase.h" +# include "sys/threadbase.h" #endif namespace lol diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj index 9132720a..d3f9eeec 100644 --- a/src/lolcore.vcxproj +++ b/src/lolcore.vcxproj @@ -599,6 +599,8 @@ + + @@ -618,9 +620,9 @@ + + - - @@ -647,4 +649,4 @@ - \ No newline at end of file + diff --git a/src/thread/threadbase.h b/src/sys/threadbase.h similarity index 100% rename from src/thread/threadbase.h rename to src/sys/threadbase.h