Merged in my latest changes including switching LLAPRSockStream to be fully non-blocking (and thus not horribly inefficient) and a bunch of new event listener implementations.

2 files changed, 24 insertions, 10 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a8c9e6a31d..82a1419210 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -38,10 +38,6 @@ include(LLKDU)
 include(ViewerMiscLibs)
 include(LLLogin)
 
-if (WINDOWS)
-    include(CopyWinLibs)
-endif (WINDOWS)
-
 include_directories(
     ${DBUSGLIB_INCLUDE_DIRS}
     ${ELFIO_INCLUDE_DIR}
@@ -1256,7 +1252,23 @@ if (WINDOWS)
         COMMENT "Copying message.xml to the runtime folder."
         )
        
-    add_dependencies(${VIEWER_BINARY_NAME} copy_win_libs)
+    if(WINDOWS)
+      # Copy Win Libs...
+      # This happens at build time, not config time. We can't glob files in this cmake.
+      # *FIX:Mani Write a sub script to glob the files...
+      add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_directory
+          ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}
+         ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+        COMMENT "Copying staged dlls."
+        )
+    endif(WINDOWS)
+    
+    
 
     if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
       add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7edf0bad6b..0217c8f864 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -168,9 +168,8 @@ class WindowsManifest(ViewerManifest):
 

         # need to get the llcommon.dll from any of the build directories as well

         try:

-            self.path(self.find_existing_file('../llcommon/%s/llcommon.dll' % self.args['configuration']),

-                  dst='llcommon.dll')

             if self.prefix(src=self.args['configuration'], dst=""):

+                self.path('llcommon.dll')

                 self.path('libapr-1.dll')

                 self.path('libaprutil-1.dll')

                 self.path('libapriconv-1.dll')

@@ -181,8 +180,7 @@ class WindowsManifest(ViewerManifest):
 

         # need to get the kdu dll from any of the build directories as well

         try:

-            self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'],

-                '../../libraries/i686-win32/lib/release/llkdu.dll'), 

+            self.path(self.find_existing_file('%s/llkdu.dll' % self.args['configuration']), 

                   dst='llkdu.dll')

             pass

         except:

@@ -394,7 +392,11 @@ class WindowsManifest(ViewerManifest):
 

         # We use the Unicode version of NSIS, available from

         # http://www.scratchpaper.com/

-        NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'

+        # Check two paths, one for Program Files, and one for Program Files (x86).

+        # Yay 64bit windows.

+        NSIS_path = os.path.expandvars('${ProgramFiles}\\NSIS\\Unicode\\makensis.exe')

+        if not os.path.exists(NSIS_path):

+            NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\Unicode\\makensis.exe')

         self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))

         # self.remove(self.dst_path_of(tempfile))

         # If we're on a build machine, sign the code using our Authenticode certificate. JC