Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes manifest dependencies for Actor Editor. Fixes #924.

Browse Source 
This was SVN commit r10018.
This commit is contained in:
historic_bruno 2011-08-16 22:08:47 +00:00
parent 609f1643d5
commit fab7bf4fcf
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/premake/premake.lua
View File

@ -903,6 +903,21 @@ function setup_atlas_frontend_package (package_name)
-- 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
if options["aoe3ed"] then

4
build/premake/premake4.lua
View File

@ -668,6 +668,7 @@ function setup_main_exe ()
"/DELAY:UNLOAD",
}
-- see manifest.cpp
project_add_manifest()
elseif os.is("linux") then
@ -873,6 +874,9 @@ function setup_atlas_frontend_project (project_name)
-- required to use WinMain() on Windows, otherwise will default to main()
flags { "WinMain" }
-- see manifest.cpp
project_add_manifest()
else -- Non-Windows, = Unix
if _OPTIONS["aoe3ed"] then

10
source/tools/atlas/AtlasFrontends/ActorEditor.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2011 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -20,10 +20,10 @@
# define WIN32_LEAN_AND_MEAN
# 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)
#else