forked from mirrors/0ad
janwas
04127c7af3
- topology.cpp: modify interface due to thread-safety issue. caller is now responsible for ensuring the first _Detect call isn't reentered; everything else is safe. - fix thread-safety issue in wnuma; use winit mechanism to ensure it's ready before use - VFS now takes a cacheSize parameter (required for being able to disable read-only file caches for the image loader at work) - allow dynarray that isn't actually holding memory - debug_stl: VC9 fix (disable this code except on the exact STL version on which it was tested) - zlib, lib_api: changes to macro used to toggle between static and dynamic linking - add boost filesystem header in external_libraries - amd64: cpu_ topology functions are now provided by x86_x64 - cpu: remove cpu_ClockFrequency (dangerous, may be tempting to use during WHRT init which would cause a crash). use x86_x64_ClockFrequency or os_cpu_ClockFrequency instead. - werrno: cope with newer boost versions - wmman: follow SUSv3 in rejecting zero-length mappings This was SVN commit r5954.
21 lines
974 B
C++
21 lines
974 B
C++
#include "precompiled.h"
|
|
|
|
/*
|
|
To use XP-style themed controls, we need to use the manifest to specify the
|
|
desired version. (This must be set in the game's .exe in order to affect Atlas.)
|
|
|
|
For VC7.1, we use manifest.rc to include a complete manifest file.
|
|
For VC8.0, which already generates its own manifest, we use the line below
|
|
to add the necessary parts to that generated manifest.
|
|
|
|
ICC 10.1 IPO considers this string to be an input file, hence this
|
|
is currently disabled there.
|
|
*/
|
|
#if MSC_VERSION >= 1400 && !ICC_VERSION && defined(LIB_STATIC_LINK)
|
|
# if ARCH_IA32
|
|
# pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
|
|
# elif ARCH_AMD64
|
|
# pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x64' publicKeyToken='6595b64144ccf1df'\"")
|
|
# endif
|
|
#endif
|