Implement LearnOpenGL::Shader

CMakeLists.txt

@@ -21,25 +21,43 @@ include(cmake/CPM.cmake)
 
 CPMAddPackage(
         NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-7.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-17.zip
+)
+
+CPMAddPackage(
+        NAME ReWindow
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.12.zip
+)
+
+CPMAddPackage(
+        NAME GLAD
+        URL https://git.redacted.cc/Redacted/glad/archive/v2.1.zip
 )
 
 file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
 file(GLOB_RECURSE SOURCES "src/*.c"     "src/*.cpp"    )
-file(GLOB_RECURSE ASSETS  "assets/*")
+file(GLOB_RECURSE ASSETS  "content/*")
 
 add_library(JGL SHARED ${SOURCES}
         include/JGL/JGL.h
-        src/JGL/JGL.cpp)
+        src/JGL/JGL.cpp
+        include/LearnOpenGL/Shader.h
+        src/LearnOpenGL/Shader.cpp)
 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
-${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS}
-        ${J3ML_SOURCE_DIR}/include)
+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_link_libraries(JGL_Demo PUBLIC JGL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} J3ML)
+target_link_libraries(JGL_Demo PRIVATE ${FREETYPE_LIBRARIES})
+target_include_directories(JGL_Demo PRIVATE ${FREETYPE_INCLUDE_DIRS})
+target_link_libraries(JGL_Demo PUBLIC JGL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} J3ML ReWindowLibrary GLEW glad)