Add darkplaces.rc to the vcxproj files for sdl, sdl2 and dedicated targets.

Changed the CompanyName in the darkplaces.rc to "DarkPlaces Contributors", also changed the icon line to better match the standard ICON line in new VS2013 projects in case that matters.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12225 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=cbf399e8fa61dff35420bdc717e80c2764cef759

diff --git a/darkplaces-dedicated-vs2010.vcxproj b/darkplaces-dedicated-vs2010.vcxproj
index 92b37c95a4271fa0cf0d64ec43118ec637819e82..8a231197f0a382d7540b8d00639ac1435cc38945 100644 (file)
--- a/darkplaces-dedicated-vs2010.vcxproj
+++ b/darkplaces-dedicated-vs2010.vcxproj
@@ -278,6 +278,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-dedicated-vs2012.vcxproj b/darkplaces-dedicated-vs2012.vcxproj
index 0f17ffef678e5077ea0a92c170d7b368d3fb5fd0..524d37c49fa19d6b929d4da6a260427ec7404d27 100644 (file)
--- a/darkplaces-dedicated-vs2012.vcxproj
+++ b/darkplaces-dedicated-vs2012.vcxproj
@@ -369,6 +369,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-dedicated-vs2013.vcxproj b/darkplaces-dedicated-vs2013.vcxproj
index 4a85b17074cb7e6c343734881959165f7b997f37..6fc6f68c1af69909bc33ec21a17efeee2f6f8c98 100644 (file)
--- a/darkplaces-dedicated-vs2013.vcxproj
+++ b/darkplaces-dedicated-vs2013.vcxproj
@@ -378,6 +378,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-sdl-vs2010.vcxproj b/darkplaces-sdl-vs2010.vcxproj
index 4d93ef332511f57bfe3598376658f3692281c0c3..37c091fbcce5292ae85944e14e1177d326148184 100644 (file)
--- a/darkplaces-sdl-vs2010.vcxproj
+++ b/darkplaces-sdl-vs2010.vcxproj
@@ -286,6 +286,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-sdl-vs2012.vcxproj b/darkplaces-sdl-vs2012.vcxproj
index 551ed83d013cf35d011965ab02226de1a57cb490..82c495ada03df0c65bac2d44743b3d3644ad2d29 100644 (file)
--- a/darkplaces-sdl-vs2012.vcxproj
+++ b/darkplaces-sdl-vs2012.vcxproj
@@ -377,6 +377,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-sdl-vs2013.vcxproj b/darkplaces-sdl-vs2013.vcxproj
index 0f8833900c08b38725370745dfa183f3b00b311c..a1e0dd1f90bf156b784cd3b7dd206234ba129d9c 100644 (file)
--- a/darkplaces-sdl-vs2013.vcxproj
+++ b/darkplaces-sdl-vs2013.vcxproj
@@ -386,6 +386,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-sdl2-vs2010.vcxproj b/darkplaces-sdl2-vs2010.vcxproj
index 9401d143d5f7d141e2a0b3d9378c7baeae374b76..8038539188c2df7ef1ce423e98edc2966024c158 100644 (file)
--- a/darkplaces-sdl2-vs2010.vcxproj
+++ b/darkplaces-sdl2-vs2010.vcxproj
@@ -286,6 +286,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-sdl2-vs2012.vcxproj b/darkplaces-sdl2-vs2012.vcxproj
index 9a49ba37dd2599954e2605d27e31592ae7226342..506e52d7ccb97156a41a0ee11eeb7b0e0ce6d526 100644 (file)
--- a/darkplaces-sdl2-vs2012.vcxproj
+++ b/darkplaces-sdl2-vs2012.vcxproj
@@ -377,6 +377,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces-sdl2-vs2013.vcxproj b/darkplaces-sdl2-vs2013.vcxproj
index 51c67eb28777d06acf629597a340c56dc76dd7e4..257a0463078825f97142f61a09aecbf043fdf2d8 100644 (file)
--- a/darkplaces-sdl2-vs2013.vcxproj
+++ b/darkplaces-sdl2-vs2013.vcxproj
@@ -386,6 +386,9 @@
     <ClInclude Include="world.h" />\r
     <ClInclude Include="zone.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="darkplaces.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/darkplaces.rc b/darkplaces.rc
index fe2c6b9ef9d065ea4de52d4c3271687a9479efd9..5580b29cb5220b1a106b33314a11b17dbe3ba033 100644 (file)
--- a/darkplaces.rc
+++ b/darkplaces.rc
@@ -1,6 +1,6 @@
 #include <windows.h> // include for version info constants
 
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "darkplaces.ico"
+107 ICON "darkplaces.ico"
 
 1 VERSIONINFO
 FILEVERSION 1,0,0,0
@@ -11,7 +11,7 @@ FILETYPE VFT_APP
         {
                 BLOCK "040904E4"
                 {
-                        VALUE "CompanyName", "Forest Hale Digital Services"
+                        VALUE "CompanyName", "DarkPlaces Contributors"
                         VALUE "FileVersion", "1.0"
                         VALUE "FileDescription", "DarkPlaces Game Engine"
                         VALUE "InternalName", "darkplaces.exe"