mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 17:49:43 +01:00
Make PhysFS RWops work with -DBUNDLE_DEPENDENCIES=OFF
The RWops stuff isn't a part of any standard PhysFS package (and given that it explicitly wraps around SDL I'm not sure how you _would_ package it). So we need to get the physfsrwops.h include in if BUNDLE_DEPENDENCIES is off, otherwise this results in a compile-time include-not-found failure. Additionally, I've placed the PhysFS RWops stuff in their own extras/ folder, so none of the other PhysFS stuff gets included in a -DBUNDLE_DEPENDENCIES=OFF build.
This commit is contained in:
parent
342dfcb48d
commit
146678aac4
3 changed files with 3 additions and 1 deletions
|
@ -113,7 +113,7 @@ set(VVV_SRC
|
||||||
src/Network.c
|
src/Network.c
|
||||||
src/ThirdPartyDeps.c
|
src/ThirdPartyDeps.c
|
||||||
src/Xoshiro.c
|
src/Xoshiro.c
|
||||||
../third_party/physfs/physfsrwops.c
|
../third_party/physfs/extras/physfsrwops.c
|
||||||
)
|
)
|
||||||
if(NOT CUSTOM_LEVEL_SUPPORT STREQUAL "DISABLED")
|
if(NOT CUSTOM_LEVEL_SUPPORT STREQUAL "DISABLED")
|
||||||
list(APPEND VVV_SRC src/editor.cpp)
|
list(APPEND VVV_SRC src/editor.cpp)
|
||||||
|
@ -139,6 +139,7 @@ if(BUNDLE_DEPENDENCIES)
|
||||||
src
|
src
|
||||||
../third_party/tinyxml2
|
../third_party/tinyxml2
|
||||||
../third_party/physfs
|
../third_party/physfs
|
||||||
|
../third_party/physfs/extras
|
||||||
../third_party/lodepng
|
../third_party/lodepng
|
||||||
../third_party/utfcpp/source
|
../third_party/utfcpp/source
|
||||||
)
|
)
|
||||||
|
@ -147,6 +148,7 @@ else()
|
||||||
VVVVVV PRIVATE
|
VVVVVV PRIVATE
|
||||||
src
|
src
|
||||||
../third_party/lodepng
|
../third_party/lodepng
|
||||||
|
../third_party/physfs/extras
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue