develop.py should now work again under windows

4 files changed, 30 insertions, 22 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 1484663..e80f0c3 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -6,8 +6,8 @@
 
 include(CMakeCopyIfDifferent)
 
-set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/gstreamer-plugins")
-set(gst_plugin_debug_files
+set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
+set(gst_plugin_release_files
     libdshowsrcwrapper.dll
     libfsselector.dll
     libfsvalve.dll
@@ -86,15 +86,15 @@ set(gst_plugin_debug_files
     )
 
 copy_if_different(
-    ${gst_plugin_debug_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins"
+    ${gst_plugin_release_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins"
     out_targets 
-    ${gst_plugin_debug_files}
+    ${gst_plugin_release_files}
     )
 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
+set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
+set(gst_plugin_debug_files
     libdshowsrcwrapper.dll
     libfsselector.dll
     libfsvalve.dll
@@ -173,10 +173,10 @@ set(gst_plugin_release_files
     )
 
 copy_if_different(
-    ${gst_plugin_release_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins"
+    ${gst_plugin_debug_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins"
     out_targets 
-    ${gst_plugin_release_files}
+    ${gst_plugin_debug_files}
     )
 set(all_targets ${all_targets} ${out_targets})
 
@@ -184,11 +184,8 @@ set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
 set(vivox_files
     tntk.dll
     libeay32.dll
-    SLVoice.exe
     ssleay32.dll
-    SLVoiceAgent.exe
     srtp.dll
-    vivoxsdk.dll
     ortp.dll
     wrap_oal.dll
     )
@@ -414,4 +411,4 @@ if (MSVC80)
     endif (EXISTS ${release_msvc8_redist_path})
 endif (MSVC80)
 
-add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
+add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
\ No newline at end of file
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index fc256a8..b4b984d 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -10,6 +10,8 @@ include(Prebuilt)
 if (WINDOWS)
 
   use_prebuilt_binary(libxml)
+  use_prebuilt_binary(iconv)
+  use_prebuilt_binary(gstreamer-plugins)
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_INCLUDE_DIRS
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index f24ec22..5e71f66 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -12,7 +12,7 @@ if (OPENAL)
   if (WINDOWS)
   find_library(OPENAL_LIB
     NAMES openal openal32 OpenAL OpenAL32 wrap_oal
-    PATHS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/libraries/i686-win32/lib/release/
+    PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
     )
 
   else (WINDOWS)
@@ -20,7 +20,8 @@ if (OPENAL)
     NAMES openal openal32 OpenAL OpenAL32 wrap_oal
     PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
     )
-
+  endif (WINDOWS)
+  
   if (NOT OPENAL_LIB)
     message(FATAL_ERROR "OpenAL not found!")
   else (NOT OPENAL_LIB)
@@ -46,10 +47,18 @@ if (OPENAL)
 
   # ALUT_LIB
 
+  if (WINDOWS)
+   find_library(ALUT_LIB
+   NAMES alut freealut
+   PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+   )
+  
+  else (WINDOWS) 
   find_library(ALUT_LIB
     NAMES alut freealut
     PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
     )
+  endif (WINDOWS)
 
   if (NOT ALUT_LIB)
     message(FATAL_ERROR "ALUT not found!")
diff --git a/linden/install.xml b/linden/install.xml
index 083e2e2..7527eec 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -393,7 +393,7 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>B6B8B7A2CEB038C31BAD0EE4A1FBDF41</string>
+            <string>d5bfaa397dfbfc893603ad047c57604d</string>
             <key>url</key>
             <uri>http://imprudence.s3.amazonaws.com/extras/glib-2.18.3.1-windows-01262009.tar.bz2</uri>
           </map>
@@ -430,7 +430,7 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>F4005971943595712212C4E0B9418DB5</string>
+            <string>0fd4d4a96efaf8b47d6cc74e7a927800</string>
             <key>url</key>
             <uri>http://imprudence.s3.amazonaws.com/extras/gstreamer-0.10.21-windows-01262009.tar.bz2</uri>
           </map>
@@ -445,7 +445,7 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>2EF5DD08E6026325152C83E72308E282</string>
+            <string>d69f66f4698c5608c86d1a108e3a2d1f</string>
             <key>url</key>
             <uri>http://imprudence.s3.amazonaws.com/extras/gstreamer-plugins-windows-01312009.tar.bz2</uri>
           </map>
@@ -519,7 +519,7 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>F20BDA1058BFD3AF7AC2C23EB3FD7F12</string>
+            <string>055ff15814c5f5cc09b0a9891ca7c90a</string>
             <key>url</key>
             <uri>http://imprudence.s3.amazonaws.com/extras/iconv-1.9.2-windows-01262009.tar.bz2</uri>
           </map>
@@ -679,7 +679,7 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>E8DACED68B2165918B82C771D3480AA2</string>
+            <string>d96f950a877836b644f5bd047eb52151</string>
             <key>url</key>
             <uri>http://imprudence.s3.amazonaws.com/extras/libxml2-2.7.2-windows-01262009.tar.bz2</uri>
           </map>
@@ -855,7 +855,7 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>80C8AA77BDE113635FEABCD0E342F3C0</string>
+            <string>7c33758dc0a047c244de03133dd76c2a</string>
             <key>url</key>
             <uri>http://imprudence.s3.amazonaws.com/extras/openal-soft-1.6.372-windows-01262009.tar.bz2</uri>
           </map>