]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
2 | index 81328ea..c735419 100644 | |
3 | --- a/CMakeLists.txt | |
4 | +++ b/CMakeLists.txt | |
5 | @@ -755,8 +755,6 @@ ELSE() | |
6 | FIND_PACKAGE(GStreamer COMPONENTS app pbutils) | |
7 | FIND_PACKAGE(GLIB COMPONENTS gobject) | |
8 | FIND_PACKAGE(DirectShow) | |
9 | - FIND_PACKAGE(SDL2) | |
10 | - FIND_PACKAGE(SDL) | |
11 | FIND_PACKAGE(Poppler-glib) | |
12 | FIND_PACKAGE(RSVG) | |
13 | FIND_PACKAGE(GtkGl) | |
14 | @@ -775,6 +773,10 @@ ELSE() | |
15 | FIND_PACKAGE(Lua51) | |
16 | ENDIF() | |
17 | ENDIF() | |
18 | + | |
19 | + find_package(SDL) | |
20 | + find_package(SDL2 CONFIG) | |
21 | + set(SDL2_LIBRARY SDL2::SDL2 SDL2::SDL2main) | |
22 | ||
23 | # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this. | |
24 | # FIND_PACKAGE(V8) | |
25 | diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp | |
26 | index 9de15b1..ae96e11 100644 | |
27 | --- a/examples/osgmovie/osgmovie.cpp | |
28 | +++ b/examples/osgmovie/osgmovie.cpp | |
29 | @@ -691,7 +691,7 @@ int main(int argc, char** argv) | |
30 | ||
31 | #if USE_SDL || USE_SDL2 | |
32 | ||
33 | -#include "SDL.h" | |
34 | +#include <SDL/SDL.h> | |
35 | ||
36 | static void soundReadCallback(void * user_data, uint8_t * data, int datalen) | |
37 | { |