diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemSDL.cpp | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c06567103f0..2bda4b9f133 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,6 +358,11 @@ if(WITH_INSTALL_PORTABLE) set(CMAKE_SKIP_BUILD_RPATH TRUE) endif() +if(WITH_GHOST_SDL OR WITH_HEADLESS) + set(WITH_GHOST_XDND OFF) +endif() + + #----------------------------------------------------------------------------- # Initialize un-cached vars, avoid unused warning diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index dd5124a0aac..4d1159fbfbe 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -481,8 +481,8 @@ GHOST_SystemSDL::setCursorPosition(GHOST_TInt32 x, bool GHOST_SystemSDL::generateWindowExposeEvents() { - vector<GHOST_WindowSDL *>::iterator w_start= m_dirty_windows.begin(); - vector<GHOST_WindowSDL *>::const_iterator w_end= m_dirty_windows.end(); + std::vector<GHOST_WindowSDL *>::iterator w_start= m_dirty_windows.begin(); + std::vector<GHOST_WindowSDL *>::const_iterator w_end= m_dirty_windows.end(); bool anyProcessed= false; for (;w_start != w_end; ++w_start) { @@ -563,10 +563,10 @@ GHOST_SystemSDL::findGhostWindow(SDL_Window *sdl_win) // We should always check the window manager's list of windows // and only process events on these windows. - vector<GHOST_IWindow *> & win_vec= m_windowManager->getWindows(); + std::vector<GHOST_IWindow *> & win_vec= m_windowManager->getWindows(); - vector<GHOST_IWindow *>::iterator win_it= win_vec.begin(); - vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end(); + std::vector<GHOST_IWindow *>::iterator win_it= win_vec.begin(); + std::vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end(); for (; win_it != win_end; ++win_it) { GHOST_WindowSDL * window= static_cast<GHOST_WindowSDL *>(*win_it); |