develop.py should now work again under windows

3 files changed, 24 insertions, 16 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!")