[dasher: 201/217] One and only set of windows build filles.



commit 5a96066fe5f5855f0ea97127bac6fec0cb7cc1fa
Author: Ada Majorek <amajorek google com>
Date:   Fri Feb 5 11:58:26 2016 -0800

    One and only set of windows build filles.

 .gitignore                                         |    2 ++
 .../{Common_vc2013.vcxproj => Common.vcxproj}      |    0
 ...asherCore_vc2013.vcxproj => DasherCore.vcxproj} |    2 +-
 Src/Win32/{Dasher_vc2013.sln => Dasher.sln}        |   10 +++++-----
 .../{Dasher_vc2013.vcxproj => Dasher.vcxproj}      |    6 +++---
 ...ontrol_vc2013.vcxproj => DasherControl.vcxproj} |    4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 496ec29..b2b770d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ stamp-*
 *.vcxproj.user
 /Src/Win32/Dasher.aps
 /Src/Win32/Dasher_vc2013.opensdf
+Src/Win32/Dasher_vc2013.VC.db
+Data/Help/Win32/Dasher.chm
diff --git a/Src/Common/Common_vc2013.vcxproj b/Src/Common/Common.vcxproj
similarity index 100%
rename from Src/Common/Common_vc2013.vcxproj
rename to Src/Common/Common.vcxproj
diff --git a/Src/DasherCore/DasherCore_vc2013.vcxproj b/Src/DasherCore/DasherCore.vcxproj
similarity index 99%
rename from Src/DasherCore/DasherCore_vc2013.vcxproj
rename to Src/DasherCore/DasherCore.vcxproj
index 460014b..385224c 100644
--- a/Src/DasherCore/DasherCore_vc2013.vcxproj
+++ b/Src/DasherCore/DasherCore.vcxproj
@@ -202,7 +202,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common_vc2013.vcxproj">
+    <ProjectReference Include="..\Common\Common.vcxproj">
       <Project>{4a4ceb83-fbc8-4e93-831e-009875e54794}</Project>
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
diff --git a/Src/Win32/Dasher_vc2013.sln b/Src/Win32/Dasher.sln
similarity index 98%
rename from Src/Win32/Dasher_vc2013.sln
rename to Src/Win32/Dasher.sln
index d70793f..8ac397f 100644
--- a/Src/Win32/Dasher_vc2013.sln
+++ b/Src/Win32/Dasher.sln
@@ -9,13 +9,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
                ..\..\INSTALL.Windows = ..\..\INSTALL.Windows
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\Common_vc2013.vcxproj", 
"{4A4CEB83-FBC8-4E93-831E-009875E54794}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\Common.vcxproj", 
"{4A4CEB83-FBC8-4E93-831E-009875E54794}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dasher", "Dasher_vc2013.vcxproj", 
"{752501D3-5B04-4F3C-A141-DE426E354D23}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dasher", "Dasher.vcxproj", 
"{752501D3-5B04-4F3C-A141-DE426E354D23}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherControl", "DasherControl_vc2013.vcxproj", 
"{3998D966-9B9E-4214-ACEA-B777985AF4DD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherControl", "DasherControl.vcxproj", 
"{3998D966-9B9E-4214-ACEA-B777985AF4DD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherCore", "..\DasherCore\DasherCore_vc2013.vcxproj", 
"{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherCore", "..\DasherCore\DasherCore.vcxproj", 
"{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "..\Installer\Installer.wixproj", 
"{BBE9E817-E2C5-4081-9612-0738E27CF55A}"
        ProjectSection(ProjectDependencies) = postProject
@@ -32,7 +32,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "InstallerW2K", "..\Installe
                {752501D3-5B04-4F3C-A141-DE426E354D23} = {752501D3-5B04-4F3C-A141-DE426E354D23}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual_vc2013", 
"..\..\Data\Help\Manual_vc2013.vcxproj", "{C356A954-2E47-4F1E-AE4A-E22B598514F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual", "..\..\Data\Help\Manual.vcxproj", 
"{C356A954-2E47-4F1E-AE4A-E22B598514F9}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Src/Win32/Dasher_vc2013.vcxproj b/Src/Win32/Dasher.vcxproj
similarity index 98%
rename from Src/Win32/Dasher_vc2013.vcxproj
rename to Src/Win32/Dasher.vcxproj
index 4db92db..75053d6 100644
--- a/Src/Win32/Dasher_vc2013.vcxproj
+++ b/Src/Win32/Dasher.vcxproj
@@ -259,15 +259,15 @@
     <ClInclude Include="Widgets\ViewPage.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common_vc2013.vcxproj">
+    <ProjectReference Include="..\Common\Common.vcxproj">
       <Project>{4a4ceb83-fbc8-4e93-831e-009875e54794}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\DasherCore\DasherCore_vc2013.vcxproj">
+    <ProjectReference Include="..\DasherCore\DasherCore.vcxproj">
       <Project>{192c1e5c-2d1e-4aa3-91c3-ff2d7abd67f8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="DasherControl_vc2013.vcxproj">
+    <ProjectReference Include="DasherControl.vcxproj">
       <Project>{3998d966-9b9e-4214-acea-b777985af4dd}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/Src/Win32/DasherControl_vc2013.vcxproj b/Src/Win32/DasherControl.vcxproj
similarity index 98%
rename from Src/Win32/DasherControl_vc2013.vcxproj
rename to Src/Win32/DasherControl.vcxproj
index e2ae949..cdfd1c4 100644
--- a/Src/Win32/DasherControl_vc2013.vcxproj
+++ b/Src/Win32/DasherControl.vcxproj
@@ -215,11 +215,11 @@
     <None Include="Widgets\Screen.inl" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common_vc2013.vcxproj">
+    <ProjectReference Include="..\Common\Common.vcxproj">
       <Project>{4a4ceb83-fbc8-4e93-831e-009875e54794}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\DasherCore\DasherCore_vc2013.vcxproj">
+    <ProjectReference Include="..\DasherCore\DasherCore.vcxproj">
       <Project>{192c1e5c-2d1e-4aa3-91c3-ff2d7abd67f8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]