Merge branch 'master' into master

This commit is contained in:
phaneron 2024-02-11 17:19:07 -05:00 committed by GitHub
commit 2ff05376e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2114 changed files with 753471 additions and 140 deletions

12
vendor/CMakeLists.txt vendored
View file

@ -2,6 +2,16 @@ add_subdirectory(freetype-2.0.9)
add_subdirectory(lua-5.1.3)
add_subdirectory(stormlib-9)
if (WHOA_SYSTEM_WIN OR WHOA_SYSTEM_LINUX)
set(SDL_SHARED OFF)
set(SDL_STATIC ON)
add_subdirectory(sdl-3.0.0)
set(glew-cmake_BUILD_SHARED OFF)
set(glew-cmake_BUILD_STATIC ON)
add_subdirectory(glew-cmake-2.2.0)
endif()
# FMOD
add_library(fmod SHARED IMPORTED GLOBAL)
@ -114,4 +124,4 @@ elseif(WHOA_SYSTEM_MAC)
)
install(FILES ${FMOD_DIR}/mac/lib/libfmod.dylib DESTINATION "bin")
endif()
endif()
endif()