diff --git a/.gitignore b/.gitignore index 0db8a2ded..e77e1c521 100644 --- a/.gitignore +++ b/.gitignore @@ -80,7 +80,6 @@ lib/libjpeg lib/zlib lib/openal lib/openssl -lib/fribidi lib/harfbuzz lib/sdl2 diff --git a/.travis.yml b/.travis.yml index b94aa783f..30a75b986 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,16 +33,12 @@ addons: - libcurl4-gnutls-dev - libfreetype6-dev - libharfbuzz-dev - - libfribidi-dev - - libgl1-mesa-dev - libjpeg-dev - libogg-dev - libopenal-dev - libpng-dev - libsdl2-dev - libvorbis-dev - - libxrandr-dev - - mesa-common-dev - pkg-config - 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 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 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: - mkdir "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 - make VERBOSE=1 -j3 diff --git a/Brewfile b/Brewfile index f833cb3e8..4022f691a 100644 --- a/Brewfile +++ b/Brewfile @@ -4,8 +4,6 @@ brew "libvorbis" brew "openal-soft" brew "freetype" brew "curl" -brew "fribidi" -brew "glew" brew "harfbuzz" brew "libjpeg" brew "sdl2" diff --git a/CMakeLists.txt b/CMakeLists.txt index b31b999ac..4dfc7b170 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -201,7 +201,6 @@ else() set(ENET_LIBRARIES "enet") endif() -# Find system GLEW library or build it if missing if(NOT SERVER_ONLY) add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_engine") include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/graphics_engine/include") diff --git a/INSTALL.md b/INSTALL.md index 9280a4491..693214e8e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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: -* OpenGL (mesa) * OpenAL (recommended: openal-soft-devel) * Ogg (libogg-dev) * Vorbis (libvorbis-dev) * Freetype (libfreetype6-dev) * Harfbuzz (libharfbuzz-dev) -* Fribidi (libfribidi-dev) * libcurl (libcurl-devel) * libbluetooth (bluez-devel) * openssl (openssl-dev) @@ -31,13 +29,13 @@ To build SuperTuxKart from source, you'll need to install the following packages Fedora command: ```bash -sudo dnf install @development-tools angelscript-devel \ +sudo dnf install @development-tools angelscript-devel \ bluez-libs-devel cmake desktop-file-utils SDL2-devel \ -freealut-devel freeglut-devel freetype-devel fribidi-devel \ -gcc-c++ git-core libXrandr-devel libcurl-devel libjpeg-turbo-devel \ -libpng-devel libsquish-devel libtool libvorbis-devel mesa-libEGL-devel \ -mesa-libGLES-devel openal-soft-devel openssl-devel libcurl-devel harfbuzz-devel \ -fribidi-devel mesa-libGL-devel libogg-devel libGLEW openssl-devel pkgconf \ +freealut-devel freetype-devel \ +gcc-c++ git-core libcurl-devel libjpeg-turbo-devel \ +libpng-devel libsquish-devel libtool libvorbis-devel \ +openal-soft-devel openssl-devel libcurl-devel harfbuzz-devel \ +libogg-devel openssl-devel pkgconf \ wiiuse-devel zlib-devel ``` @@ -45,27 +43,27 @@ Mageia 6 command: ```bash 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 \ -mesa-comon-devel libxrandr-devel libbluez-devel libfreetype6-devel' +libbluez-devel libfreetype6-devel ``` openSUSE command: ```bash 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 \ -libvorbis-devel libXrandr-devel pkgconf zlib-devel enet-devel glew-devel \ -libjpeg-devel bluez-devel freetype2-devel glu-devel +freetype-devel harfbuzz-devel libogg-devel openal-soft-devel libpng-devel \ +libvorbis-devel pkgconf zlib-devel enet-devel \ +libjpeg-devel bluez-devel freetype2-devel ``` Ubuntu command: ```bash sudo apt-get install build-essential cmake libbluetooth-dev libsdl2-dev \ -libcurl4-openssl-dev libenet-dev libfreetype6-dev libharfbuzz-dev libfribidi-dev \ -libgl1-mesa-dev libglew-dev libjpeg-dev libogg-dev libopenal-dev libpng-dev \ -libssl-dev libvorbis-dev libxrandr-dev libx11-dev nettle-dev pkg-config zlib1g-dev +libcurl4-openssl-dev libenet-dev libfreetype6-dev libharfbuzz-dev \ +libjpeg-dev libogg-dev libopenal-dev libpng-dev \ +libssl-dev libvorbis-dev nettle-dev pkg-config zlib1g-dev ``` ### 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/ ``` -Symlink the `include`-folder of OpenGL framework to `/usr/local/include/GL` (Unix programs have an easier time finding it this way): - -```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. +The first link is required in order to find libcurl. ### STK 0.10 or later (or latest git) @@ -239,7 +224,7 @@ Build STK ```bash mkdir 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 ``` diff --git a/cmake/Toolchain-ios-xcode.cmake b/cmake/Toolchain-ios-xcode.cmake index 05603b3f2..1fac29ae0 100644 --- a/cmake/Toolchain-ios-xcode.cmake +++ b/cmake/Toolchain-ios-xcode.cmake @@ -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(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(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_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 "") diff --git a/tools/linux_builder.sh b/tools/linux_builder.sh index dff861482..874d567d2 100755 --- a/tools/linux_builder.sh +++ b/tools/linux_builder.sh @@ -431,7 +431,6 @@ build_stk() cmake .. -DCMAKE_FIND_ROOT_PATH="$INSTALL_DIR" \ -DUSE_SYSTEM_ANGELSCRIPT=0 \ -DUSE_SYSTEM_ENET=0 \ - -DUSE_SYSTEM_GLEW=0 \ -DUSE_SYSTEM_WIIUSE=0 \ -DENABLE_WAYLAND_DEVICE=0 \ -DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=1 \ diff --git a/tools/windows_installer/supertuxkart-64bit-mingw.nsi b/tools/windows_installer/supertuxkart-64bit-mingw.nsi index e6696642f..7533b9e36 100644 --- a/tools/windows_installer/supertuxkart-64bit-mingw.nsi +++ b/tools/windows_installer/supertuxkart-64bit-mingw.nsi @@ -273,7 +273,6 @@ Section "Uninstall" redist DELETE /REBOOTOK "$INSTDIR\libeay32.dll" DELETE /REBOOTOK "$INSTDIR\License.txt" DELETE /REBOOTOK "$INSTDIR\libfreetype-6.dll" - DELETE /REBOOTOK "$INSTDIR\libfribidi-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-subset-0.dll" DELETE /REBOOTOK "$INSTDIR\libjpeg-62.dll" diff --git a/tools/windows_installer/supertuxkart-64bit.nsi b/tools/windows_installer/supertuxkart-64bit.nsi index 891fa55e2..5e404f2ea 100755 --- a/tools/windows_installer/supertuxkart-64bit.nsi +++ b/tools/windows_installer/supertuxkart-64bit.nsi @@ -283,7 +283,6 @@ Section "Uninstall" redist DELETE /REBOOTOK "$INSTDIR\libeay32.dll" DELETE /REBOOTOK "$INSTDIR\License.txt" DELETE /REBOOTOK "$INSTDIR\libfreetype.dll" - DELETE /REBOOTOK "$INSTDIR\libfribidi-0.dll" DELETE /REBOOTOK "$INSTDIR\libogg-0.dll" DELETE /REBOOTOK "$INSTDIR\OpenAL32.dll" DELETE /REBOOTOK "$INSTDIR\physfs.dll" diff --git a/tools/windows_installer/supertuxkart-mingw.nsi b/tools/windows_installer/supertuxkart-mingw.nsi index 631b49ef4..d3f3663f2 100644 --- a/tools/windows_installer/supertuxkart-mingw.nsi +++ b/tools/windows_installer/supertuxkart-mingw.nsi @@ -272,7 +272,6 @@ Section "Uninstall" redist DELETE /REBOOTOK "$INSTDIR\libeay32.dll" DELETE /REBOOTOK "$INSTDIR\License.txt" DELETE /REBOOTOK "$INSTDIR\libfreetype-6.dll" - DELETE /REBOOTOK "$INSTDIR\libfribidi-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-0.dll" DELETE /REBOOTOK "$INSTDIR\libharfbuzz-subset-0.dll" DELETE /REBOOTOK "$INSTDIR\libidn-11.dll" diff --git a/tools/windows_installer/supertuxkart.nsi b/tools/windows_installer/supertuxkart.nsi index 61bb0535a..0502837cd 100755 --- a/tools/windows_installer/supertuxkart.nsi +++ b/tools/windows_installer/supertuxkart.nsi @@ -277,7 +277,6 @@ Section "Uninstall" redist RMDir /r /REBOOTOK $INSTDIR\data RMDir /r /REBOOTOK $INSTDIR\prerequisites - DELETE /REBOOTOK "$INSTDIR\glew32.dll" DELETE /REBOOTOK "$INSTDIR\install.ico" DELETE /REBOOTOK "$INSTDIR\icon.ico" DELETE /REBOOTOK "$INSTDIR\Irrlicht.dll"