Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CMakeLists.txt

CMakeLists.txt

@@ -26,7 +26,7 @@ CPMAddPackage(
 
 CPMAddPackage(
         NAME ReWindow
-        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.18.zip
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.19.zip
 )
 
 CPMAddPackage(
@@ -47,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)
@@ -73,7 +73,5 @@ 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)