[Scummvm-cvs-logs] scummvm master -> 7ef6c73d61588482f2686c43047e0a4522c5baf8
dreammaster
dreammaster at scummvm.org
Thu Aug 11 14:33:39 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7ef6c73d61 SDL: Previous commit broke compilation on MSVC
Commit: 7ef6c73d61588482f2686c43047e0a4522c5baf8
https://github.com/scummvm/scummvm/commit/7ef6c73d61588482f2686c43047e0a4522c5baf8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-11T05:30:46-07:00
Commit Message:
SDL: Previous commit broke compilation on MSVC
Including cursorman.cpp rather than cursorman.h resulted in the CursorManager class being present in multiple .obj files, resulting in linking errors.
Changed paths:
backends/platform/sdl/sdl.cpp
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index ba57841..8dff5ce 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -49,7 +49,7 @@
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
#ifdef USE_OPENGL
#include "backends/graphics/openglsdl/openglsdl-graphics.h"
-#include "graphics/cursorman.cpp"
+#include "graphics/cursorman.h"
#endif
#include "icons/scummvm.xpm"
More information about the Scummvm-git-logs
mailing list