Changeset 9607 for ps

Timestamp:

06/10/11 01:16:27 (14 years ago)

Author:

philip

Message:

Attempt to fix manifest problems in autobuild.

Location:

ps/trunk

Files:

• build/premake/premake.lua (modified) (1 diff)
• source/lib/sysdep/os/win/manifest.cpp (modified) (1 diff)

ps/trunk/build/premake/premake.lua

@@ -672 +672 @@
             
             -- allow manual unload of delay-loaded DLLs
-            "/DELAY:UNLOAD"
+            "/DELAY:UNLOAD",
+
+            -- see manifest.cpp
+            -- (we need to use " because Premake emits this string directly
+            -- into a double-quoted attribute value in the project XML files
+            -- with no automatic escaping)
+            ""/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'"",
+        }
+
+        -- see manifest.cpp
+        package.config["Debug"].linkoptions = {
+            ""/manifestdependency:type='win32' name='Microsoft.VC80.DebugCRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'"",
+        }
+        package.config["Release"].linkoptions = {
+            ""/manifestdependency:type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'"",
         }
 

ps/trunk/source/lib/sysdep/os/win/manifest.cpp

@@ -56 +56 @@
 #endif
 
+/*
+NOTE: vcbuild.exe (as used by the autobuilder) seems to ignore these linker
+comments, so we have to duplicate these commands into premake.lua too.
+Remember to keep them in sync with this file.
+(Duplicate entries appear to get omitted from the .manifest file so there
+should be no harmful effects.)
+*/
+
 #endif