mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2025-12-11 01:52:32 +01:00
Add CMake target not using RCT2, use it for linux64 job
This commit is contained in:
@@ -48,7 +48,7 @@ matrix:
|
||||
- zip -r openrct2-osx.zip OpenRCT2.app
|
||||
- if [[ "z$OPENRCT2_ORG_TOKEN" != "z" && ("${TRAVIS_BRANCH}" =~ ^(develop|push/) || "z${TRAVIS_TAG}" != "z") ]] ; then curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=OpenRCT2-${OPENRCT2_VERSION}-${TRAVIS_BRANCH}-${TRAVIS_COMMIT:0:7}-osx.zip" --form "version=${OPENRCT2_VERSION}" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$TRAVIS_BRANCH" --form "flavourId=3" --form "file=@openrct2-osx.zip" "https://openrct2.org/altapi/?command=push-build"; else curl --progress-bar --upload-file openrct2-osx.zip https://transfer.sh/openrct2-osx.zip -o link && cat link; fi
|
||||
- os: linux
|
||||
env: OPENRCT2_CMAKE_OPTS="-DFORCE64=ON" TARGET=linux64
|
||||
env: OPENRCT2_CMAKE_OPTS="-DFORCE64=ON -DDISABLE_RCT2=ON" TARGET=linux64
|
||||
# Following entries used to be included in testing, but they only proved useful while changing things in CMake setup.
|
||||
# They are meant to be used when there are changes to CMakeLists.txt
|
||||
# - os: linux
|
||||
|
||||
@@ -44,6 +44,7 @@ option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
|
||||
option(STATIC "Create a static build.")
|
||||
option(FORCE64 "Force native (x86-64) build. Do not use, for experimental purposes only.")
|
||||
option(DISABLE_OPENGL "Disable OpenGL support.")
|
||||
option(DISABLE_RCT2 "WIP: Try building without using code and data segments from vanilla.")
|
||||
|
||||
if (FORCE64)
|
||||
set(TARGET_M "-m64")
|
||||
@@ -74,6 +75,10 @@ else (DISABLE_NETWORK)
|
||||
PKG_CHECK_MODULES(SSL REQUIRED openssl>=1.0.0)
|
||||
endif (DISABLE_NETWORK)
|
||||
|
||||
if (DISABLE_RCT2)
|
||||
add_definitions(-DNO_RCT2)
|
||||
endif (DISABLE_RCT2)
|
||||
|
||||
# Start of library checks
|
||||
|
||||
PKG_CHECK_MODULES(PNG libpng>=1.6)
|
||||
|
||||
Reference in New Issue
Block a user