OSDN Git Service

(root) / skyscrapersim / skyscraper.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fdec596)
Added OgreBullet project files to main solution, to simplify building process on...
authorryan <>
Mon, 7 Dec 2015 21:55:14 +0000 (21:55 +0000)
committerryan <>
Mon, 7 Dec 2015 21:55:14 +0000 (21:55 +0000)
msvc/SBS.vcxproj patch | blob | history
msvc/Skyscraper.sln patch | blob | history
msvc/Skyscraper.vcxproj patch | blob | history
ogrebullet/OgreBullet.sln [deleted file] patch | blob | history
ogrebullet/OgreBulletCollisions.vcxproj patch | blob | history
ogrebullet/OgreBulletDynamics.vcxproj patch | blob | history

diff --git a/msvc/SBS.vcxproj b/msvc/SBS.vcxproj
index e6ea288..c1cea87 100644 (file)
--- a/msvc/SBS.vcxproj
+++ b/msvc/SBS.vcxproj
@@ -67,14 +67,14 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\SBS</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\SBS</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\SBS</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\SBS</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
   </PropertyGroup>\r
@@ -202,6 +202,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
       <DisableSpecificWarnings>4251;4275;4193</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>OgreMain_d.lib;OgreOverlay_d.lib;fmod_vc.lib;OgreBulletCollisions.lib;OgreBulletDynamics.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -342,4 +343,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file
diff --git a/msvc/Skyscraper.sln b/msvc/Skyscraper.sln
index 9cd4f4a..3ae4166 100644 (file)
--- a/msvc/Skyscraper.sln
+++ b/msvc/Skyscraper.sln
@@ -1,9 +1,22 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Skyscraper", "Skyscraper.vcxproj", "{899501B5-1571-4301-B4D0-5FAADAE2A607}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SBS", "SBS.vcxproj", "{1164EB58-F768-469D-9AC2-8A940B3B1BFD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A} = {791F594F-FF44-49D1-A882-FF4DB0DCD92A}
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE} = {022634CE-F06A-4F71-AA07-3CE7BB1841AE}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreBulletCollisions", "..\ogrebullet\OgreBulletCollisions.vcxproj", "{791F594F-FF44-49D1-A882-FF4DB0DCD92A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreBulletDynamics", "..\ogrebullet\OgreBulletDynamics.vcxproj", "{022634CE-F06A-4F71-AA07-3CE7BB1841AE}"
+       ProjectSection(ProjectDependencies) = postProject
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A} = {791F594F-FF44-49D1-A882-FF4DB0DCD92A}
+       EndProjectSection
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,6 +42,22 @@ Global
                {1164EB58-F768-469D-9AC2-8A940B3B1BFD}.Release|Win32.Build.0 = Release|Win32
                {1164EB58-F768-469D-9AC2-8A940B3B1BFD}.Release|x64.ActiveCfg = Release|x64
                {1164EB58-F768-469D-9AC2-8A940B3B1BFD}.Release|x64.Build.0 = Release|x64
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|Win32.ActiveCfg = Debug|Win32
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|Win32.Build.0 = Debug|Win32
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|x64.ActiveCfg = Debug|x64
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|x64.Build.0 = Debug|x64
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|Win32.ActiveCfg = Release|Win32
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|Win32.Build.0 = Release|Win32
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|x64.ActiveCfg = Release|x64
+               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|x64.Build.0 = Release|x64
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|Win32.ActiveCfg = Debug|Win32
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|Win32.Build.0 = Debug|Win32
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|x64.ActiveCfg = Debug|x64
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|x64.Build.0 = Debug|x64
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|Win32.ActiveCfg = Release|Win32
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|Win32.Build.0 = Release|Win32
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|x64.ActiveCfg = Release|x64
+               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/msvc/Skyscraper.vcxproj b/msvc/Skyscraper.vcxproj
index a6bb9f4..3a2c0db 100644 (file)
--- a/msvc/Skyscraper.vcxproj
+++ b/msvc/Skyscraper.vcxproj
@@ -66,14 +66,14 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\Skyscraper\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\Skyscraper\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\Skyscraper\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\Skyscraper\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
   </PropertyGroup>\r
@@ -256,6 +256,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
       <DisableSpecificWarnings>4251;4275;4193</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_DEBUG;wxUSE_GUI=1;WXUSINGDLL=1;WXDEBUG=1;NOPCH;CS_SUPPORTS_MMX;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
diff --git a/ogrebullet/OgreBullet.sln b/ogrebullet/OgreBullet.sln
deleted file mode 100644 (file)
index 1d6dae4..0000000
--- a/ogrebullet/OgreBullet.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00\r
-# Visual C++ Express 2010\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreBulletCollisions", "OgreBulletCollisions.vcxproj", "{791F594F-FF44-49D1-A882-FF4DB0DCD92A}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreBulletDynamics", "OgreBulletDynamics.vcxproj", "{022634CE-F06A-4F71-AA07-3CE7BB1841AE}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A} = {791F594F-FF44-49D1-A882-FF4DB0DCD92A}\r
-       EndProjectSection\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Win32 = Debug|Win32\r
-               Debug|x64 = Debug|x64\r
-               Release|Win32 = Release|Win32\r
-               Release|x64 = Release|x64\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|Win32.Build.0 = Debug|Win32\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|x64.ActiveCfg = Debug|x64\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Debug|x64.Build.0 = Debug|x64\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|Win32.ActiveCfg = Release|Win32\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|Win32.Build.0 = Release|Win32\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|x64.ActiveCfg = Release|x64\r
-               {791F594F-FF44-49D1-A882-FF4DB0DCD92A}.Release|x64.Build.0 = Release|x64\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|Win32.Build.0 = Debug|Win32\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|x64.ActiveCfg = Debug|x64\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Debug|x64.Build.0 = Debug|x64\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|Win32.ActiveCfg = Release|Win32\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|Win32.Build.0 = Release|Win32\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|x64.ActiveCfg = Release|x64\r
-               {022634CE-F06A-4F71-AA07-3CE7BB1841AE}.Release|x64.Build.0 = Release|x64\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r
diff --git a/ogrebullet/OgreBulletCollisions.vcxproj b/ogrebullet/OgreBulletCollisions.vcxproj
index 87f5b13..7783869 100644 (file)
--- a/ogrebullet/OgreBulletCollisions.vcxproj
+++ b/ogrebullet/OgreBulletCollisions.vcxproj
@@ -67,12 +67,12 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\OgreBulletCollisions\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\OgreBulletCollisions\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\OgreBulletCollisions\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\OgreBulletCollisions\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
@@ -93,6 +93,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <BufferSecurityCheck>false</BufferSecurityCheck>\r
       <DisableSpecificWarnings>4251;4275;4193</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>OgreMain_d.lib;OgreOverlay_d.lib;bulletcollision_debug.lib;bulletdynamics_debug.lib;linearmath_debug.lib;ConvexDecomposition_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -125,6 +126,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <BufferSecurityCheck>false</BufferSecurityCheck>\r
       <DisableSpecificWarnings>4251;4275;4193</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>OgreMain_d.lib;OgreOverlay_d.lib;bulletcollision_debug.lib;bulletdynamics_debug.lib;linearmath_debug.lib;ConvexDecomposition_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
diff --git a/ogrebullet/OgreBulletDynamics.vcxproj b/ogrebullet/OgreBulletDynamics.vcxproj
index 8ba2b42..db569b6 100644 (file)
--- a/ogrebullet/OgreBulletDynamics.vcxproj
+++ b/ogrebullet/OgreBulletDynamics.vcxproj
@@ -67,12 +67,12 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\OgreBulletDynamics\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\OgreBulletDynamics\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\OgreBulletDynamics\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\OgreBulletDynamics\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
@@ -94,6 +94,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <BufferSecurityCheck>false</BufferSecurityCheck>\r
       <DisableSpecificWarnings>4251;4275;4193</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>OgreMain_d.lib;OgreOverlay_d.lib;OgreBulletCollisions.lib;bulletcollision_debug.lib;bulletdynamics_debug.lib;linearmath_debug.lib;ConvexDecomposition_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -127,6 +128,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <BufferSecurityCheck>false</BufferSecurityCheck>\r
       <DisableSpecificWarnings>4251;4275;4193</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>OgreMain_d.lib;OgreOverlay_d.lib;OgreBulletCollisions.lib;bulletcollision_debug.lib;bulletdynamics_debug.lib;linearmath_debug.lib;ConvexDecomposition_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
imported from bazaar
About OSDN
Find Software
Develop Software
Help