Changeset 10018 for ps

Timestamp:

08/17/11 00:08:47 (13 years ago)

Author:

ben

Message:

Fixes manifest dependencies for Actor Editor. Fixes #924.

Location:

ps/trunk

Files:

• build/premake/premake.lua (modified) (1 diff)
• build/premake/premake4.lua (modified) (2 diffs)
• source/tools/atlas/AtlasFrontends/ActorEditor.cpp (modified) (2 diffs)

ps/trunk/build/premake/premake.lua

@@ -904 +904 @@
         -- required to use WinMain() on Windows, otherwise will default to main()
         tinsert(package.buildflags, "no-main")
+        
+        -- 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)
+        package.linkoptions = {
+            ""/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'"",
+        }
+        
+        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'"",
+        }
 
     else -- Non-Windows, = Unix

ps/trunk/build/premake/premake4.lua

@@ -669 +669 @@
         }
 
+        -- see manifest.cpp
         project_add_manifest()
 
@@ -874 +875 @@
         -- required to use WinMain() on Windows, otherwise will default to main()
         flags { "WinMain" }
+        
+        -- see manifest.cpp
+        project_add_manifest()
 
     else -- Non-Windows, = Unix

ps/trunk/source/tools/atlas/AtlasFrontends/ActorEditor.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -21 +21 @@
 # include <windows.h>
 
-// Use WinXP-style controls
-# if _MSC_VER >= 1400 // (can't be bothered to implement this for VC7.1...)
-#  pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
-# endif
+/* Don't use pragmas here to set the manifests, instead do this in premake4.lua
+ * since pragmas get ignored by the autobuilder
+ * (see comments in lib\sysdep\os\win\manifest.cpp)
+ */
 
 # define ATLASDLLIMPEXP extern "C" __declspec(dllimport)