From 0499d0d5422a0c618368b76bbb27f405fd5325ad Mon Sep 17 00:00:00 2001 From: Campbell Barton <ideasman42@gmail.com> Date: Jun 30 2016 07:46:09 +0000 Subject: Merge pull request #550 from janisozaur/sdl2-includes Fix SDL includes in tnzbase --- diff --git a/toonz/sources/common/tapptools/ttimer.cpp b/toonz/sources/common/tapptools/ttimer.cpp index 2726164..bbd2c70 100644 --- a/toonz/sources/common/tapptools/ttimer.cpp +++ b/toonz/sources/common/tapptools/ttimer.cpp @@ -124,8 +124,8 @@ void CALLBACK ElapsedTimeCB(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, }; #elif LINUX -#include <SDL/SDL_timer.h> -#include <SDL/SDL.h> +#include <SDL_timer.h> +#include <SDL.h> #include "tthread.h" namespace { Uint32 ElapsedTimeCB(Uint32 interval, void *param); diff --git a/toonz/sources/tnzbase/CMakeLists.txt b/toonz/sources/tnzbase/CMakeLists.txt index 2bd9710..ce03b71 100644 --- a/toonz/sources/tnzbase/CMakeLists.txt +++ b/toonz/sources/tnzbase/CMakeLists.txt @@ -190,6 +190,7 @@ elseif(UNIX) set(EXTRA_LIBS ${EXTRA_LIBS} ${SDL_LIB_LIBRARIES}) + include_directories(${SDL_LIB_INCLUDE_DIRS}) target_link_libraries(tnzbase Qt5::Core Qt5::Gui) endif()