From bf8a5c1568e8f3a1862114aebc032beede814568 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 22 Jun 2009 16:08:12 +0000 Subject: [PATCH] Added support for reading from http and obj files in the static build of Present3D --- applications/present3D/CMakeLists.txt | 10 ++++++++-- applications/present3D/present3D.cpp | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt index 3c30baa09..4f0abfd41 100644 --- a/applications/present3D/CMakeLists.txt +++ b/applications/present3D/CMakeLists.txt @@ -58,13 +58,19 @@ IF (NOT DYNAMIC_OPENSCENEGRAPH) SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_ive - osgdb_freetype - osgdb_openflight osgdb_osg + + osgdb_freetype osgdb_rgb osgdb_jpeg osgdb_png + osgdb_ffmpeg + + osgdb_openflight + osgdb_obj + + osgdb_curl ) ENDIF() diff --git a/applications/present3D/present3D.cpp b/applications/present3D/present3D.cpp index 5acc9ca78..b4d6e5c12 100644 --- a/applications/present3D/present3D.cpp +++ b/applications/present3D/present3D.cpp @@ -58,14 +58,20 @@ // include the plugins we need USE_OSGPLUGIN(ive) - USE_OSGPLUGIN(freetype) USE_OSGPLUGIN(osg) + + USE_OSGPLUGIN(freetype) USE_OSGPLUGIN(rgb) - USE_OSGPLUGIN(OpenFlight) USE_OSGPLUGIN(png) USE_OSGPLUGIN(jpeg) + USE_OSGPLUGIN(ffmpeg) + USE_OSGPLUGIN(OpenFlight) + USE_OSGPLUGIN(obj) + + USE_OSGPLUGIN(curl) + USE_OSGPLUGIN(p3d) USE_OSGPLUGIN(paths)