Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

WITH_GHOST_SDL working again (missing std:: update)

Browse Source
This commit is contained in:
Campbell Barton
2012-03-13 14:28:58 +00:00
parent f34c3580ac
commit 59303e35fc
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -358,6 +358,11 @@ if(WITH_INSTALL_PORTABLE)
set(CMAKE_SKIP_BUILD_RPATH TRUE) set(CMAKE_SKIP_BUILD_RPATH TRUE)
endif() endif()
if(WITH_GHOST_SDL OR WITH_HEADLESS)
set(WITH_GHOST_XDND OFF)
endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Initialize un-cached vars, avoid unused warning # Initialize un-cached vars, avoid unused warning

10
intern/ghost/intern/GHOST_SystemSDL.cpp
View File

@@ -481,8 +481,8 @@ GHOST_SystemSDL::setCursorPosition(GHOST_TInt32 x,
bool bool
GHOST_SystemSDL::generateWindowExposeEvents() GHOST_SystemSDL::generateWindowExposeEvents()
{ {
vector<GHOST_WindowSDL *>::iterator w_start= m_dirty_windows.begin(); std::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 *>::const_iterator w_end= m_dirty_windows.end();
bool anyProcessed= false; bool anyProcessed= false;
for (;w_start != w_end; ++w_start) { 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 // We should always check the window manager's list of windows
// and only process events on these 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(); std::vector<GHOST_IWindow *>::iterator win_it= win_vec.begin();
vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end(); std::vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end();
for (; win_it != win_end; ++win_it) { for (; win_it != win_end; ++win_it) {
GHOST_WindowSDL * window= static_cast<GHOST_WindowSDL *>(*win_it); GHOST_WindowSDL * window= static_cast<GHOST_WindowSDL *>(*win_it);