@@ -46,8 +46,6 @@ liblol_a_SOURCES = \ | |||||
\ | \ | ||||
base/hash.cpp base/string.cpp \ | 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/vector.cpp math/real.cpp math/half.cpp math/trig.cpp \ | ||||
math/geometry.cpp \ | math/geometry.cpp \ | ||||
\ | \ | ||||
@@ -74,6 +72,7 @@ liblol_a_SOURCES = \ | |||||
mesh/mesh.cpp mesh/mesh.h \ | mesh/mesh.cpp mesh/mesh.h \ | ||||
\ | \ | ||||
sys/init.cpp \ | sys/init.cpp \ | ||||
sys/threadbase.h sys/thread.h \ | |||||
\ | \ | ||||
image/image.cpp image/image.h image/image-private.h \ | image/image.cpp image/image.h image/image-private.h \ | ||||
image/codec/gdiplus-image.cpp \ | image/codec/gdiplus-image.cpp \ | ||||
@@ -89,12 +89,12 @@ static inline int isnan(float f) | |||||
#include <lol/math/geometry.h> | #include <lol/math/geometry.h> | ||||
#include <lol/sys/init.h> | #include <lol/sys/init.h> | ||||
#include <lol/sys/thread.h> | |||||
#include <lol/image/color.h> | #include <lol/image/color.h> | ||||
#include "numeric.h" | #include "numeric.h" | ||||
#include "timer.h" | #include "timer.h" | ||||
#include "thread/thread.h" | |||||
// Static classes | // Static classes | ||||
#include "log.h" | #include "log.h" | ||||
@@ -19,7 +19,7 @@ | |||||
#if defined __CELLOS_LV2__ | #if defined __CELLOS_LV2__ | ||||
# include "platform/ps3/threadbase.h" | # include "platform/ps3/threadbase.h" | ||||
#else | #else | ||||
# include "threadbase.h" | |||||
# include "sys/threadbase.h" | |||||
#endif | #endif | ||||
namespace lol | namespace lol |
@@ -599,6 +599,8 @@ | |||||
<ClInclude Include="lol\math\real.h" /> | <ClInclude Include="lol\math\real.h" /> | ||||
<ClInclude Include="lol\math\remez.h" /> | <ClInclude Include="lol\math\remez.h" /> | ||||
<ClInclude Include="lol\math\vector.h" /> | <ClInclude Include="lol\math\vector.h" /> | ||||
<ClInclude Include="lol\sys\init.h" /> | |||||
<ClInclude Include="lol\sys\thread.h" /> | |||||
<ClInclude Include="lol\unit.h" /> | <ClInclude Include="lol\unit.h" /> | ||||
<ClInclude Include="mesh\mesh.h" /> | <ClInclude Include="mesh\mesh.h" /> | ||||
<ClInclude Include="map.h" /> | <ClInclude Include="map.h" /> | ||||
@@ -618,9 +620,9 @@ | |||||
<ClInclude Include="scene.h" /> | <ClInclude Include="scene.h" /> | ||||
<ClInclude Include="simd.h" /> | <ClInclude Include="simd.h" /> | ||||
<ClInclude Include="sprite.h" /> | <ClInclude Include="sprite.h" /> | ||||
<ClInclude Include="sys\threadbase.h" /> | |||||
<ClInclude Include="sys\init.cpp" /> | |||||
<ClInclude Include="text.h" /> | <ClInclude Include="text.h" /> | ||||
<ClInclude Include="thread\thread.h" /> | |||||
<ClInclude Include="thread\threadbase.h" /> | |||||
<ClInclude Include="ticker.h" /> | <ClInclude Include="ticker.h" /> | ||||
<ClInclude Include="tiler.h" /> | <ClInclude Include="tiler.h" /> | ||||
<ClInclude Include="tileset.h" /> | <ClInclude Include="tileset.h" /> | ||||
@@ -647,4 +649,4 @@ | |||||
<ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
<Import Project="$(SolutionDir)\Lol.Fx.targets" /> | <Import Project="$(SolutionDir)\Lol.Fx.targets" /> | ||||
</ImportGroup> | </ImportGroup> | ||||
</Project> | |||||
</Project> |