Windows

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18..3.27)
+cmake_minimum_required(VERSION 3.20)
 project(Collage
         VERSION 1.0
         LANGUAGES CXX
@@ -11,7 +11,7 @@ include(cmake/CPM.cmake)
 
 CPMAddPackage(
         NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Release-3.1.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Release-2.2.zip
 )
 
 set(CMAKE_CXX_STANDARD 20)
@@ -38,4 +38,4 @@ add_executable(CollageTest main.cpp)
 set_target_properties(Collage PROPERTIES LINKER_LANGUAGE CXX)
 target_link_libraries(Collage PUBLIC J3ML)
 target_link_libraries(CollageTest PUBLIC Collage)
-set_target_properties(CollageTest PROPERTIES LINKER_LANGUAGE CXX)
+set_target_properties(CollageTest PROPERTIES LINKER_LANGUAGE CXX)

include/Collage/types/bone.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <vector>
-#include <J3ML/LinearAlgebra.hpp>
+#include <J3ML/LinearAlgebra.h>
 class Bone {
 protected:
     std::string name;

include/Collage/types/model.h

@@ -2,9 +2,9 @@
 #include <vector>
 #include <sstream>
 #include <fstream>
-#include <J3ML/LinearAlgebra.hpp>
-#include <J3ML/LinearAlgebra/Vector3.hpp>
-#include<J3ML/Geometry.hpp>
+#include <J3ML/LinearAlgebra.h>
+#include <J3ML/LinearAlgebra/Vector3.h>
+#include<J3ML/Geometry.h>
 #include <Collage/types/textureInfo.h>
 
 typedef Vector3 Vertex;

include/Collage/types/textureInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <vector>
-#include <J3ML/LinearAlgebra.hpp>
+#include <J3ML/LinearAlgebra.h>
 
 struct TextureInformation {
     std::string path;