Added FastNoise2 as a dependency.
This commit is contained in:
parent
f587950771
commit
5c135950e0
5 changed files with 23 additions and 5 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -3,10 +3,16 @@
|
|||
.cmake/
|
||||
CMakeCache.txt
|
||||
CMakeFiles/
|
||||
Game
|
||||
bin/
|
||||
lib/
|
||||
Makefile
|
||||
cmake_install.cmake
|
||||
compile_commands.json
|
||||
# FastNoise2 extra build files
|
||||
CPM_modules/
|
||||
NoiseTool.ini
|
||||
_deps/
|
||||
cpm-package-lock.cmake
|
||||
|
||||
# Ignore Cmake'd files
|
||||
src/helpers/RootDir.h
|
||||
|
|
|
|||
4
.gitmodules
vendored
4
.gitmodules
vendored
|
|
@ -1,3 +1,7 @@
|
|||
[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
|
||||
|
|
|
|||
|
|
@ -19,17 +19,24 @@ link_directories(${CMAKE_SOURCE_DIR}/lib)
|
|||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
|
||||
|
||||
# Generic OpenGL and windowing libraries.
|
||||
find_package(SDL2 REQUIRED)
|
||||
find_package(SDL2_image REQUIRED)
|
||||
find_package(OpenGL REQUIRED)
|
||||
find_package(GLEW REQUIRED)
|
||||
find_package(GLM REQUIRED)
|
||||
find_package(assimp 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!")
|
||||
endif()
|
||||
|
||||
# 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)
|
||||
|
||||
include_directories(
|
||||
${SDL2_INCLUDE_DIRS}
|
||||
${SDL2_IMAGE_DIRS}
|
||||
|
|
@ -39,9 +46,10 @@ include_directories(
|
|||
|
||||
add_executable(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES})
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE
|
||||
${SDL2_LIBRARIES}
|
||||
${SDL2_IMAGE_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
${GLEW_LIBRARIES}
|
||||
${ASSIMP_LIBRARIES})
|
||||
${ASSIMP_LIBRARIES}
|
||||
FastNoise)
|
||||
|
|
|
|||
1
deps/FastNoise2
vendored
Submodule
1
deps/FastNoise2
vendored
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 73c6e582052275cd073ebae7790f8874b9c194ba
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
// Include Config header generated by GNU autotools
|
||||
#include <GL/glew.h>
|
||||
// Make sure Glew is loaded first
|
||||
#include <GL/gl.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue