Changeset 1342

Timestamp:

11/11/07 08:37:51 (1 year ago)

Author:

glslang

Message:

+ adds ogg to the formats
+ updated win installers

Location:

trunk

Files:

• installer/openlibraries_runtime.nsi (modified) (2 diffs)
• installer/openlibraries_sdk.nsi (modified) (2 diffs)
• src/openmedialib/plugins/avformat/avformat_plugin.opl (modified) (1 diff)

trunk/installer/openlibraries_runtime.nsi

@@ -157 +157 @@
   File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
 ;  File "C:\Program Files\FFmpeg\lib\libogg-0.dll"
-  File "C:\OpenEXR\bin\Debug\Half.dll"
-  File "C:\OpenEXR\bin\Debug\Iex.dll"
-  File "C:\OpenEXR\bin\Debug\IlmImf.dll"
-  File "C:\OpenEXR\bin\Debug\Half.dll"
-  File "C:\OpenEXR\bin\Debug\IlmThread.dll"
-  File "C:\OpenEXR\bin\Debug\Imath.dll"
+  File "C:\OpenEXR\bin\Release\Half.dll"
+  File "C:\OpenEXR\bin\Release\Iex.dll"
+  File "C:\OpenEXR\bin\Release\IlmImf.dll"
+  File "C:\OpenEXR\bin\Release\Half.dll"
+  File "C:\OpenEXR\bin\Release\IlmThread.dll"
+  File "C:\OpenEXR\bin\Release\Imath.dll"
 ;  File "C:\SDL-1.2.11\lib\SDL.dll"
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
@@ -169 +169 @@
   File "c:\Windows\system32\python25.dll"
   File "c:\boost\lib\boost_python-vc80-mt-1_34_1.dll"
+  File "c:\boost\lib\boost_thread-vc80-mt-1_34_1.dll"
+  File "c:\boost\lib\boost_regex-vc80-mt-1_34_1.dll"
+  File "c:\boost\lib\boost_iostreams-vc80-mt-1_34_1.dll"
   File "C:\zlib\lib\zlib1.dll"
 

trunk/installer/openlibraries_sdk.nsi

@@ -299 +299 @@
 ;  File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl"
 ;  File "..\src\openmedialib\plugins\sdl\Multi-threaded Debug DLL\openmedialib_sdl-vc80-d-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
+  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
   File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
   File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
@@ -341 +341 @@
 ;  File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl"
 ;  File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
   File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
   File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"

trunk/src/openmedialib/plugins/avformat/avformat_plugin.opl

@@ -3 +3 @@
         <!-- plugins go here -->
         <openmedialib name="oml" version="0.1.0">
-                <plugin name="OpenLibraries avformat plugin" type="input" in_filter="*.avi *.dv *.dif *.mpg *.mpeg *.mp3 *.mp2 *.wav *.aif" extension='"oml:.*", ".*\.avi", ".*\.dv", ".*\.dif", ".*\.mp4", ".*\.mov", ".*\.mpg", ".*\.mpeg", ".*\.mp3", ".*\.mp2", ".*\.mxf", ".*\.wav", ".*\.wmv", ".*\.aif", "/dev/.*1394/.*", "dv:-", "mpeg:-", ".*\.flv", ".*\.swf", ".*\.asf", ".*\.ts", ".*\.vob"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
-                <plugin name="OpenLibraries avformat plugin" type="output" extension='"pipe:", ".*\.mpg", ".*\.avi", ".*\.dv", ".*\.mov", ".*\.ogg", ".*\.mp2", ".*\.mp3", ".*\.mp4", ".*\.vob", ".*\.wav", ".*\.flv", ".*\.swf", ".*\.swf"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
+                <plugin name="OpenLibraries avformat plugin" type="input" in_filter="*.avi *.dv *.dif *.mpg *.mpeg *.mp3 *.mp2 *.wav *.aif" extension='"oml:.*", ".*\.avi", ".*\.dv", ".*\.dif", ".*\.mp4", ".*\.mov", ".*\.mpg", ".*\.mpeg", ".*\.mp3", ".*\.mp2", ".*\.mxf", ".*\.wav", ".*\.wmv", ".*\.aif", "/dev/.*1394/.*", "dv:-", "mpeg:-", ".*\.flv", ".*\.swf", ".*\.asf", ".*\.ts", ".*\.vob", ".*\.ogg"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
+                <plugin name="OpenLibraries avformat plugin" type="output" extension='"pipe:", ".*\.mpg", ".*\.avi", ".*\.dv", ".*\.mov", ".*\.ogg", ".*\.mp2", ".*\.mp3", ".*\.mp4", ".*\.vob", ".*\.wav", ".*\.flv", ".*\.swf", ".*\.swf", ".*\.ogg"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
                 <plugin name="OpenLibraries avformat plugin" type="filter" extension='"resampler"' merit="0" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
         </openmedialib>