Added support for reading from http and obj files in the static build of Present3D

2009-06-22 16:08:12 +00:00 · 2009-06-22 16:08:12 +00:00 · bf8a5c1568
commit bf8a5c1568
parent 76de3e6a02
2 changed files with 16 additions and 4 deletions
--- 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()

--- 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)