# Fixed SxS CRT usage.

Also added wx's .rc file to Atlas.

This was SVN commit r3812.

binaries/system/Microsoft.VC80.CRT.manifest

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1981-2001 Microsoft Corporation -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity 
+        type="win32" 
+        name="Microsoft.VC80.CRT" 
+        version="8.0.50608.0" 
+        processorArchitecture="x86" 
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr80.dll"/>
+    <file name="msvcp80.dll"/>
+    <file name="msvcm80.dll"/>
+</assembly>

binaries/system/Microsoft.VC80.DebugCRT.manifest

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1981-2001 Microsoft Corporation -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity 
+        type="win32" 
+        name="Microsoft.VC80.DebugCRT" 
+        version="8.0.50608.0"
+        processorArchitecture="x86" 
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr80d.dll"/>
+    <file name="msvcp80d.dll"/>
+    <file name="msvcm80d.dll"/>
+</assembly>

build/premake/premake.lua

@@ -22,7 +22,7 @@ function create_package()
 	package = newpackage()
 	package.path = project.path
 	package.language = "c++"
-	package.buildflags = { "no-manifest", "with-symbols", "no-edit-and-continue" }
+	package.buildflags = { "with-symbols", "no-edit-and-continue" }
 	return package
 end
 
@@ -445,7 +445,7 @@ function setuppackages_atlas()
 		wx = 1,
 		xerces = 1,
 		depends = { "AtlasObject", "DatafileIO" },
-		extrasource = { "/Misc/icons.rc" }
+		extrasource = { "/Misc/atlas.rc" }
 	})
 
 	setuppackage_atlas("DatafileIO", "lib", {

source/tools/atlas/AtlasFrontends/ActorEditor.cpp

@@ -1,6 +1,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+// Use WinXP-style controls
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
+
 #define ATLASDLLIMPEXP extern "C" __declspec(dllimport)
 
 #include "AtlasUI/Misc/DLLInterface.h"

source/tools/atlas/AtlasFrontends/ArchiveViewer.cpp

@@ -1,6 +1,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+// Use WinXP-style controls
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
+
 #define ATLASDLLIMPEXP extern "C" __declspec(dllimport)
 
 #include "AtlasUI/Misc/DLLInterface.h"

source/tools/atlas/AtlasFrontends/ColourTester.cpp

@@ -1,6 +1,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+// Use WinXP-style controls
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
+
 #define ATLASDLLIMPEXP extern "C" __declspec(dllimport)
 
 #include "AtlasUI/Misc/DLLInterface.h"

source/tools/atlas/AtlasFrontends/FileConverter.cpp

@@ -1,6 +1,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+// Use WinXP-style controls
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
+
 #define ATLASDLLIMPEXP extern "C" __declspec(dllimport)
 
 #include "AtlasUI/Misc/DLLInterface.h"

source/tools/atlas/AtlasFrontends/FileConverter.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="FileConverter"
-	ProjectGUID="{65124F90-05DB-4B9C-9C69-7E22632359C4}"
+	ProjectGUID=""
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform

source/tools/atlas/AtlasFrontends/_template.cpp

@@ -1,6 +1,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+// Use WinXP-style controls
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
+
 #define ATLASDLLIMPEXP extern "C" __declspec(dllimport)
 
 #include "AtlasUI/Misc/DLLInterface.h"

source/tools/atlas/AtlasUI/Misc/atlas.rc

@@ -3,3 +3,6 @@ ICON_ColourTester       ICON                    "Graphics\\ColourTester.ico"
 ICON_ArchiveViewer      ICON                    "Graphics\\ArchiveViewer.ico"
 ICON_FileConverter      ICON                    "Graphics\\FileConverter.ico"
 ICON_ScenarioEditor     ICON                    "Graphics\\ScenarioEditor.ico"
+
+#define wxUSE_NO_MANIFEST 1
+#include "wx/msw/wx.rc"