Skip to content

Commit 483e374

Browse files
committedApr 1, 2021
Moves miles and bink stubs to new deps directory.
1 parent cd57113 commit 483e374

10 files changed

+6
-5
lines changed
 

‎CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@ if(NOT STANDALONE)
151151
add_subdirectory(deps/launcher)
152152
endif()
153153

154+
# Build miles and bink stubs if we don't have an alternative.
155+
if(NOT OPENAL_FOUND AND NOT FFMPEG_FOUND)
156+
add_subdirectory(deps/bink EXCLUDE_FROM_ALL)
157+
add_subdirectory(deps/miles EXCLUDE_FROM_ALL)
158+
endif()
159+
154160
# Build Thyme
155161
add_subdirectory(src)
156162

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

‎src/CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,6 @@ add_subdirectory(libs/captnlog EXCLUDE_FROM_ALL)
386386
# Gather needed link libraries and compile defintions
387387
list(APPEND GAME_LINK_LIBRARIES base captnlog)
388388

389-
if(NOT OPENAL_FOUND AND NOT FFMPEG_FOUND)
390-
add_subdirectory(libs/bink EXCLUDE_FROM_ALL)
391-
add_subdirectory(libs/miles EXCLUDE_FROM_ALL)
392-
endif()
393-
394389
if(USE_GAMEMATH)
395390
add_subdirectory(libs/gamemath EXCLUDE_FROM_ALL)
396391
list(APPEND GAME_LINK_LIBRARIES gamemath_static_lib)

0 commit comments

Comments
 (0)
Please sign in to comment.