diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-02-14 09:53:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 17:53:23 -0800 |
| commit | ad69a7fc8ee9324b95105cbfd89f2a615ad570af (patch) | |
| tree | c0fdba243bc4b23065c16e7e960a2c8f0c6ea6aa /ports/osg/fix-sdl.patch | |
| parent | 375ea0ec6b9df9a82704f01c3afc1bf3d00b618b (diff) | |
| download | vcpkg-ad69a7fc8ee9324b95105cbfd89f2a615ad570af.tar.gz vcpkg-ad69a7fc8ee9324b95105cbfd89f2a615ad570af.zip | |
[osg]Fix windows-dynamic/linux build. (#8060)
* [osg]Fix dynamic build.
* [sdl1]Fix linux command.
* [osg]Fix linux build: disable present3D and osgstaticview.
* [osg]fix windows build-only for windows.
* [osg]Fix file INSTALL error.
* [osg]Add dependency conditions.
* [osg]disable OSG_USE_UTF8_FILENAME in Linux and OSX.
* [osg]Fix find dependency curl. Replace version num by macro.
* [osg]Add option CMAKE_CXX_STANDARD
* [osg] Remove library prefix.
* [osg] Fix install pdbs
* [osg] Remove usless plugin libs.
* update baseline
* update baseline
* update baseline
* update baseline
Diffstat (limited to 'ports/osg/fix-sdl.patch')
| -rw-r--r-- | ports/osg/fix-sdl.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/ports/osg/fix-sdl.patch b/ports/osg/fix-sdl.patch new file mode 100644 index 000000000..fa092c784 --- /dev/null +++ b/ports/osg/fix-sdl.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 81328ea..2566b48 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,11 @@ ELSE() + FIND_PACKAGE(Lua51) + ENDIF() + ENDIF() ++ ++ find_package(SDL) ++ if (NOT SDL_FOUND) ++ find_package(SDL2) ++ endif() + + # 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) + { |