From 55b178907a8f90a847825adfe08bbcb82c911201 Mon Sep 17 00:00:00 2001 From: Tact Yoshida Date: Jan 08 2020 19:05:40 +0000 Subject: Remove SDL2 --- diff --git a/ci-scripts/linux/travis-install.sh b/ci-scripts/linux/travis-install.sh index 593aebe..38518cd 100644 --- a/ci-scripts/linux/travis-install.sh +++ b/ci-scripts/linux/travis-install.sh @@ -1,7 +1,7 @@ sudo add-apt-repository --yes ppa:beineri/opt-qt597-trusty sudo add-apt-repository --yes ppa:achadwick/mypaint-testing sudo apt-get update -sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libsdl2-dev libglew-dev freeglut3-dev qt59script libsuperlu3-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev +sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu3-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev # someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb diff --git a/doc/how_to_build_linux.md b/doc/how_to_build_linux.md index e3f6b6f..7a7c8ef 100644 --- a/doc/how_to_build_linux.md +++ b/doc/how_to_build_linux.md @@ -8,7 +8,6 @@ Building OpenToonz from source requires the following dependencies: - CMake (3.4.1 or newer). - Qt5 (5.9 or newer) - Boost (1.55 or newer) -- SDL2 - LibPNG - SuperLU - Lzo2 @@ -18,7 +17,7 @@ Building OpenToonz from source requires the following dependencies: ### Installing Dependencies on Debian / Ubuntu ``` -$ sudo apt-get install build-essential git cmake pkg-config libboost-all-dev qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev libsuperlu-dev liblz4-dev libusb-1.0-0-dev liblzo2-dev libpng-dev libjpeg-dev libglew-dev freeglut3-dev libsdl2-dev libfreetype6-dev libjson-c-dev qtwayland5 +$ sudo apt-get install build-essential git cmake pkg-config libboost-all-dev qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev libsuperlu-dev liblz4-dev libusb-1.0-0-dev liblzo2-dev libpng-dev libjpeg-dev libglew-dev freeglut3-dev libfreetype6-dev libjson-c-dev qtwayland5 ``` For newest versions of OS you may install libmypaint from repository and don't need to build it from source: @@ -34,7 +33,7 @@ Notes: (it may include some useless packages) ``` -$ sudo dnf install gcc gcc-c++ automake git cmake boost boost-devel SuperLU SuperLU-devel lz4-devel lzma libusb-devel lzo-devel libjpeg-turbo-devel libGLEW glew-devel freeglut-devel freeglut SDL2 SDL2-devel freetype-devel libpng-devel qt5-qtbase-devel qt5-qtsvg qt5-qtsvg-devel qt5-qtscript qt5-qtscript-devel qt5-qttools qt5-qttools-devel qt5-qtmultimedia-devel blas blas-devel json-c-devel libtool intltool make +$ sudo dnf install gcc gcc-c++ automake git cmake boost boost-devel SuperLU SuperLU-devel lz4-devel lzma libusb-devel lzo-devel libjpeg-turbo-devel libGLEW glew-devel freeglut-devel freeglut freetype-devel libpng-devel qt5-qtbase-devel qt5-qtsvg qt5-qtsvg-devel qt5-qtscript qt5-qtscript-devel qt5-qttools qt5-qttools-devel qt5-qtmultimedia-devel blas blas-devel json-c-devel libtool intltool make ``` For newest versions of OS you may install libmypaint from repository and don't need to build it from source: @@ -47,7 +46,7 @@ $ sudo dnf install libmypaint-devel ### Installing Dependencies on ArchLinux ``` -$ sudo pacman -S base-devel git cmake boost boost-libs qt5-base qt5-svg qt5-script qt5-tools qt5-multimedia lz4 libusb lzo libjpeg-turbo glew freeglut sdl2 freetype2 +$ sudo pacman -S base-devel git cmake boost boost-libs qt5-base qt5-svg qt5-script qt5-tools qt5-multimedia lz4 libusb lzo libjpeg-turbo glew freeglut freetype2 $ sudo pacman -S blas cblas ``` From AUR, using eg. yaourt: @@ -61,7 +60,7 @@ Notes: ### Installing Dependencies on openSUSE ``` -$ zypper in boost-devel cmake freeglut-devel freetype2-devel gcc-c++ glew-devel libQt5OpenGL-devel libSDL2-devel libjpeg-devel liblz4-devel libpng16-compat-devel libqt5-linguist-devel libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtscript-devel libqt5-qtsvg-devel libtiff-devel libusb-devel lzo-devel openblas-devel pkgconfig sed superlu-devel zlib-devel json-c-devel +$ zypper in boost-devel cmake freeglut-devel freetype2-devel gcc-c++ glew-devel libQt5OpenGL-devel libjpeg-devel liblz4-devel libpng16-compat-devel libqt5-linguist-devel libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtscript-devel libqt5-qtsvg-devel libtiff-devel libusb-devel lzo-devel openblas-devel pkgconfig sed superlu-devel zlib-devel json-c-devel ``` For newest versions of OS you may install libmypaint from repository and don't need to build it from source: diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 2b8dab2..e0ac08b 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -464,7 +464,6 @@ elseif(BUILD_ENV_UNIXLIKE) if(NOT BUILD_TARGET_WIN) pkg_check_modules(USB_LIB REQUIRED libusb-1.0) pkg_check_modules(FREETYPE REQUIRED freetype2) - pkg_check_modules(SDL_LIB REQUIRED sdl2) endif() # Can be 'libmypaint' or 'libmypaint-1.x' pkg_search_module(MYPAINT_LIB REQUIRED libmypaint libmypaint-1.3>=1.3) diff --git a/toonz/sources/tnzbase/CMakeLists.txt b/toonz/sources/tnzbase/CMakeLists.txt index 0065389..acfa539 100644 --- a/toonz/sources/tnzbase/CMakeLists.txt +++ b/toonz/sources/tnzbase/CMakeLists.txt @@ -206,15 +206,6 @@ elseif(BUILD_ENV_APPLE) ) elseif(BUILD_ENV_UNIXLIKE) _find_toonz_library(EXTRA_LIBS "tnzcore") - if(NOT BUILD_TARGET_WIN) - set(EXTRA_LIBS ${EXTRA_LIBS} - ${SDL_LIB_LIBRARIES} - ) - include_directories( - SYSTEM - ${SDL_LIB_INCLUDE_DIRS} - ) - endif() endif() target_link_libraries(tnzbase Qt5::Core Qt5::Gui ${EXTRA_LIBS})