This commit is contained in:
2024-01-30 04:33:44 -05:00
parent 7432b6ff40
commit 0606b866d5
2 changed files with 16 additions and 2 deletions

View File

@@ -69,6 +69,17 @@ CPMAddPackage(
NAME glad
URL https://git.redacted.cc/Redacted/glad/archive/v2.1.zip
)
CPMAddPackage(
NAME archive
URL https://git.redacted.cc/Redacted/archive/archive/v1.0.zip
)
#https://github.com/assimp/assimp/blob/master/LICENSE
CPMAddPackage(
NAME ASSIMP
URL https://github.com/assimp/assimp/archive/refs/tags/v5.3.1.zip
)
add_library(Re3D SHARED ${SOURCES})
# Why god???
set_target_properties(Re3D PROPERTIES LINKER_LANGUAGE CXX)
@@ -87,13 +98,15 @@ include_directories(
${SOIL_SOURCE_DIR}/include
${glad_SOURCE_DIR}/include
${uuid_v4_SOURCE_DIR}/
${ASSIMP_SOURCE_DIR}/include
${archive_SOURCE_DIR}/include
${PROJECT_BINARY_DIR}/glu/include
)
if(UNIX AND NOT APPLE)
target_link_libraries(Re3D_Demo PUBLIC Re3D ReWindowLibrary ReHardwareID J3ML soil uuid_v4 GL glad ${PROJECT_BINARY_DIR}/lib/libGLU.so)
target_link_libraries(Re3D_Demo PUBLIC Re3D ReWindowLibrary ReHardwareID J3ML soil uuid_v4 GL glad assimp archive ${PROJECT_BINARY_DIR}/lib/libGLU.so)
endif()
if(WIN32)
target_link_libraries(Re3D_Demo PUBLIC Re3D ReWindowLibrary ReHardwareID J3ML soil uuid_v4 GL GLU glad)
target_link_libraries(Re3D_Demo PUBLIC Re3D ReWindowLibrary ReHardwareID J3ML soil uuid_v4 GL GLU glad assimp archive)
endif()

View File

@@ -5,6 +5,7 @@
#include <types/entity/camera.h>
#include <types/entity/player.h>
#include <types/entity/skybox.h>
void Render::pre_render() {
// NO
if (engine->frameCount == 0) {