New branch for building with nmake.

This is a branch, coz it's still crap.

2 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index b9c41fc..9172aa0 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1326,7 +1326,7 @@ if (WINDOWS)
 
     # sets the 'working directory' for debugging from visual studio.
     if (NOT UNATTENDED)
-                if (NOT self.using_express)
+                if (USE_VSTOOL)
                         add_custom_command(
                                 TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
                                 COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
@@ -1338,7 +1338,7 @@ if (WINDOWS)
                                   ${CMAKE_CURRENT_SOURCE_DIR}
                                 COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
                                 )
-                endif (NOT self.using_express)
+                endif (USE_VSTOOL)
     endif (NOT UNATTENDED)
 
     add_custom_command(
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index bcdf4a9..718c3d2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -244,7 +244,7 @@ class WindowsManifest(ViewerManifest):
         elif self.configuration().lower() == "debug":
             self.path(self.find_existing_file('debug/imprudence-bin.exe'), dst=self.final_exe())
         else:
-            self.path(self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe'), dst=self.final_exe())
+            self.path(self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe', 'imprudence-bin.exe'), dst=self.final_exe())
 
         # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied
         symbol_ver = '.'.join(self.args['version'])
@@ -281,7 +281,7 @@ class WindowsManifest(ViewerManifest):
         #self.path("fmod.dll")
 
         # For spellchecking
-        if self.prefix(src=self.args['configuration'], dst=""):
+        if self.prefix(src=os.path.join(self.args['configuration'], "Release"), dst=""):
             self.path("libhunspell.dll")
             self.end_prefix()
 
@@ -289,12 +289,12 @@ class WindowsManifest(ViewerManifest):
         self.path("llkdu.dll.2.config")
 
         # Get llcommon and deps.
-        if self.prefix(src=self.args['configuration'], dst=""):
+        if self.prefix(src=os.path.join(self.args['configuration'], "Release"), dst=""):
             self.path('libapr-1.dll')
             self.path('libaprutil-1.dll')
             self.path('libapriconv-1.dll')
-            self.path('llcommon.dll')
             self.end_prefix()
+            self.path('llcommon.dll')
 
         # For textures
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):