diff --git a/binaries/system/AtlasUI.dll.2.config b/binaries/system/AtlasUI.dll.2.config
deleted file mode 100644
index abd0eeba5c..0000000000
--- a/binaries/system/AtlasUI.dll.2.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/binaries/system/AtlasUI_dbg.dll.2.config b/binaries/system/AtlasUI_dbg.dll.2.config
deleted file mode 100644
index abd0eeba5c..0000000000
--- a/binaries/system/AtlasUI_dbg.dll.2.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/binaries/system/Microsoft.VC80.CRT.manifest b/binaries/system/Microsoft.VC80.CRT.manifest
deleted file mode 100644
index 942319e450..0000000000
--- a/binaries/system/Microsoft.VC80.CRT.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- TM0VvywbHVQayIOw9CSX6M7WpaM=
- vHzmAnClhFBZaqPj5dCpn3MTM9k=
- 5mXwc/jrpkgtj6JtWiE8YH2EcOw=
-
\ No newline at end of file
diff --git a/binaries/system/Microsoft.VC80.DebugCRT.manifest b/binaries/system/Microsoft.VC80.DebugCRT.manifest
deleted file mode 100644
index 71e5c7c34c..0000000000
--- a/binaries/system/Microsoft.VC80.DebugCRT.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- DyVgdBbmpVI7XBzhGT92Vf6Uleo=
- wsDR/YqqqHavJi4eNO608bvRB60=
- gOqEXLQHFS0lhBRsdQz6Uo5nWGs=
-
\ No newline at end of file
diff --git a/binaries/system/Microsoft.VC90.CRT.manifest b/binaries/system/Microsoft.VC90.CRT.manifest
deleted file mode 100644
index d3a615b7b9..0000000000
--- a/binaries/system/Microsoft.VC90.CRT.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/binaries/system/Microsoft.VC90.DebugCRT.manifest b/binaries/system/Microsoft.VC90.DebugCRT.manifest
deleted file mode 100644
index 7c25353d10..0000000000
--- a/binaries/system/Microsoft.VC90.DebugCRT.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/binaries/system/Microsoft.VC90.DebugOpenMP.manifest b/binaries/system/Microsoft.VC90.DebugOpenMP.manifest
deleted file mode 100644
index 7576ef0c11..0000000000
--- a/binaries/system/Microsoft.VC90.DebugOpenMP.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/binaries/system/Microsoft.VC90.OpenMP.manifest b/binaries/system/Microsoft.VC90.OpenMP.manifest
deleted file mode 100644
index 2ee5091903..0000000000
--- a/binaries/system/Microsoft.VC90.OpenMP.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/binaries/system/pyrogenesis_dbg.exe.config b/binaries/system/pyrogenesis_dbg.exe.config
deleted file mode 100644
index f8a48317b0..0000000000
--- a/binaries/system/pyrogenesis_dbg.exe.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/binaries/system/test_dbg.exe.config b/binaries/system/test_dbg.exe.config
deleted file mode 100644
index f8a48317b0..0000000000
--- a/binaries/system/test_dbg.exe.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/premake/premake4.lua b/build/premake/premake4.lua
index 80522f8866..f73ecd5e53 100644
--- a/build/premake/premake4.lua
+++ b/build/premake/premake4.lua
@@ -502,11 +502,6 @@ end
-- (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
--------------------------------------------------------------------------------
diff --git a/source/lib/sysdep/os/win/manifest.cpp b/source/lib/sysdep/os/win/manifest.cpp
index e575f11601..e4b7478b6c 100644
--- a/source/lib/sysdep/os/win/manifest.cpp
+++ b/source/lib/sysdep/os/win/manifest.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Wildfire Games
+/* Copyright (c) 2015 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -40,21 +40,6 @@ is currently disabled there.
# pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df'\"")
# endif
-/*
-The game uses some DLLs that were built with VC80. The CRT DLL wants to find itself
-inside the executable's manifest, else it complains with R6034.
-If we're building with VC90+, we need to explicitly include the appropriate manifest
-entries (in addition to the VC90 CRT entries that will be added automatically).
-(This is kind of a dirty hack.)
-*/
-#if MSC_VERSION >= 1500 && ARCH_IA32
-# ifdef NDEBUG
-# pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"")
-# else
-# pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.VC80.DebugCRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"")
-# endif
-#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.