ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to unused library dependencies

Browse Source
This commit is contained in:
Benau 2020-12-04 12:02:27 +08:00
parent 5500b4dcc9
commit dbee027949
11 changed files with 18 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -80,7 +80,6 @@ lib/libjpeg
lib/zlib lib/zlib
lib/openal lib/openal
lib/openssl lib/openssl
lib/fribidi
lib/harfbuzz lib/harfbuzz
lib/sdl2 lib/sdl2

8
.travis.yml
View File

@ -33,16 +33,12 @@ addons:
- libcurl4-gnutls-dev - libcurl4-gnutls-dev
- libfreetype6-dev - libfreetype6-dev
- libharfbuzz-dev - libharfbuzz-dev
- libfribidi-dev
- libgl1-mesa-dev
- libjpeg-dev - libjpeg-dev
- libogg-dev - libogg-dev
- libopenal-dev - libopenal-dev
- libpng-dev - libpng-dev
- libsdl2-dev - libsdl2-dev
- libvorbis-dev - libvorbis-dev
- libxrandr-dev
- mesa-common-dev
- pkg-config - pkg-config
- zlib1g-dev - zlib1g-dev
@ -50,11 +46,11 @@ before_script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew bundle; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew bundle; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo mkdir -p /usr/local/include/; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo mkdir -p /usr/local/include/; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/:/usr/local/opt/openssl\@1.1/:/usr/local/opt/glew/:/usr/local/opt/fribidi/:/usr/local/opt/harfbuzz/; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/:/usr/local/opt/openssl\@1.1/:/usr/local/opt/harfbuzz/; fi
script: script:
- mkdir "build" - mkdir "build"
- cd "build" - cd "build"
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then /usr/local/opt/cmake/bin/cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DUSE_SYSTEM_GLEW=1 -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then /usr/local/opt/cmake/bin/cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi
- make VERBOSE=1 -j3 - make VERBOSE=1 -j3

2
Brewfile
View File

@ -4,8 +4,6 @@ brew "libvorbis"
brew "openal-soft" brew "openal-soft"
brew "freetype" brew "freetype"
brew "curl" brew "curl"
brew "fribidi"
brew "glew"
brew "harfbuzz" brew "harfbuzz"
brew "libjpeg" brew "libjpeg"
brew "sdl2" brew "sdl2"

1
CMakeLists.txt
View File

@ -201,7 +201,6 @@ else()
set(ENET_LIBRARIES "enet") set(ENET_LIBRARIES "enet")
endif() endif()
# Find system GLEW library or build it if missing
if(NOT SERVER_ONLY) if(NOT SERVER_ONLY)
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_engine") add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_engine")
include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/graphics_engine/include") include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/graphics_engine/include")

47
INSTALL.md
View File

@ -13,13 +13,11 @@ svn co https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets
To build SuperTuxKart from source, you'll need to install the following packages: To build SuperTuxKart from source, you'll need to install the following packages:
* OpenGL (mesa)
* OpenAL (recommended: openal-soft-devel) * OpenAL (recommended: openal-soft-devel)
* Ogg (libogg-dev) * Ogg (libogg-dev)
* Vorbis (libvorbis-dev) * Vorbis (libvorbis-dev)
* Freetype (libfreetype6-dev) * Freetype (libfreetype6-dev)
* Harfbuzz (libharfbuzz-dev) * Harfbuzz (libharfbuzz-dev)
* Fribidi (libfribidi-dev)
* libcurl (libcurl-devel) * libcurl (libcurl-devel)
* libbluetooth (bluez-devel) * libbluetooth (bluez-devel)
* openssl (openssl-dev) * openssl (openssl-dev)
@ -31,13 +29,13 @@ To build SuperTuxKart from source, you'll need to install the following packages
Fedora command: Fedora command:
```bash ```bash
sudo dnf install @development-tools angelscript-devel \ sudo dnf install @development-tools angelscript-devel \
bluez-libs-devel cmake desktop-file-utils SDL2-devel \ bluez-libs-devel cmake desktop-file-utils SDL2-devel \
freealut-devel freeglut-devel freetype-devel fribidi-devel \ freealut-devel freetype-devel \
gcc-c++ git-core libXrandr-devel libcurl-devel libjpeg-turbo-devel \ gcc-c++ git-core libcurl-devel libjpeg-turbo-devel \
libpng-devel libsquish-devel libtool libvorbis-devel mesa-libEGL-devel \ libpng-devel libsquish-devel libtool libvorbis-devel \
mesa-libGLES-devel openal-soft-devel openssl-devel libcurl-devel harfbuzz-devel \ openal-soft-devel openssl-devel libcurl-devel harfbuzz-devel \
fribidi-devel mesa-libGL-devel libogg-devel libGLEW openssl-devel pkgconf \ libogg-devel openssl-devel pkgconf \
wiiuse-devel zlib-devel wiiuse-devel zlib-devel
``` ```
@ -45,27 +43,27 @@ Mageia 6 command:
```bash ```bash
su -c 'urpmi gcc-c++ cmake openssl-devel libcurl-devel freetype-devel harfbuzz-devel \ su -c 'urpmi gcc-c++ cmake openssl-devel libcurl-devel freetype-devel harfbuzz-devel \
fribidi-devel libjpeg-turbo-devel libogg-devel openal-soft-devel SDL2-devel \ libjpeg-turbo-devel libogg-devel openal-soft-devel SDL2-devel \
libpng-devel libvorbis-devel nettle-devel zlib-devel git subversion \ libpng-devel libvorbis-devel nettle-devel zlib-devel git subversion \
mesa-comon-devel libxrandr-devel libbluez-devel libfreetype6-devel' libbluez-devel libfreetype6-devel
``` ```
openSUSE command: openSUSE command:
```bash ```bash
sudo zypper install gcc-c++ cmake openssl-devel libcurl-devel libSDL2-devel \ sudo zypper install gcc-c++ cmake openssl-devel libcurl-devel libSDL2-devel \
freetype-devel harfbuzz-devel fribidi-devel libogg-devel openal-soft-devel libpng-devel \ freetype-devel harfbuzz-devel libogg-devel openal-soft-devel libpng-devel \
libvorbis-devel libXrandr-devel pkgconf zlib-devel enet-devel glew-devel \ libvorbis-devel pkgconf zlib-devel enet-devel \
libjpeg-devel bluez-devel freetype2-devel glu-devel libjpeg-devel bluez-devel freetype2-devel
``` ```
Ubuntu command: Ubuntu command:
```bash ```bash
sudo apt-get install build-essential cmake libbluetooth-dev libsdl2-dev \ sudo apt-get install build-essential cmake libbluetooth-dev libsdl2-dev \
libcurl4-openssl-dev libenet-dev libfreetype6-dev libharfbuzz-dev libfribidi-dev \ libcurl4-openssl-dev libenet-dev libfreetype6-dev libharfbuzz-dev \
libgl1-mesa-dev libglew-dev libjpeg-dev libogg-dev libopenal-dev libpng-dev \ libjpeg-dev libogg-dev libopenal-dev libpng-dev \
libssl-dev libvorbis-dev libxrandr-dev libx11-dev nettle-dev pkg-config zlib1g-dev libssl-dev libvorbis-dev nettle-dev pkg-config zlib1g-dev
``` ```
### In-game recorder ### In-game recorder
@ -209,20 +207,7 @@ If you have never built anything before, you have create `/usr/local/include/` f
sudo mkdir -p /usr/local/include/ sudo mkdir -p /usr/local/include/
``` ```
Symlink the `include`-folder of OpenGL framework to `/usr/local/include/GL` (Unix programs have an easier time finding it this way): The first link is required in order to find libcurl.
```bash
sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL
```
On OS X 10.9.5, you might need the following workaround:
```bash
sudo ln -s `xcrun --show-sdk-path`/usr/include/ /usr/include
sudo ln -s `xcrun --show-sdk-path`/System/Library/Frameworks/OpenGL.framework/Headers/ /usr/local/include/OpenGL
```
The first link is required in order to find libcurl, the second to find opengl.
### STK 0.10 or later (or latest git) ### STK 0.10 or later (or latest git)
@ -239,7 +224,7 @@ Build STK
```bash ```bash
mkdir cmake_build mkdir cmake_build
cd cmake_build cd cmake_build
CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/:/usr/local/opt/glew/:/usr/local/opt/fribidi/ cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DUSE_SYSTEM_GLEW=1 -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/ CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/ cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/
make make
``` ```

2
cmake/Toolchain-ios-xcode.cmake
View File

@ -47,8 +47,6 @@ set(OGGVORBIS_VORBISENC_LIBRARY ${DEPS_PATH}/ios_arm64/dependencies/lib/libvorbi
set(OGGVORBIS_VORBISENC_INCLUDE_DIR ${DEPS_PATH}/ios_arm64/dependencies/include/vorbis CACHE STRING "") set(OGGVORBIS_VORBISENC_INCLUDE_DIR ${DEPS_PATH}/ios_arm64/dependencies/include/vorbis CACHE STRING "")
set(HARFBUZZ_LIBRARY ${DEPS_PATH}/ios_arm64/dependencies/lib/libharfbuzz.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libharfbuzz.a CACHE STRING "") set(HARFBUZZ_LIBRARY ${DEPS_PATH}/ios_arm64/dependencies/lib/libharfbuzz.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libharfbuzz.a CACHE STRING "")
set(HARFBUZZ_INCLUDEDIR ${DEPS_PATH}/ios_arm64/dependencies/include CACHE STRING "") set(HARFBUZZ_INCLUDEDIR ${DEPS_PATH}/ios_arm64/dependencies/include CACHE STRING "")
set(FRIBIDI_LIBRARY ${DEPS_PATH}/ios_arm64/dependencies/lib/libfribidi.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libfribidi.a CACHE STRING "")
set(FRIBIDI_INCLUDE_DIR ${DEPS_PATH}/ios_arm64/dependencies/include CACHE STRING "")
set(FREETYPE_LIBRARY ${DEPS_PATH}/ios_arm64/dependencies/lib/libfreetype.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libfreetype.a CACHE STRING "") set(FREETYPE_LIBRARY ${DEPS_PATH}/ios_arm64/dependencies/lib/libfreetype.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libfreetype.a CACHE STRING "")
set(FREETYPE_INCLUDE_DIRS ${DEPS_PATH}/ios_arm64/dependencies/include/freetype2 CACHE STRING "") set(FREETYPE_INCLUDE_DIRS ${DEPS_PATH}/ios_arm64/dependencies/include/freetype2 CACHE STRING "")
set(CURL_LIBRARY "${DEPS_PATH}/ios_arm64/dependencies/lib/libcurl.a;${DEPS_PATH}/ios_arm64/dependencies/lib/libssl.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libcurl.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libssl.a" CACHE STRING "") set(CURL_LIBRARY "${DEPS_PATH}/ios_arm64/dependencies/lib/libcurl.a;${DEPS_PATH}/ios_arm64/dependencies/lib/libssl.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libcurl.a;${DEPS_PATH}/ios_simulator64/dependencies/lib/libssl.a" CACHE STRING "")

1
tools/linux_builder.sh
View File

@ -431,7 +431,6 @@ build_stk()
cmake .. -DCMAKE_FIND_ROOT_PATH="$INSTALL_DIR" \ cmake .. -DCMAKE_FIND_ROOT_PATH="$INSTALL_DIR" \
-DUSE_SYSTEM_ANGELSCRIPT=0 \ -DUSE_SYSTEM_ANGELSCRIPT=0 \
-DUSE_SYSTEM_ENET=0 \ -DUSE_SYSTEM_ENET=0 \
-DUSE_SYSTEM_GLEW=0 \
-DUSE_SYSTEM_WIIUSE=0 \ -DUSE_SYSTEM_WIIUSE=0 \
-DENABLE_WAYLAND_DEVICE=0 \ -DENABLE_WAYLAND_DEVICE=0 \
-DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=1 \ -DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=1 \

1
tools/windows_installer/supertuxkart-64bit-mingw.nsi
View File

@ -273,7 +273,6 @@ Section "Uninstall" redist
DELETE /REBOOTOK "$INSTDIR\libeay32.dll" DELETE /REBOOTOK "$INSTDIR\libeay32.dll"
DELETE /REBOOTOK "$INSTDIR\License.txt" DELETE /REBOOTOK "$INSTDIR\License.txt"
DELETE /REBOOTOK "$INSTDIR\libfreetype-6.dll" DELETE /REBOOTOK "$INSTDIR\libfreetype-6.dll"
DELETE /REBOOTOK "$INSTDIR\libfribidi-0.dll"
DELETE /REBOOTOK "$INSTDIR\libharfbuzz-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-0.dll"
DELETE /REBOOTOK "$INSTDIR\libharfbuzz-subset-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-subset-0.dll"
DELETE /REBOOTOK "$INSTDIR\libjpeg-62.dll" DELETE /REBOOTOK "$INSTDIR\libjpeg-62.dll"

1
tools/windows_installer/supertuxkart-64bit.nsi
View File

@ -283,7 +283,6 @@ Section "Uninstall" redist
DELETE /REBOOTOK "$INSTDIR\libeay32.dll" DELETE /REBOOTOK "$INSTDIR\libeay32.dll"
DELETE /REBOOTOK "$INSTDIR\License.txt" DELETE /REBOOTOK "$INSTDIR\License.txt"
DELETE /REBOOTOK "$INSTDIR\libfreetype.dll" DELETE /REBOOTOK "$INSTDIR\libfreetype.dll"
DELETE /REBOOTOK "$INSTDIR\libfribidi-0.dll"
DELETE /REBOOTOK "$INSTDIR\libogg-0.dll" DELETE /REBOOTOK "$INSTDIR\libogg-0.dll"
DELETE /REBOOTOK "$INSTDIR\OpenAL32.dll" DELETE /REBOOTOK "$INSTDIR\OpenAL32.dll"
DELETE /REBOOTOK "$INSTDIR\physfs.dll" DELETE /REBOOTOK "$INSTDIR\physfs.dll"

1
tools/windows_installer/supertuxkart-mingw.nsi
View File

@ -272,7 +272,6 @@ Section "Uninstall" redist
DELETE /REBOOTOK "$INSTDIR\libeay32.dll" DELETE /REBOOTOK "$INSTDIR\libeay32.dll"
DELETE /REBOOTOK "$INSTDIR\License.txt" DELETE /REBOOTOK "$INSTDIR\License.txt"
DELETE /REBOOTOK "$INSTDIR\libfreetype-6.dll" DELETE /REBOOTOK "$INSTDIR\libfreetype-6.dll"
DELETE /REBOOTOK "$INSTDIR\libfribidi-0.dll"
DELETE /REBOOTOK "$INSTDIR\libharfbuzz-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-0.dll"
DELETE /REBOOTOK "$INSTDIR\libharfbuzz-subset-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-subset-0.dll"
DELETE /REBOOTOK "$INSTDIR\libidn-11.dll" DELETE /REBOOTOK "$INSTDIR\libidn-11.dll"

1
tools/windows_installer/supertuxkart.nsi
View File

@ -277,7 +277,6 @@ Section "Uninstall" redist
RMDir /r /REBOOTOK $INSTDIR\data RMDir /r /REBOOTOK $INSTDIR\data
RMDir /r /REBOOTOK $INSTDIR\prerequisites RMDir /r /REBOOTOK $INSTDIR\prerequisites
DELETE /REBOOTOK "$INSTDIR\glew32.dll"
DELETE /REBOOTOK "$INSTDIR\install.ico" DELETE /REBOOTOK "$INSTDIR\install.ico"
DELETE /REBOOTOK "$INSTDIR\icon.ico" DELETE /REBOOTOK "$INSTDIR\icon.ico"
DELETE /REBOOTOK "$INSTDIR\Irrlicht.dll" DELETE /REBOOTOK "$INSTDIR\Irrlicht.dll"