diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-05 14:06:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-05 14:06:12 +0100 |
| commit | 874e9aeeeb74c5459639a93439a502d262847e68 (patch) | |
| tree | 549b6cc3ff9f8842320775e7e51f61d182f4aadb /ui/sdl2-input.c | |
| parent | b4c5df7a15dad2417bc05d08a470b82ab89d56ea (diff) | |
| parent | e444ea34f8ec27acfa9ead7eaa9904238c831e69 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150505-1' into staging
sdl2: add opengl support
# gpg: Signature made Tue May 5 10:36:25 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-sdl-20150505-1:
sdl2: Fix RGB555
sdl2: add support for display rendering using opengl.
sdl2: move SDL_* includes to sdl2.h
console-gl: add opengl rendering helper functions
opengl: add shader helper functions.
opengl: add shader build infrastructure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2-input.c')
| -rw-r--r-- | ui/sdl2-input.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c index a1973fc2e0..ac5dc9476b 100644 --- a/ui/sdl2-input.c +++ b/ui/sdl2-input.c @@ -23,12 +23,6 @@ */ /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */ -/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ -#undef WIN32_LEAN_AND_MEAN - -#include <SDL.h> -#include <SDL_syswm.h> - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" |