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

Set up manifest via linkoptions for test executable

Browse Source 
This was SVN commit r9836.
This commit is contained in:
Ykkrosh 2011-07-15 22:45:50 +00:00
parent 5dd08d3cb0
commit e8e4d37c8d
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/premake/premake4.lua
View File

@ -362,6 +362,17 @@ function project_add_contents(source_root, rel_source_dirs, rel_include_dirs, ex
end
-- Add command-line options to set up the manifest dependencies for Windows
-- (See lib/sysdep/os/win/manifest.cpp)
function project_add_manifest()
linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"" }
configuration "Debug"
linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.VC80.DebugCRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"" }
configuration "Release"
linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"" }
configuration { }
end
--------------------------------------------------------------------------------
-- engine static libraries
--------------------------------------------------------------------------------
@ -655,17 +666,9 @@ function setup_main_exe ()
-- allow manual unload of delay-loaded DLLs
"/DELAY:UNLOAD",
-- see manifest.cpp
"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\""
}
-- see manifest.cpp
configuration "Debug"
linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.VC80.DebugCRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"" }
configuration "Release"
linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"" }
configuration { }
project_add_manifest()
elseif os.is("linux") then
@ -1065,6 +1068,8 @@ function setup_tests()
-- see wstartup.h
linkoptions { "/INCLUDE:_wstartup_InitAndRegisterShutdown" }
project_add_manifest()
elseif os.is("linux") then
links {