From f791a61c4679961f0cca4f4dd11c61aa654caa1f Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Mon, 24 Apr 2006 18:01:01 +0000 Subject: [PATCH] # Fixed SxS CRT usage. Also added wx's .rc file to Atlas. This was SVN commit r3812. --- binaries/system/Microsoft.VC80.CRT.manifest | 15 +++++++++++++++ binaries/system/Microsoft.VC80.DebugCRT.manifest | 15 +++++++++++++++ build/premake/premake.lua | 4 ++-- source/tools/atlas/AtlasFrontends/ActorEditor.cpp | 3 +++ .../tools/atlas/AtlasFrontends/ArchiveViewer.cpp | 3 +++ .../tools/atlas/AtlasFrontends/ColourTester.cpp | 3 +++ .../tools/atlas/AtlasFrontends/FileConverter.cpp | 3 +++ .../atlas/AtlasFrontends/FileConverter.vcproj | 2 +- source/tools/atlas/AtlasFrontends/_template.cpp | 3 +++ .../atlas/AtlasUI/Misc/{icons.rc => atlas.rc} | 3 +++ 10 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 binaries/system/Microsoft.VC80.CRT.manifest create mode 100644 binaries/system/Microsoft.VC80.DebugCRT.manifest rename source/tools/atlas/AtlasUI/Misc/{icons.rc => atlas.rc} (86%) diff --git a/binaries/system/Microsoft.VC80.CRT.manifest b/binaries/system/Microsoft.VC80.CRT.manifest new file mode 100644 index 0000000000..217731fbb2 --- /dev/null +++ b/binaries/system/Microsoft.VC80.CRT.manifest @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/binaries/system/Microsoft.VC80.DebugCRT.manifest b/binaries/system/Microsoft.VC80.DebugCRT.manifest new file mode 100644 index 0000000000..ff6f51b1cb --- /dev/null +++ b/binaries/system/Microsoft.VC80.DebugCRT.manifest @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/build/premake/premake.lua b/build/premake/premake.lua index e10b162a1a..f480342342 100755 --- a/build/premake/premake.lua +++ b/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", { diff --git a/source/tools/atlas/AtlasFrontends/ActorEditor.cpp b/source/tools/atlas/AtlasFrontends/ActorEditor.cpp index afbb7f4763..ec885fd070 100644 --- a/source/tools/atlas/AtlasFrontends/ActorEditor.cpp +++ b/source/tools/atlas/AtlasFrontends/ActorEditor.cpp @@ -1,6 +1,9 @@ #define WIN32_LEAN_AND_MEAN #include +// 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" diff --git a/source/tools/atlas/AtlasFrontends/ArchiveViewer.cpp b/source/tools/atlas/AtlasFrontends/ArchiveViewer.cpp index 5d30d0718f..1e2f0360d7 100644 --- a/source/tools/atlas/AtlasFrontends/ArchiveViewer.cpp +++ b/source/tools/atlas/AtlasFrontends/ArchiveViewer.cpp @@ -1,6 +1,9 @@ #define WIN32_LEAN_AND_MEAN #include +// 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" diff --git a/source/tools/atlas/AtlasFrontends/ColourTester.cpp b/source/tools/atlas/AtlasFrontends/ColourTester.cpp index 58955cb100..4ca83bf579 100644 --- a/source/tools/atlas/AtlasFrontends/ColourTester.cpp +++ b/source/tools/atlas/AtlasFrontends/ColourTester.cpp @@ -1,6 +1,9 @@ #define WIN32_LEAN_AND_MEAN #include +// 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" diff --git a/source/tools/atlas/AtlasFrontends/FileConverter.cpp b/source/tools/atlas/AtlasFrontends/FileConverter.cpp index 6b69715372..c0ef09e15d 100644 --- a/source/tools/atlas/AtlasFrontends/FileConverter.cpp +++ b/source/tools/atlas/AtlasFrontends/FileConverter.cpp @@ -1,6 +1,9 @@ #define WIN32_LEAN_AND_MEAN #include +// 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" diff --git a/source/tools/atlas/AtlasFrontends/FileConverter.vcproj b/source/tools/atlas/AtlasFrontends/FileConverter.vcproj index f844c61c78..b5a09f2209 100644 --- a/source/tools/atlas/AtlasFrontends/FileConverter.vcproj +++ b/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"> +// 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" diff --git a/source/tools/atlas/AtlasUI/Misc/icons.rc b/source/tools/atlas/AtlasUI/Misc/atlas.rc similarity index 86% rename from source/tools/atlas/AtlasUI/Misc/icons.rc rename to source/tools/atlas/AtlasUI/Misc/atlas.rc index 2d97f514ea..7076e9b70e 100644 --- a/source/tools/atlas/AtlasUI/Misc/icons.rc +++ b/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"