diff --git a/lib/vectorwrapper b/lib/vectorwrapper index 33bc1e7..34e5775 160000 --- a/lib/vectorwrapper +++ b/lib/vectorwrapper @@ -1 +1 @@ -Subproject commit 33bc1e73da50669c3e5bdef130079847a74372d4 +Subproject commit 34e5775972cfe3ba66e5cdf75172bdeed4777d16 diff --git a/src/cloonelgraphics/CMakeLists.txt b/src/cloonelgraphics/CMakeLists.txt index bcd9738..dfb7c54 100644 --- a/src/cloonelgraphics/CMakeLists.txt +++ b/src/cloonelgraphics/CMakeLists.txt @@ -21,7 +21,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PNG_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${PHYSFS_INCLUDE_DIR} - PUBLIC ../../lib/vectorwrapper/include + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vectorwrapper_include PUBLIC ../../lib/tree-3.1/src ) diff --git a/src/cloonelgraphics/vectorwrapper_include/cloonel_vectorwrapper b/src/cloonelgraphics/vectorwrapper_include/cloonel_vectorwrapper new file mode 120000 index 0000000..b159702 --- /dev/null +++ b/src/cloonelgraphics/vectorwrapper_include/cloonel_vectorwrapper @@ -0,0 +1 @@ +../../../lib/vectorwrapper/include/vectorwrapper-1.0 \ No newline at end of file diff --git a/src/cloonelgraphics/vectypes.hpp b/src/cloonelgraphics/vectypes.hpp index fb68d75..dbd8ab6 100644 --- a/src/cloonelgraphics/vectypes.hpp +++ b/src/cloonelgraphics/vectypes.hpp @@ -27,8 +27,8 @@ #endif #define VWR_OUTER_NAMESPACE cloonel -#include "vectorwrapper-1.0/vectorwrapper.hpp" -#include "vectorwrapper-1.0/vector_cast.hpp" +#include "cloonel_vectorwrapper/vectorwrapper.hpp" +#include "cloonel_vectorwrapper/vector_cast.hpp" #include "compatibility.h" #include #include diff --git a/src/jumping/collider.cpp b/src/jumping/collider.cpp index 120d46f..a56f089 100644 --- a/src/jumping/collider.cpp +++ b/src/jumping/collider.cpp @@ -22,7 +22,7 @@ #include "line.hpp" #include "vectypes.hpp" #include "collisionbarset.hpp" -#include "vectorwrapper/vectorops.hpp" +#include "cloonel_vectorwrapper/vectorops.hpp" #include "vectormath.hpp" #include #include diff --git a/src/jumping/line.hpp b/src/jumping/line.hpp index 5b4e522..d24be64 100644 --- a/src/jumping/line.hpp +++ b/src/jumping/line.hpp @@ -22,7 +22,7 @@ #include "compatibility.h" #include "vectypes.hpp" -#include "vectorwrapper/vectorops.hpp" +#include "cloonel_vectorwrapper/vectorops.hpp" #include #include