Remove SDL2_TTF
This commit is contained in:
pentarctagon
Charles Dang
parent
8fc49bdce1
commit
3343a9451a
7 changed files with 2 additions and 140 deletions
|
|
@ -468,7 +468,6 @@ endif(ENABLE_GAME OR ENABLE_TESTS)
|
|||
|
||||
if(ENABLE_GAME OR ENABLE_TESTS)
|
||||
find_package( SDL2_mixer 2.0.0 REQUIRED )
|
||||
find_package( SDL2_ttf 2.0.12 REQUIRED )
|
||||
find_package(VorbisFile REQUIRED)
|
||||
find_package( PkgConfig REQUIRED )
|
||||
pkg_check_modules( CAIRO REQUIRED cairo>=1.10 )
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ order to build Wesnoth:
|
|||
* SDL2 >= 2.0.4
|
||||
* SDL2_image >= 2.0.0 (with PNG and JPEG support)
|
||||
* SDL2_mixer >= 2.0.0 (with Ogg Vorbis support)
|
||||
* SDL2_ttf >= 2.0.12
|
||||
* Fontconfig >= 2.4.1
|
||||
* Cairo >= 1.10.0
|
||||
* Pango >= 1.22.0 (with Cairo backend)
|
||||
|
|
|
|||
|
|
@ -355,7 +355,6 @@ if env["prereqs"]:
|
|||
def have_sdl_other():
|
||||
return \
|
||||
conf.CheckSDL(require_version = '2.0.4') & \
|
||||
conf.CheckSDL("SDL2_ttf", header_file = "SDL_ttf") & \
|
||||
conf.CheckSDL("SDL2_mixer", header_file = "SDL_mixer") & \
|
||||
conf.CheckSDL("SDL2_image", header_file = "SDL_image")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,130 +0,0 @@
|
|||
#.rst:
|
||||
# FindSDL2_ttf
|
||||
# -----------
|
||||
#
|
||||
# Locate SDL2_ttf library
|
||||
#
|
||||
# This module defines:
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# SDL2_TTF_LIBRARIES, the name of the library to link against
|
||||
# SDL2_TTF_INCLUDE_DIRS, where to find the headers
|
||||
# SDL2_TTF_FOUND, if false, do not try to link against
|
||||
# SDL2_TTF_VERSION_STRING - human-readable string containing the version of SDL2_ttf
|
||||
#
|
||||
#
|
||||
#
|
||||
# For backward compatiblity the following variables are also set:
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# SDL2TTF_LIBRARY (same value as SDL2_TTF_LIBRARIES)
|
||||
# SDL2TTF_INCLUDE_DIR (same value as SDL2_TTF_INCLUDE_DIRS)
|
||||
# SDL2TTF_FOUND (same value as SDL2_TTF_FOUND)
|
||||
#
|
||||
#
|
||||
#
|
||||
# $SDL2DIR is an environment variable that would correspond to the
|
||||
# ./configure --prefix=$SDL2DIR used in building SDL2.
|
||||
#
|
||||
# Created by Andreas Löf. This was influenced by the FindSDL_ttf.cmake
|
||||
# module, but with modifications to use SDL2.
|
||||
#
|
||||
#=============================================================================
|
||||
# Copyright 2005-2009 Kitware, Inc.
|
||||
# Copyright 2012 Benjamin Eikel
|
||||
# Copyright 2015 Andreas Löf
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# * Neither the names of Kitware, Inc., the Insight Software Consortium,
|
||||
# nor the names of their contributors may be used to endorse or promote
|
||||
# products derived from this software without specific prior written
|
||||
# permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
#=============================================================================
|
||||
|
||||
if(NOT SDL2_TTF_INCLUDE_DIR AND SDL2TTF_INCLUDE_DIR)
|
||||
set(SDL2_TTF_INCLUDE_DIR ${SDL2TTF_INCLUDE_DIR} CACHE PATH "directory cache
|
||||
entry initialized from old variable name")
|
||||
endif()
|
||||
find_path(SDL2_TTF_INCLUDE_DIR SDL_ttf.h
|
||||
HINTS
|
||||
ENV SDL2TTFDIR
|
||||
ENV SDL2DIR
|
||||
PATH_SUFFIXES SDL2
|
||||
# path suffixes to search inside ENV{SDL2DIR}
|
||||
include/SDL2 include/SDL12 include/SDL11 include
|
||||
)
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(VC_LIB_PATH_SUFFIX lib/x64)
|
||||
else()
|
||||
set(VC_LIB_PATH_SUFFIX lib/x86)
|
||||
endif()
|
||||
|
||||
if(NOT SDL2_TTF_LIBRARY AND SDL2TTF_LIBRARY)
|
||||
set(SDL2_TTF_LIBRARY ${SDL2TTF_LIBRARY} CACHE FILEPATH "file cache entry
|
||||
initialized from old variable name")
|
||||
endif()
|
||||
find_library(SDL2_TTF_LIBRARY
|
||||
NAMES SDL2_ttf
|
||||
HINTS
|
||||
ENV SDL2TTFDIR
|
||||
ENV SDL2DIR
|
||||
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
|
||||
)
|
||||
|
||||
if(SDL2_TTF_INCLUDE_DIR AND EXISTS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h")
|
||||
file(STRINGS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h" SDL_TTF_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_TTF_MAJOR_VERSION[ \t]+[0-9]+$")
|
||||
file(STRINGS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h" SDL_TTF_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_TTF_MINOR_VERSION[ \t]+[0-9]+$")
|
||||
file(STRINGS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h" SDL_TTF_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_TTF_PATCHLEVEL[ \t]+[0-9]+$")
|
||||
string(REGEX REPLACE "^#define[ \t]+SDL_TTF_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_TTF_VERSION_MAJOR "${SDL_TTF_VERSION_MAJOR_LINE}")
|
||||
string(REGEX REPLACE "^#define[ \t]+SDL_TTF_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_TTF_VERSION_MINOR "${SDL_TTF_VERSION_MINOR_LINE}")
|
||||
string(REGEX REPLACE "^#define[ \t]+SDL_TTF_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL_TTF_VERSION_PATCH "${SDL_TTF_VERSION_PATCH_LINE}")
|
||||
set(SDL2_TTF_VERSION_STRING ${SDL_TTF_VERSION_MAJOR}.${SDL_TTF_VERSION_MINOR}.${SDL_TTF_VERSION_PATCH})
|
||||
unset(SDL_TTF_VERSION_MAJOR_LINE)
|
||||
unset(SDL_TTF_VERSION_MINOR_LINE)
|
||||
unset(SDL_TTF_VERSION_PATCH_LINE)
|
||||
unset(SDL_TTF_VERSION_MAJOR)
|
||||
unset(SDL_TTF_VERSION_MINOR)
|
||||
unset(SDL_TTF_VERSION_PATCH)
|
||||
endif()
|
||||
|
||||
set(SDL2_TTF_LIBRARIES ${SDL2_TTF_LIBRARY})
|
||||
set(SDL2_TTF_INCLUDE_DIRS ${SDL2_TTF_INCLUDE_DIR})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_ttf
|
||||
REQUIRED_VARS SDL2_TTF_LIBRARIES SDL2_TTF_INCLUDE_DIRS
|
||||
VERSION_VAR SDL2_TTF_VERSION_STRING)
|
||||
|
||||
# for backward compatiblity
|
||||
set(SDL2TTF_LIBRARY ${SDL2_TTF_LIBRARIES})
|
||||
set(SDL2TTF_INCLUDE_DIR ${SDL2_TTF_INCLUDE_DIRS})
|
||||
set(SDL2TTF_FOUND ${SDL2_TTF_FOUND})
|
||||
|
||||
mark_as_advanced(SDL2_TTF_LIBRARY SDL2_TTF_INCLUDE_DIR)
|
||||
|
|
@ -8,7 +8,7 @@ RUN apt install -y -qq apt-utils
|
|||
RUN apt install -y -qq libboost-filesystem1.58-dev libboost-filesystem1.58.0 libboost-iostreams1.58-dev libboost-iostreams1.58.0 libboost-locale1.58-dev libboost-locale1.58.0 libboost-regex1.58-dev libboost-regex1.58.0 libboost-serialization1.58-dev libboost-serialization1.58.0 libasio-dev libboost-program-options1.58-dev libboost-program-options1.58.0 libboost-random1.58-dev libboost-random1.58.0 libboost-system1.58-dev libboost-system1.58.0 libboost-thread1.58-dev libboost-thread1.58.0 libboost-test-dev
|
||||
|
||||
# SDL
|
||||
RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev libsdl2-mixer-2.0-0 libsdl2-mixer-dev libsdl2-ttf-2.0-0 libsdl2-ttf-dev
|
||||
RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev libsdl2-mixer-2.0-0 libsdl2-mixer-dev
|
||||
|
||||
# misc
|
||||
RUN apt install -y -qq libpng12-0 libpng12-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev
|
||||
|
|
|
|||
|
|
@ -32,10 +32,6 @@ if(SDL2MIXER_INCLUDE_DIR)
|
|||
include_directories(SYSTEM ${SDL2MIXER_INCLUDE_DIR} )
|
||||
set(sdl_mixer-lib ${SDL2_MIXER_LIBRARY})
|
||||
endif()
|
||||
if(SDL2TTF_INCLUDE_DIR)
|
||||
include_directories(SYSTEM ${SDL2TTF_INCLUDE_DIR} )
|
||||
set(sdl_ttf-lib ${SDL2_TTF_LIBRARY})
|
||||
endif()
|
||||
|
||||
if(ZLIB_INCLUDE_DIR)
|
||||
include_directories(SYSTEM ${ZLIB_INCLUDE_DIR} )
|
||||
|
|
@ -77,7 +73,6 @@ set(game-external-libs
|
|||
${Boost_THREAD_LIBRARY}
|
||||
${sdl_image-lib}
|
||||
${sdl_mixer-lib}
|
||||
${sdl_ttf-lib}
|
||||
${PANGOCAIRO_LIBRARIES}
|
||||
${FONTCONFIG_LIBRARIES}
|
||||
${LIBDBUS_LIBRARIES}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
|||
brew install ccache
|
||||
travis_wait ./projectfiles/Xcode/Fix_Xcode_Dependencies
|
||||
else
|
||||
brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer openssl
|
||||
brew install scons cairo pango moreutils sdl2_image sdl2_mixer openssl
|
||||
export CXXFLAGS="-I/usr/local/opt/openssl/include $CFLAGS"
|
||||
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue