tjh.dev
1diff --git a/configure b/configure
2index 5edefba..a17e8c5 100755
3--- a/configure
4+++ b/configure
5@@ -1184,10 +1184,10 @@ check_sdl()
6 fail
7 fi
8 else
9- if which_wrapper sdl-config > /dev/null; then
10- FLGSDL=`sdl-config --cflags`
11+ if which_wrapper sdl2-config > /dev/null; then
12+ FLGSDL=`sdl2-config --cflags`
13 INCSDL=`strip_I "$FLGSDL"`
14- LIBSDL=`sdl-config --libs`
15+ LIBSDL=`sdl2-config --libs`
16 LIBSDLMAIN="-lSDLmain"
17 FLDSDL=
18 foundsdl=1
19diff --git a/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp b/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
20index 16dc282..4889865 100644
21--- a/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
22+++ b/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
23@@ -56,7 +56,7 @@ using namespace com;
24 # pragma warning(push)
25 # pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
26 # endif
27-# include <SDL_syswm.h> /* for SDL_GetWMInfo() */
28+# include <SDL2/SDL_syswm.h> /* for SDL_GetWMInfo() */
29 # ifdef _MSC_VER
30 # pragma warning(pop)
31 # endif
32diff --git a/src/VBox/Frontends/VBoxSDL/Makefile.kmk b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
33index da43153..2aa8cd7 100644
34--- a/src/VBox/Frontends/VBoxSDL/Makefile.kmk
35+++ b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
36@@ -79,10 +79,6 @@ if !defined(VBOX_WITH_HARDENING) || "$(KBUILD_TARGET)" != "darwin" # No hardened
37 VBoxSDL_INCS += \
38 $(VBOX_XCURSOR_INCS)
39 endif
40- ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
41- VBoxSDL_LIBS = \
42- $(LIB_SDK_LIBSDL2_SDLMAIN)
43- endif
44 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
45 VBoxSDL_LIBS += \
46 $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
47diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
48index 065c391..22788e1 100644
49--- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
50+++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
51@@ -64,7 +64,7 @@ using namespace com;
52 # pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
53 #endif
54 #ifndef RT_OS_DARWIN
55-# include <SDL_syswm.h> /* for SDL_GetWMInfo() */
56+# include <SDL2/SDL_syswm.h> /* for SDL_GetWMInfo() */
57 #endif
58 #ifdef _MSC_VER
59 # pragma warning(pop)
60diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
61index dde548f..8fc9fb3 100644
62--- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
63+++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
64@@ -45,7 +45,7 @@
65 # pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
66 # pragma warning(disable: 4668) /* warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
67 #endif
68-#include <SDL.h>
69+#include <SDL2/SDL.h>
70 #ifdef _MSC_VER
71 # pragma warning(pop)
72 #endif