More manifest gymnastics

indra/newview/CMakeLists.txt

@@ -1870,7 +1870,7 @@ if (WINDOWS)
 	  -E
 	  copy_if_different
 	  ${RUNTIME_LIB}
-	  ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+	  ${CMAKE_CURRENT_BINARY_DIR}
 	  COMMENT "Copying ${RUNTIME_LIB} to the runtime folder."
 	  )
     ENDFOREACH(RUNTIME_LIB ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})

indra/newview/viewer_manifest.py

@@ -305,11 +305,16 @@ class WindowsManifest(ViewerManifest):
         if not self.is_win64():
             self.path(release_lib_dir+"/libtcmalloc_minimal.dll", dst="libtcmalloc_minimal.dll")
 
+        #try:
+        #    if self.prefix(release_lib_dir+"/msvcrt", dst=""):
+        #        self.path("*.dll")
+        #        self.path("*.manifest")
+        #        self.end_prefix()
+        #except:
+        #    pass
+        
         try:
-            if self.prefix(release_lib_dir+"/msvcrt", dst=""):
-                self.path("*.dll")
-                self.path("*.manifest")
-                self.end_prefix()
+            self.path("msvc*.dll")
         except:
             pass