josh/JGL
1
0
Fork 1
Code Issues 14 Pull Requests Actions Packages Projects Releases 58 Wiki Activity

Migrating dependencies to latest releases

Browse Source
This commit is contained in:
josh
2024-05-01 20:30:21 -04:00
parent c45485cabd
commit 1eaa9c6574
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -21,12 +21,12 @@ include(cmake/CPM.cmake)
CPMAddPackage(
NAME J3ML
URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-18.zip
URL https://git.redacted.cc/josh/j3ml/archive/Release-1.zip
)
CPMAddPackage(
NAME ReWindow
URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.19.zip
URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.23.zip
)
CPMAddPackage(
@@ -37,22 +37,14 @@ CPMAddPackage(
CPMAddPackage(
NAME LearnOpenGL
URL https://git.redacted.cc/josh/LearnOpenGL/archive/Prerelease-2.zip
URL https://git.redacted.cc/josh/LearnOpenGL/archive/Prerelease-4.zip
)
file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
file(GLOB_RECURSE SOURCES "src/*.c" "src/*.cpp" )
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
)
add_library(JGL SHARED ${SOURCES})
set_target_properties(JGL PROPERTIES LINKER_LANGUAGE CXX)
find_package(OpenGL REQUIRED)

1
include/JGL/JGL.h
View File

@@ -54,7 +54,6 @@ namespace JGL {
bool InitTextEngine();
// TODO: implement correct coloring
using J3ML::u32;
namespace J2D {
void DrawPixel2D(const Color3 &color, const Vector2 &coordinates);