Cataclysm-DDA: update to 0.E.

This commit is contained in:
AN3223 2020-04-12 11:33:52 -05:00 committed by John Zimmermann
parent e7ebf5024e
commit 24061423c6
3 changed files with 34 additions and 23 deletions

View file

@ -0,0 +1,26 @@
From 4d6820b2159e3d2ed0cf365e07b093fa79932f1e Mon Sep 17 00:00:00 2001
From: Jookia <166291@gmail.com>
Date: Thu, 9 Apr 2020 16:08:07 +1000
Subject: [PATCH] CMakeLists: Add -fsigned-char to mimic Makefile
This fixes the build on ARM.
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git CMakeLists.txt CMakeLists.txt
index 095d6e23b20..d0f5e0cc7f3 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -240,9 +240,10 @@ ELSE()
IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
ENDIF()
+ SET(CATA_OTHER_FLAGS "${CATA_OTHER_FLAGS} -fsigned-char")
# Compact the whitespace in the warning string
string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} ${CATA_OTHER_FLAGS}")
SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
ENDIF()

View file

@ -1,10 +0,0 @@
--- lua/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100
+++ - 2019-03-23 04:29:21.852370856 +0100
@@ -4,6 +4,7 @@
SET(CATACLYSM_DDA_LUA_SOURCES
${CMAKE_SOURCE_DIR}/lua/class_definitions.lua
${CMAKE_SOURCE_DIR}/lua/autoexec.lua
+ ${CMAKE_SOURCE_DIR}/lua/log.lua
)
# test chain

View file

@ -1,22 +1,21 @@
# Template file for 'Cataclysm-DDA'
pkgname=Cataclysm-DDA
version=0.D
revision=3
version=0.E
revision=1
build_style=cmake
configure_args="-DRELEASE=1 $(vopt_bool backtrace BACKTRACE) $(vopt_bool lua LUA)
-DUSE_HOME_DIR=1 -DPREFIX=/usr"
configure_args="-DRELEASE=1 $(vopt_bool backtrace BACKTRACE) -DUSE_HOME_DIR=1 -DPREFIX=/usr"
hostmakedepends="gettext pkg-config"
makedepends="$(vopt_if tiles 'SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel') freetype-devel
gettext-devel ncurses-devel $(vopt_if lua lua-devel)"
depends="Cataclysm-DDA-data"
makedepends="$(vopt_if tiles 'SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel freetype-devel')
ncurses-devel"
depends="Cataclysm-DDA-data>=${version}_${revision}"
short_desc="Turn-based survival game set in a post-apocalyptic world"
maintainer="John <johnz@posteo.net>"
license="CC-BY-SA-3.0, CC-BY-3.0"
homepage="https://cataclysmdda.org/"
distfiles="https://github.com/CleverRaven/Cataclysm-DDA/archive/${version}.tar.gz"
checksum=6cc97b3e1e466b8585e8433a6d6010931e9a073f6ec060113161b38052d82882
checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3
build_options="lua tiles backtrace"
build_options="tiles backtrace"
build_options_default="tiles"
case $XBPS_TARGET_MACHINE in
@ -24,10 +23,6 @@ case $XBPS_TARGET_MACHINE in
*) build_options_default+=" backtrace";;
esac
if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" lua"
fi
if [ "$build_option_tiles" ]; then
subpackages="Cataclysm-DDA-tiles-data Cataclysm-DDA-tiles"
post_configure() {