1. Coin3D
  2. Coin

Commits

Roy Walmsley  committed 346f82f Merge

Merged in TheHubbit/coin/issue55 (pull request #9)

Update for msvc10 project id/reference (issue #55)

  • Participants
  • Parent commits 9f4fdea, b95212a
  • Branches default

Comments (0)

Files changed (4)

File build/misc/install-sdk.bat

View file
  • Ignore whitespace
 if "%msvc%"=="msvc7" goto argthreegiven
 if "%msvc%"=="msvc8" goto argthreegiven
 if "%msvc%"=="msvc9" goto argthreegiven
+if "%msvc%"=="msvc10" goto argthreegiven
 goto argproblem
 :argthreegiven
 
 if "%libname%"=="coin2" goto argfourgiven
 if "%libname%"=="coin3" goto argfourgiven
+if "%libname%"=="coin4" goto argfourgiven
 if "%libname%"=="simage1" goto argfourgiven
 if "%libname%"=="smallchange1" goto argfourgiven
 if "%libname%"=="simvoleon1" goto argfourgiven

File build/msvc10/coin4.sln

View file
  • Ignore whitespace
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4", "coin4.vcxproj", "{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4", "coin4.vcxproj", "{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4_install", "coin4_install.vcxproj", "{24887AF5-89DB-BC05-EFE7-9385F390A15B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4_install", "coin4_install.vcxproj", "{0ABDA23A-3512-35FB-C284-A387C68CE1AE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4_uninstall", "coin4_uninstall.vcxproj", "{AB306057-4F9B-88C1-9FCD-1772042B2BC4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4_uninstall", "coin4_uninstall.vcxproj", "{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4_docs", "coin4_docs.vcxproj", "{E8880270-F73A-D990-FFAC-107FE2F991D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coin4_docs", "coin4_docs.vcxproj", "{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		LIB (Release)|x64 = LIB (Release)|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
-		{30D44D69-597D-7D2A-3253-CE8EBC1D66C1}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
-		{24887AF5-89DB-BC05-EFE7-9385F390A15B}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
-		{AB306057-4F9B-88C1-9FCD-1772042B2BC4}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
-		{E8880270-F73A-D990-FFAC-107FE2F991D6}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
+		{7BC09A06-EEEC-F082-2FA8-DE274812DA5D}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
+		{0ABDA23A-3512-35FB-C284-A387C68CE1AE}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
+		{ED3E5DE6-D272-8C9E-2CCE-FDF7E8B6DF45}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Debug)|Win32.ActiveCfg = DLL (Debug)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Debug)|Win32.Build.0 = DLL (Debug)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Debug)|x64.ActiveCfg = DLL (Debug)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Debug)|x64.Build.0 = DLL (Debug)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Release)|Win32.ActiveCfg = DLL (Release)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Release)|Win32.Build.0 = DLL (Release)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Release)|x64.ActiveCfg = DLL (Release)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.DLL (Release)|x64.Build.0 = DLL (Release)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Debug)|Win32.ActiveCfg = LIB (Debug)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Debug)|Win32.Build.0 = LIB (Debug)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Debug)|x64.ActiveCfg = LIB (Debug)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Debug)|x64.Build.0 = LIB (Debug)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Release)|Win32.ActiveCfg = LIB (Release)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Release)|Win32.Build.0 = LIB (Release)|Win32
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Release)|x64.ActiveCfg = LIB (Release)|x64
+		{BFEA29BE-4CA1-F411-7DC6-F4506EDD56B1}.LIB (Release)|x64.Build.0 = LIB (Release)|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

File build/msvc10/coin4_install.vcxproj

View file
  • Ignore whitespace
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="coin4.vcxproj">
-      <Project>{30d44d69-597d-7d2a-3253-ce8ebc1d66c1}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Project>{7bc09a06-eeec-f082-2fa8-de274812da5d}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

File include/Inventor/C/base/math-undefs.h

  • Ignore whitespace
File contents unchanged.