Updated CMake files to RC1

2 files changed, 92 insertions, 9 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index fdfcb3f..1484663 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -8,43 +8,81 @@ include(CMakeCopyIfDifferent)
 
 set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/gstreamer-plugins")
 set(gst_plugin_debug_files
+    libdshowsrcwrapper.dll
+    libfsselector.dll
+    libfsvalve.dll
+    libgstacmenc.dll
     libgstadder.dll
     libgstalaw.dll
+    libgstalpha.dll
+    libgstalphacolor.dll
+    libgstapp.dll
+    libgstaudiochunk.dll
     libgstaudioconvert.dll
+    libgstaudiofx.dll
     libgstaudiorate.dll
     libgstaudioresample.dll
     libgstaudiotestsrc.dll
     libgstautodetect.dll
     libgstavi.dll
+    libgstcoreelements.dll
     libgstcutter.dll
     libgstdecodebin2.dll
     libgstdecodebin.dll
     libgstdirectdraw.dll
     libgstdirectsound.dll
-    libgsteffectv.dll
+    libgstdshowdecwrapper.dll
+    libgstdshowsrcwrapper.dll
+    libgstdshowvideosink.dll
+    libgstdtmf.dll
     libgstffmpeg.dll
     libgstffmpegcolorspace.dll
+    libgstflv.dll
     libgstgdp.dll
+    libgsth264parse.dll
+    libgsticydemux.dll
+    libgstid3demux.dll
     libgstjpeg.dll
+    libgstlevel.dll
+    libgstmad.dll
+    libgstmms.dll
+    libgstmpeg2dec.dll
+    libgstmpegaudioparse.dll
+    libgstmpegstream.dll
+    libgstmpegvideoparse.dll
+    libgstmscodecs.dll
     libgstmulaw.dll
+    libgstmultipart.dll
+    libgstneon.dll
     libgstogg.dll
     libgstplaybin.dll
+    libgstpng.dll
     libgstqtdemux.dll
-    libgstrtp.dll    
+    libgstqueue2.dll
+    libgstrtp.dll
+    libgstrtpmanager.dll
+    libgstrtpmuxer.dll 
     libgstrtsp.dll
+    libgstsmpte.dll
     libgsttheora.dll
     libgsttypefindfunctions.dll
     libgstudp.dll
     libgstvideobalance.dll
     libgstvideobox.dll
     libgstvideocrop.dll
-    libgstvideoflip.dll
     libgstvideomixer.dll
     libgstvideorate.dll
     libgstvideoscale.dll
+    libgstvideosignal.dll
     libgstvideotestsrc.dll
     libgstvolume.dll
+    libgstvolume.dll
     libgstvorbis.dll
+    libgstwasapi.dll
+    libgstwavparse.dll
+    libgstwininet.dll
+    libgstx264.dll
+    libgstxvid.dll
     )
 
 copy_if_different(
@@ -57,43 +95,81 @@ set(all_targets ${all_targets} ${out_targets})
 
 set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/gstreamer-plugins")
 set(gst_plugin_release_files
+    libdshowsrcwrapper.dll
+    libfsselector.dll
+    libfsvalve.dll
+    libgstacmenc.dll
     libgstadder.dll
     libgstalaw.dll
+    libgstalpha.dll
+    libgstalphacolor.dll
+    libgstapp.dll
+    libgstaudiochunk.dll
     libgstaudioconvert.dll
+    libgstaudiofx.dll
     libgstaudiorate.dll
     libgstaudioresample.dll
     libgstaudiotestsrc.dll
     libgstautodetect.dll
     libgstavi.dll
+    libgstcoreelements.dll
     libgstcutter.dll
     libgstdecodebin2.dll
     libgstdecodebin.dll
     libgstdirectdraw.dll
     libgstdirectsound.dll
-    libgsteffectv.dll
+    libgstdshowdecwrapper.dll
+    libgstdshowsrcwrapper.dll
+    libgstdshowvideosink.dll
+    libgstdtmf.dll
     libgstffmpeg.dll
     libgstffmpegcolorspace.dll
+    libgstflv.dll
     libgstgdp.dll
+    libgsth264parse.dll
+    libgsticydemux.dll
+    libgstid3demux.dll
     libgstjpeg.dll
+    libgstlevel.dll
+    libgstmad.dll
+    libgstmms.dll
+    libgstmpeg2dec.dll
+    libgstmpegaudioparse.dll
+    libgstmpegstream.dll
+    libgstmpegvideoparse.dll
+    libgstmscodecs.dll
     libgstmulaw.dll
+    libgstmultipart.dll
+    libgstneon.dll
     libgstogg.dll
     libgstplaybin.dll
+    libgstpng.dll
     libgstqtdemux.dll
-    libgstrtp.dll    
+    libgstqueue2.dll
+    libgstrtp.dll
+    libgstrtpmanager.dll
+    libgstrtpmuxer.dll 
     libgstrtsp.dll
+    libgstsmpte.dll
     libgsttheora.dll
     libgsttypefindfunctions.dll
     libgstudp.dll
     libgstvideobalance.dll
     libgstvideobox.dll
     libgstvideocrop.dll
-    libgstvideoflip.dll
     libgstvideomixer.dll
     libgstvideorate.dll
     libgstvideoscale.dll
+    libgstvideosignal.dll
     libgstvideotestsrc.dll
     libgstvolume.dll
+    libgstvolume.dll
     libgstvorbis.dll
+    libgstwasapi.dll
+    libgstwavparse.dll
+    libgstwininet.dll
+    libgstx264.dll
+    libgstxvid.dll
     )
 
 copy_if_different(
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index a2bae5d..f24ec22 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -9,8 +9,15 @@ if (OPENAL)
 
   # OPENAL_LIB
 
+  if (WINDOWS)
   find_library(OPENAL_LIB
-    NAMES openal OpenAL OpenAL32 wrap_oal
+    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
+    PATHS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/libraries/i686-win32/lib/release/
+    )
+
+  else (WINDOWS)
+  find_library(OPENAL_LIB
+    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
     PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
     )
 
@@ -26,7 +33,7 @@ if (OPENAL)
 
   find_path(OPENAL_INCLUDE_DIR
     NAMES al.h
-    PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
     )
 
   if (NOT OPENAL_INCLUDE_DIR)
@@ -56,7 +63,7 @@ if (OPENAL)
 
   find_path(ALUT_INCLUDE_DIR
     NAMES alut.h
-    PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
     )
 
   if (NOT ALUT_INCLUDE_DIR)