diff options
author | chai <chaifix@163.com> | 2018-08-29 10:22:50 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-08-29 10:22:50 +0800 |
commit | b05e2443533af8e3badb4a8469a634cb302c63f8 (patch) | |
tree | 8abce7f1234cc62647c189be59820afae1189c8c | |
parent | b52aa211c801a0cc15ed09553e3ff1835662b60b (diff) |
*update
-rw-r--r-- | build/vs2015/jin.vcxproj | 1 | ||||
-rw-r--r-- | build/vs2015/libjin/libjin.vcxproj | 3 | ||||
-rw-r--r-- | build/vs2015/libjin/libjin.vcxproj.filters | 9 | ||||
-rw-r--r-- | src/lua/modules/jin.h | 19 |
4 files changed, 3 insertions, 29 deletions
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj index ff5846a..bb6d244 100644 --- a/build/vs2015/jin.vcxproj +++ b/build/vs2015/jin.vcxproj @@ -22,6 +22,7 @@ <ProjectGuid>{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}</ProjectGuid> <RootNamespace>jin</RootNamespace> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <ProjectName>jin(min version)</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> diff --git a/build/vs2015/libjin/libjin.vcxproj b/build/vs2015/libjin/libjin.vcxproj index 24261dd..dc02cd3 100644 --- a/build/vs2015/libjin/libjin.vcxproj +++ b/build/vs2015/libjin/libjin.vcxproj @@ -23,6 +23,7 @@ <ProjectGuid>{9EE02090-C15E-4520-9C05-C435E45EF2FC}</ProjectGuid> <RootNamespace>libjin</RootNamespace> <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + <ProjectName>libjin(min version)</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -174,8 +175,6 @@ <ClInclude Include="..\..\..\src\libjin\modules.h" /> <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" /> diff --git a/build/vs2015/libjin/libjin.vcxproj.filters b/build/vs2015/libjin/libjin.vcxproj.filters index 1939567..6bb7918 100644 --- a/build/vs2015/libjin/libjin.vcxproj.filters +++ b/build/vs2015/libjin/libjin.vcxproj.filters @@ -31,9 +31,6 @@ <Filter Include="Source\Net"> <UniqueIdentifier>{125ecddc-2a19-4da8-9e81-da40ccfb1be7}</UniqueIdentifier> </Filter> - <Filter Include="Source\Physics"> - <UniqueIdentifier>{37300e86-d766-4c21-b632-4963fe62684c}</UniqueIdentifier> - </Filter> <Filter Include="Source\Thread"> <UniqueIdentifier>{5d5c96c3-1065-4e74-9521-f4d756d4057f}</UniqueIdentifier> </Filter> @@ -156,12 +153,6 @@ <ClInclude Include="..\..\..\src\libjin\Net\Socket.h"> <Filter>Source\Net</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Physics\Physics.h"> - <Filter>Source\Physics</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Physics\Rigid.h"> - <Filter>Source\Physics</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\libjin\Thread\Thread.h"> <Filter>Source\Thread</Filter> </ClInclude> diff --git a/src/lua/modules/jin.h b/src/lua/modules/jin.h index 07531b2..fa18fe9 100644 --- a/src/lua/modules/jin.h +++ b/src/lua/modules/jin.h @@ -1,22 +1,5 @@ /** -* Copyright (C) 2016~2018 chai -* -* Permission is hereby granted, free of charge, to any person obtaining a copyof -* this software and associated documentation files (the "Software"), to deal in -* the Software without restriction, including without limitation the rights to use, -* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the -* Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in all -* copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +* Copyright (C) 2016~2018 chai */ #ifndef __JIN_M_JIN_H |