Migrating Sources to LearnOpenGL

CMakeLists.txt

@@ -26,7 +26,7 @@ CPMAddPackage(
 
 CPMAddPackage(
         NAME ReWindow
-        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.17.zip
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.18.zip
 )
 
 CPMAddPackage(
@@ -34,6 +34,12 @@ CPMAddPackage(
         URL https://git.redacted.cc/Redacted/glad/archive/v2.1.zip
 )
 
+
+CPMAddPackage(
+        NAME LearnOpenGL
+        URL https://git.redacted.cc/josh/LearnOpenGL/archive/Prerelease-2.zip
+)
+
 file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
 file(GLOB_RECURSE SOURCES "src/*.c"     "src/*.cpp"    )
 file(GLOB_RECURSE ASSETS  "content/*")
@@ -41,12 +47,12 @@ file(GLOB_RECURSE ASSETS  "content/*")
 add_library(JGL SHARED ${SOURCES}
         include/JGL/JGL.h
         src/JGL/JGL.cpp
-        include/LearnOpenGL/Shader.h
-        include/LearnOpenGL/Texture2D.h
+
         include/JGL/Color3.h
         include/JGL/Colors.h
         include/JGL/Color4.h
-        )
+)
+
 set_target_properties(JGL PROPERTIES LINKER_LANGUAGE CXX)
 
 find_package(OpenGL REQUIRED)
@@ -62,6 +68,12 @@ include_directories(${J3ML_SOURCE_DIR}/include)
 include_directories(${ReWindow_SOURCE_DIR}/include)
 include_directories(${glad_SOURCE_DIR}/include)
 
-target_link_libraries(JGL PRIVATE ${FREETYPE_LIBRARIES})
+target_include_directories(JGL PUBLIC ${LearnOpenGL_SOURCE_DIR}/include)
+target_link_libraries(JGL PUBLIC LearnOpenGL)
+
 target_include_directories(JGL PRIVATE ${FREETYPE_INCLUDE_DIRS})
+target_link_libraries(JGL PRIVATE ${FREETYPE_LIBRARIES})
+
+
+
 target_link_libraries(JGL_Demo PUBLIC JGL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} J3ML ReWindowLibrary GLEW glad)