Update JGL

CMakeLists.txt

@@ -21,49 +21,38 @@ include(cmake/CPM.cmake)
 
 CPMAddPackage(
         NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Release-1.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Release-6.zip
 )
 
 CPMAddPackage(
         NAME ReWindow
-        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.23.zip
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.30.zip
 )
 
 CPMAddPackage(
         NAME GLAD
         URL https://git.redacted.cc/Redacted/glad/archive/v2.1.zip
 )
-
-
-CPMAddPackage(
-        NAME LearnOpenGL
-        URL https://git.redacted.cc/josh/LearnOpenGL/archive/Prerelease-4.zip
-)
-
+file(COPY "assets" DESTINATION "${PROJECT_BINARY_DIR}")
 file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
 file(GLOB_RECURSE SOURCES "src/*.c"     "src/*.cpp"    )
-file(GLOB_RECURSE ASSETS  "content/*")
+file(GLOB_RECURSE ASSETS  "assets/*")
 
 add_library(JGL SHARED ${SOURCES})
 set_target_properties(JGL PROPERTIES LINKER_LANGUAGE CXX)
 
 find_package(OpenGL REQUIRED)
-find_package(GLUT REQUIRED)
 find_package(Freetype REQUIRED)
 
 add_executable(JGL_Demo main.cpp)
 set_target_properties(JGL_Demo PROPERTIES LINK_FLAGS "-Wl,-rpath,./lib")
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${OPENGL_INCLUDE_DIRS})
-include_directories(${GLUT_INCLUDE_DIRS})
 include_directories(${J3ML_SOURCE_DIR}/include)
 include_directories(${ReWindow_SOURCE_DIR}/include)
 include_directories(${glad_SOURCE_DIR}/include)
 
-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_include_directories(JGL PRIVATE ${FREETYPE_INCLUDE_DIRS})
-target_link_libraries(JGL_Demo PUBLIC JGL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} J3ML ReWindowLibrary GLEW glad)
+target_link_libraries(JGL_Demo PUBLIC JGL ${OPENGL_LIBRARIES} J3ML ReWindowLibrary glad)