Added architecture details to DLL's descriptions

Bug 18999966 Change-Id: If5efde5dfb6ae30f43b63358cf4f2e0ebfda38cc Reviewed-on: https://swiftshader-review.googlesource.com/1703Tested-by: Maxime Grégoire <mgregoire@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Added architecture details to DLL's descriptions
88482256 · Maxime Gregoire · Maxime Grégoire · 0b3757b4 · 88482256 · 88482256
Commit 88482256 authored Jan 14, 2015 by Maxime Gregoire Committed by Maxime Grégoire Jan 19, 2015
11 changed files
--- a/src/OpenGL/libEGL/libEGL.rc
+++ b/src/OpenGL/libEGL/libEGL.rc
@@ -68,7 +68,11 @@ BEGIN
    BEGIN
        BLOCK "040904b0"
        BEGIN
-            VALUE "FileDescription", "SwiftShader libEGL Dynamic Link Library"
+			#ifdef WIN64
+				VALUE "FileDescription", "SwiftShader libEGL 64-bit Dynamic Link Library"
+			#else
+				VALUE "FileDescription", "SwiftShader libEGL 32-bit Dynamic Link Library"
+			#endif
            VALUE "FileVersion", VERSION_STRING
            VALUE "InternalName", "libEGL"
            VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."

--- a/src/OpenGL/libEGL/libEGL.vcxproj
+++ b/src/OpenGL/libEGL/libEGL.vcxproj
@@ -170,6 +170,9 @@ copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platfor
 mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\"
 copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libEGL_translator.dll"</Command>
    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
+    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -227,6 +230,9 @@ copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platfor
 mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\"
 copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libEGL_translator.dll"</Command>
    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
+    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
    <ClCompile>

--- a/src/OpenGL/libGLES_CM/libGLES_CM.rc
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.rc
@@ -70,7 +70,11 @@ BEGIN
    BEGIN
        BLOCK "040904b0"
        BEGIN
-            VALUE "FileDescription", "SwiftShader libGLES_CM Dynamic Link Library"
+			#ifdef WIN64
+				VALUE "FileDescription", "SwiftShader libGLES_CM 64-bit Dynamic Link Library"
+			#else
+				VALUE "FileDescription", "SwiftShader libGLES_CM 32-bit Dynamic Link Library"
+			#endif
            VALUE "FileVersion", VERSION_STRING
            VALUE "InternalName", "libGLES_CM"
            VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."

--- a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
@@ -174,6 +174,9 @@ copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Pla
 mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\"
 copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command>
    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
+    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -243,6 +246,9 @@ copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Pla
 mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\"
 copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command>
    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
+    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
    <ClCompile>

--- a/src/OpenGL/libGLESv2/libGLESv2.rc
+++ b/src/OpenGL/libGLESv2/libGLESv2.rc
@@ -70,7 +70,11 @@ BEGIN
    BEGIN
        BLOCK "040904b0"
        BEGIN
-            VALUE "FileDescription", "SwiftShader libGLESv2 Dynamic Link Library"
+			#ifdef WIN64
+				VALUE "FileDescription", "SwiftShader libGLESv2 64-bit Dynamic Link Library"
+			#else
+				VALUE "FileDescription", "SwiftShader libGLESv2 32-bit Dynamic Link Library"
+			#endif             
            VALUE "FileVersion", VERSION_STRING
            VALUE "InternalName", "libGLESv2"
            VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."

--- a/src/OpenGL/libGLESv2/libGLESv2.vcxproj
+++ b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
@@ -174,6 +174,9 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
 mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
+    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -243,6 +246,9 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
 mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
+    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
    <ClCompile>

--- a/src/Radiance/compiler/Compiler.vcxproj
+++ b/src/Radiance/compiler/Compiler.vcxproj
--- a/src/Radiance/compiler/preprocessor/preprocessor.vcxproj
+++ b/src/Radiance/compiler/preprocessor/preprocessor.vcxproj
@@ -5,10 +5,18 @@
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{6303975E-7060-4CE7-8090-CB2DE0B840B4}</ProjectGuid>
@@ -21,6 +29,12 @@
    <CharacterSet>NotSet</CharacterSet>
    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
@@ -28,15 +42,28 @@
    <CharacterSet>NotSet</CharacterSet>
    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -49,6 +76,16 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@@ -63,6 +100,20 @@
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="Diagnostics.h" />
    <ClInclude Include="DirectiveHandler.h" />

--- a/src/Radiance/libRAD/libRAD.rc
+++ b/src/Radiance/libRAD/libRAD.rc
@@ -68,6 +68,11 @@ BEGIN
    BEGIN
        BLOCK "040904b0"
        BEGIN
+			#ifdef WIN64
+				VALUE "FileDescription", "SwiftShader libRAD 64-bit Dynamic Link Library"
+			#else
+				VALUE "FileDescription", "SwiftShader libRAD 32-bit Dynamic Link Library"
+			#endif
            VALUE "FileDescription", "SwiftShader libRAD Dynamic Link Library"
            VALUE "FileVersion", VERSION_STRING
            VALUE "InternalName", "libRAD"

--- a/src/Radiance/libRAD/libRAD.vcxproj
+++ b/src/Radiance/libRAD/libRAD.vcxproj
--- a/src/SwiftShader.sln
+++ b/src/SwiftShader.sln
@@ -665,7 +665,8 @@ Global
 		{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Profile|x64.ActiveCfg = Profile|Win32
 		{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|Win32.ActiveCfg = Release|Win32
 		{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|Win32.Build.0 = Release|Win32
-		{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|x64.ActiveCfg = Release|Win32
+		{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|x64.ActiveCfg = Release|x64
+		{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|x64.Build.0 = Release|x64
 		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|Win32.Build.0 = Debug|Win32
 		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|x64.ActiveCfg = Debug|Win32
@@ -674,7 +675,8 @@ Global
 		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Profile|x64.ActiveCfg = Profile|Win32
 		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|Win32.ActiveCfg = Release|Win32
 		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|Win32.Build.0 = Release|Win32
-		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|x64.ActiveCfg = Release|Win32
+		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|x64.ActiveCfg = Release|x64
+		{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|x64.Build.0 = Release|x64
 		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|Win32.Build.0 = Debug|Win32
 		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|x64.ActiveCfg = Debug|Win32
@@ -683,7 +685,8 @@ Global
 		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Profile|x64.ActiveCfg = Release|Win32
 		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|Win32.ActiveCfg = Release|Win32
 		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|Win32.Build.0 = Release|Win32
-		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|x64.ActiveCfg = Release|Win32
+		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|x64.ActiveCfg = Release|x64
+		{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|x64.Build.0 = Release|x64
 		{B4537008-1302-4EE7-98C8-6897472B9E36}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B4537008-1302-4EE7-98C8-6897472B9E36}.Debug|Win32.Build.0 = Debug|Win32
 		{B4537008-1302-4EE7-98C8-6897472B9E36}.Debug|x64.ActiveCfg = Debug|Win32
@@ -692,7 +695,8 @@ Global
 		{B4537008-1302-4EE7-98C8-6897472B9E36}.Profile|x64.ActiveCfg = Release|Win32
 		{B4537008-1302-4EE7-98C8-6897472B9E36}.Release|Win32.ActiveCfg = Release|Win32
 		{B4537008-1302-4EE7-98C8-6897472B9E36}.Release|Win32.Build.0 = Release|Win32
-		{B4537008-1302-4EE7-98C8-6897472B9E36}.Release|x64.ActiveCfg = Release|Win32
+		{B4537008-1302-4EE7-98C8-6897472B9E36}.Release|x64.ActiveCfg = Release|x64
+		{B4537008-1302-4EE7-98C8-6897472B9E36}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE