diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 78d5940..91e74d0 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -267,7 +267,7 @@ elseif(UNIX) message("LZO:" ${LZO_INCLUDE_DIR}) pkg_check_modules(FREETYPE REQUIRED freetype2) - pkg_check_modules(SDL_LIB REQUIRED sdl) + pkg_check_modules(SDL_LIB REQUIRED sdl2) endif() include_directories(BEFORE ${TIFF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}) @@ -276,8 +276,10 @@ if(WIN32 OR APPLE) find_path(BOOST_ROOT include/boost boost HINTS ${THIRDPARTY_LIBS_HINTS} PATH_SUFFIXES boost/boost_1_61_0/ boost/boost_1_60_0/ boost/boost_1_59_0/ boost/boost_1_58_0/ boost/boost_1_57_0/ boost/boost_1_56_0/ boost155/1.55.0_1/ boost/boost_1_55_0/ ) + find_package(Boost 1.55 REQUIRED) +else() + find_package(Boost) endif() -find_package(Boost 1.55 REQUIRED) include_directories(${Boost_INCLUDE_DIR} ${LZ4_LIB_INCLUDE_DIRS} ${USB_LIB_INCLUDE_DIRS} ${SUPERLU_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) diff --git a/toonz/sources/common/tsystem/tfilepath_io.cpp b/toonz/sources/common/tsystem/tfilepath_io.cpp index 74b4fa2..f870fa8 100644 --- a/toonz/sources/common/tsystem/tfilepath_io.cpp +++ b/toonz/sources/common/tsystem/tfilepath_io.cpp @@ -90,7 +90,7 @@ sperando che sia il nome del file => compila ma non funziona {} Tifstream::~Tifstream() { -#ifndef MACOSX +#ifdef _WIN32 fclose(m_file); #endif } diff --git a/toonz/sources/image/tiio.cpp b/toonz/sources/image/tiio.cpp index 234d61b..336e6b0 100644 --- a/toonz/sources/image/tiio.cpp +++ b/toonz/sources/image/tiio.cpp @@ -42,7 +42,9 @@ #include "./3gp/tiio_3gpM.h" #elif LINUX // No more supported by the way... -#include "./mov/tiio_movL.h" +// #include "./mov/tiio_movL.h" +#include "./mov/tiio_mov_proxy.h" +#include "./3gp/tiio_3gp_proxy.h" #endif // Common includes