mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 06:29:01 +08:00
b12256a4af
* [osg] Add feature examples and plugins, fix configure options * [osg] Add feature tools, packages and docs * [osgearth] Set dependency to osg[plugins] * [osgearth] bump version * [osg] Fix dependency * [osg] Remove feature plugins dependency nvtt * [osg] Remove empty folder * [osg] Fix dependency sdl and liblas * [osg] Fix install issue * [osg] Fix dependency nvtt * [osg] Re-fix dependency nvtt * [osg] Fix judgment when selecting nvtt * [osg] Create tools folder based on conditions * [osg] Fix typo * update baseline * re-trigger ci test * re-trigger ci test
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 81328ea..c735419 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -755,8 +755,6 @@ ELSE()
|
|
FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
|
|
FIND_PACKAGE(GLIB COMPONENTS gobject)
|
|
FIND_PACKAGE(DirectShow)
|
|
- FIND_PACKAGE(SDL2)
|
|
- FIND_PACKAGE(SDL)
|
|
FIND_PACKAGE(Poppler-glib)
|
|
FIND_PACKAGE(RSVG)
|
|
FIND_PACKAGE(GtkGl)
|
|
@@ -775,6 +773,10 @@ ELSE()
|
|
FIND_PACKAGE(Lua51)
|
|
ENDIF()
|
|
ENDIF()
|
|
+
|
|
+ find_package(SDL)
|
|
+ find_package(SDL2 CONFIG)
|
|
+ set(SDL2_LIBRARY SDL2::SDL2 SDL2::SDL2main)
|
|
|
|
# V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this.
|
|
# FIND_PACKAGE(V8)
|
|
diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp
|
|
index 9de15b1..ae96e11 100644
|
|
--- a/examples/osgmovie/osgmovie.cpp
|
|
+++ b/examples/osgmovie/osgmovie.cpp
|
|
@@ -691,7 +691,7 @@ int main(int argc, char** argv)
|
|
|
|
#if USE_SDL || USE_SDL2
|
|
|
|
-#include "SDL.h"
|
|
+#include <SDL/SDL.h>
|
|
|
|
static void soundReadCallback(void * user_data, uint8_t * data, int datalen)
|
|
{
|