Warwick/game
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deleted unused fast noise and added method of installing newer assimp

Browse source 
Moving away from PCG to try to get this project done. Also fed up with
manually packaging a newer version of Assimp for every machine I want to
build this software on.
This commit is contained in:
Warwick 2023-03-21 15:23:05 +00:00
parent 5c135950e0
commit 517f8b2d6c
4 changed files with 64 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -4,10 +4,13 @@
CMakeCache.txt
CMakeFiles/
bin/
Game
lib/
Makefile
cmake_install.cmake
compile_commands.json
# ignore CPM package manager file
cmake/CPM*.cmake
# FastNoise2 extra build files
CPM_modules/
NoiseTool.ini

4
.gitmodules vendored
View file

@ -1,7 +1,3 @@
[submodule "data/game-models"]
path = data/game-models
url = https://git.warwicknew.xyz/game-models/
[submodule "deps/FastNoise2"]
path = deps/FastNoise2
url = https://github.com/Auburn/FastNoise2.git
branch = 1001d76

69
CMakeLists.txt
View file

@ -27,15 +27,68 @@ find_package(GLEW REQUIRED)
find_package(GLM REQUIRED)
# Model loading
find_package(assimp REQUIRED)
if (assimp_VERSION VERSION_LESS "5.1")
message(FATAL_ERROR "Assimp ${assimp_VERSION} out of date, Assimp 5.1.0 or newer is required!")
#find_package(assimp REQUIRED)
#if (assimp_VERSION VERSION_LESS "5.1")
# message(FATAL_ERROR "Assimp ${assimp_VERSION} out of date, Assimp 5.1.0 or newer is required!")
#endif()
set(CPM_DOWNLOAD_VERSION 0.38.1)
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
message(STATUS "Downloading CPM.cmake")
file(DOWNLOAD
https://github.com/TheLartians/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
${CPM_DOWNLOAD_LOCATION}
)
endif()
include(${CPM_DOWNLOAD_LOCATION})
set(CPM_USE_LOCAL_PACKAGES ON)
#CPMAddPackage(
# NAME SDL2_image
# VERSION 2.0.5
# URL https://libsdl.org/projects/old/SDL_image/release/SDL2_image-2.0.5.zip
#)
#CPMAddPackage(
# NAME SDL2
# VERSION 2.0.12
# URL https://libsdl.org/release/SDL2-2.0.12.zip
#)
#if (SDL2_ADDED)
# add_library(SDL2::SDL2 ALIAS SDL2)
#endif()
#CPMAddPackage(
# NAME GLM
# VERSION 0.9.9.8
# GITHUB_REPOSITORY "g-truc/glm"
# GIT_TAG "0.9.9.8"
#)
#
#
#CPMAddPackage(
# NAME GLEW
# VERSION 2.2.0
# GITHUB_REPOSITORY "nigels-com/glew"
# GIT_TAG "glew-2.2.0"
#)
CPMAddPackage(
NAME assimp
VERSION 5.2.5
GITHUB_REPOSITORY "assimp/assimp"
GIT_TAG "v5.2.5"
)
# Build FastNoise2 Library
set(FASTNOISE2_NOISETOOL ON CACHE BOOL "Build Noise Tool" FORCE)
set(BUILD_SHARED_LIBS ON CACHE BOOL "Build Noise Tool Dynamic Library" FORCE)
add_subdirectory(deps/FastNoise2)
#set(FASTNOISE2_NOISETOOL ON CACHE BOOL "Build Noise Tool" FORCE)
#set(BUILD_SHARED_LIBS ON CACHE BOOL "Build Noise Tool Dynamic Library" FORCE)
##add_subdirectory(deps/FastNoise2)
#CPMAddPackage(
# NAME FastNoise2
# VERSION 0.9.7
# GITHUB_REPOSITORY "Auburn/FastNoise2"
# GIT_TAG "v0.9.2-alpha"
#)
include_directories(
${SDL2_INCLUDE_DIRS}
@ -51,5 +104,5 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
${SDL2_IMAGE_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${ASSIMP_LIBRARIES}
FastNoise)
assimp::assimp
)

1
deps/FastNoise2 vendored

@ -1 +0,0 @@
Subproject commit 73c6e582052275cd073ebae7790f8874b9c194ba