Skip to content

Commit

Permalink
Update FastNoise2 to 0.10.0-alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
Zylann committed Jun 3, 2023
1 parent ffcafd9 commit 0b85241
Show file tree
Hide file tree
Showing 27 changed files with 1,217 additions and 848 deletions.
39 changes: 37 additions & 2 deletions thirdparty/fast_noise_2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,48 @@
# CMakeList.txt : CMake project for FastNoise2
cmake_minimum_required(VERSION 3.7.1)

project(FastNoise2 VERSION 0.9.4)
project(FastNoise2 VERSION 0.10.0)
set(CMAKE_CXX_STANDARD 17)

message("FastNoise2 Arch: ${CMAKE_SYSTEM_PROCESSOR}")

if(CMAKE_SYSTEM_PROCESSOR MATCHES armv7)

set(FASTSIMD_COMPILE_ARMV7 true)
set(FASTSIMD_COMPILE_ARM true)
set(FASTSIMD_COMPILE_HAVE_NEON true)

elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)

set(FASTSIMD_COMPILE_AARCH64 true)
set(FASTSIMD_COMPILE_ARM true)
set(FASTSIMD_COMPILE_HAVE_NEON true)

elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm64)

set(FASTSIMD_COMPILE_ARM true)
set(FASTSIMD_COMPILE_HAVE_NEON true)

elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)

set(FASTSIMD_COMPILE_ARM true)

endif()


# determine whether this is a standalone project or included by other projects
if (NOT DEFINED FASTNOISE2_STANDALONE_PROJECT)
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(FASTNOISE2_STANDALONE_PROJECT ON)
else()
set(FASTNOISE2_STANDALONE_PROJECT OFF)
endif ()
endif()

# Build DLL
#set(BUILD_SHARED_LIBS ON)

option(FASTNOISE2_NOISETOOL "Build NoiseTool application" ON)
option(FASTNOISE2_NOISETOOL "Build NoiseTool application" ${FASTNOISE2_STANDALONE_PROJECT})
option(FASTNOISE2_TESTS "Build tests" OFF)

if(MSVC)
Expand Down
88 changes: 88 additions & 0 deletions thirdparty/fast_noise_2/CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"version": 3,
"configurePresets": [
{
"name": "noisetool",
"displayName": "NoiseTool",
"generator": "Ninja Multi-Config",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CPM_SOURCE_CACHE": {
"value": "${sourceDir}/out/cpm-cache",
"type": "PATH"
},
"BUILD_SHARED_LIBS": {
"value": "True",
"type": "BOOL"
}
}
},
{
"name": "minimal",
"displayName": "Minimal",
"inherits": "noisetool",
"cacheVariables": {
"FASTNOISE2_NOISETOOL": {
"value": "False",
"type": "BOOL"
},
"FASTNOISE2_TESTS": {
"value": "False",
"type": "BOOL"
}
}
},
{
"name": "all",
"displayName": "All",
"inherits": "noisetool",
"cacheVariables": {
"FASTNOISE2_NOISETOOL": {
"value": "True",
"type": "BOOL"
},
"FASTNOISE2_TESTS": {
"value": "True",
"type": "BOOL"
}
}
}
],
"buildPresets": [
{
"name": "noisetool-debug",
"displayName": "NoiseTool Debug",
"configurePreset": "noisetool"
},
{
"name": "noisetool-release",
"displayName": "NoiseTool Release",
"configurePreset": "noisetool",
"configuration": "Release"
},
{
"name": "minimal-debug",
"displayName": "Minimal Debug",
"configurePreset": "minimal"
},
{
"name": "minimal-release",
"displayName": "Minimal Release",
"configurePreset": "minimal",
"configuration": "Release"
},
{
"name": "all-debug",
"displayName": "All Debug",
"configurePreset": "all",
"configuration": "Debug"
},
{
"name": "all-release",
"displayName": "All Release",
"configurePreset": "all",
"configuration": "Release"
}
]
}
Loading

0 comments on commit 0b85241

Please sign in to comment.