From 1480c9445100075c9e1a894eb07c0ef727b509a1 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 27 Aug 2018 07:55:00 +0800
Subject: *update

---
 build/vs2015/libjin/libjin.vcxproj | 105 ++++++++++++++++++++++++++++++++++---
 1 file changed, 99 insertions(+), 6 deletions(-)

(limited to 'build/vs2015/libjin/libjin.vcxproj')

diff --git a/build/vs2015/libjin/libjin.vcxproj b/build/vs2015/libjin/libjin.vcxproj
index 48bdb6f..d255f03 100644
--- a/build/vs2015/libjin/libjin.vcxproj
+++ b/build/vs2015/libjin/libjin.vcxproj
@@ -22,7 +22,8 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{9EE02090-C15E-4520-9C05-C435E45EF2FC}</ProjectGuid>
     <RootNamespace>libjin</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <ProjectName>libjin(full version)</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -82,10 +83,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
+      <ConformanceMode>false</ConformanceMode>
       <CompileAs>CompileAsCpp</CompileAs>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\libjin\3rdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
@@ -99,9 +100,9 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
+      <ConformanceMode>false</ConformanceMode>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\libjin\3rdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
     </ClCompile>
@@ -129,6 +130,53 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Box2D.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2BroadPhase.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2Collision.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2Distance.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2DynamicTree.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2TimeOfImpact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2ChainShape.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2CircleShape.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2EdgeShape.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2PolygonShape.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2Shape.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2BlockAllocator.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Draw.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2GrowableStack.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Math.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Settings.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2StackAllocator.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Timer.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2Body.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2ContactManager.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2Fixture.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2Island.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2TimeStep.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2World.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2WorldCallbacks.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2CircleContact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2Contact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2ContactSolver.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2PolygonContact.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2DistanceJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2FrictionJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2GearJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2Joint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2MotorJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2MouseJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2PrismaticJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2PulleyJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2RevoluteJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2RopeJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2WeldJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2WheelJoint.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\Box2D\Rope\b2Rope.h" />
     <ClInclude Include="..\..\..\src\libjin\3rdparty\GLee\GLee.h" />
     <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\dirent.h" />
     <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\smount.h" />
@@ -177,7 +225,6 @@
     <ClInclude Include="..\..\..\src\libjin\Net\Net.h" />
     <ClInclude Include="..\..\..\src\libjin\Net\Socket.h" />
     <ClInclude Include="..\..\..\src\libjin\Physics\Physics.h" />
-    <ClInclude Include="..\..\..\src\libjin\Physics\Rigid.h" />
     <ClInclude Include="..\..\..\src\libjin\Thread\Thread.h" />
     <ClInclude Include="..\..\..\src\libjin\Tilemap\Tilemap.h" />
     <ClInclude Include="..\..\..\src\libjin\Time\Timer.h" />
@@ -192,6 +239,52 @@
     <None Include="..\..\..\src\libjin\README.md" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2BroadPhase.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2CollideCircle.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2CollideEdge.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2CollidePolygon.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2Collision.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2Distance.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2DynamicTree.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\b2TimeOfImpact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2ChainShape.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2CircleShape.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2EdgeShape.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Collision\Shapes\b2PolygonShape.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2BlockAllocator.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Draw.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Math.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Settings.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2StackAllocator.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Common\b2Timer.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2Body.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2ContactManager.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2Fixture.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2Island.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2World.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\b2WorldCallbacks.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2CircleContact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2Contact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2ContactSolver.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Contacts\b2PolygonContact.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2DistanceJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2FrictionJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2GearJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2Joint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2MotorJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2MouseJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2PulleyJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2RopeJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\3rdparty\Box2D\Rope\b2Rope.cpp" />
     <ClCompile Include="..\..\..\src\libjin\3rdparty\GLee\GLee.c" />
     <ClCompile Include="..\..\..\src\libjin\3rdparty\smount\smount.c" />
     <ClCompile Include="..\..\..\src\libjin\3rdparty\stb\stb_vorbis.c" />
-- 
cgit v1.1-26-g67d0