diff options
| -rw-r--r-- | bin/jin.exe | bin | 556032 -> 548864 bytes | |||
| -rw-r--r-- | build/vs2015/jin.sln | 17 | ||||
| -rw-r--r-- | build/vs2015/jin.vcxproj | 100 | ||||
| -rw-r--r-- | build/vs2015/jin.vcxproj.filters | 359 | ||||
| -rw-r--r-- | build/vs2015/libjin/libjin.vcxproj | 233 | ||||
| -rw-r--r-- | build/vs2015/libjin/libjin.vcxproj.filters | 368 | ||||
| -rw-r--r-- | build/vs2015/libjin/libjin.vcxproj.user | 4 | ||||
| -rw-r--r-- | src/libjin/3rdparty/tekcos/tekcos.c | 12 | ||||
| -rw-r--r-- | src/libjin/Audio/Source.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/Common/Subsystem.hpp | 6 | ||||
| -rw-r--r-- | src/libjin/Graphics/Drawable.h | 4 | ||||
| -rw-r--r-- | src/libjin/Graphics/JSL.h | 4 | ||||
| -rw-r--r-- | src/libjin/Utils/Log.h | 2 | ||||
| -rw-r--r-- | src/libjin/Utils/log.h | 2 | ||||
| -rw-r--r-- | src/libjin/audio/source.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/utils/log.h | 2 |
16 files changed, 645 insertions, 472 deletions
diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex 57c747a..303ef87 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/build/vs2015/jin.sln b/build/vs2015/jin.sln index c608875..ed8f37c 100644 --- a/build/vs2015/jin.sln +++ b/build/vs2015/jin.sln @@ -1,10 +1,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2047 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jin", "jin.vcxproj", "{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin", "libjin\libjin.vcxproj", "{9EE02090-C15E-4520-9C05-C435E45EF2FC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,8 +23,19 @@ Global {A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}.Release|x64.Build.0 = Release|x64 {A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}.Release|x86.ActiveCfg = Release|Win32 {A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}.Release|x86.Build.0 = Release|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x64.ActiveCfg = Debug|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x64.Build.0 = Debug|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x86.ActiveCfg = Debug|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x86.Build.0 = Debug|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x64.ActiveCfg = Release|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x64.Build.0 = Release|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x86.ActiveCfg = Release|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8} + EndGlobalSection EndGlobal diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj index 427288f..a0836a4 100644 --- a/build/vs2015/jin.vcxproj +++ b/build/vs2015/jin.vcxproj @@ -139,41 +139,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <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" /> - <ClCompile Include="..\..\src\libjin\3rdparty\tekcos\tekcos.c" /> - <ClCompile Include="..\..\src\libjin\3rdparty\wav\wav.c" /> - <ClCompile Include="..\..\src\libjin\Audio\Audio.cpp" /> - <ClCompile Include="..\..\src\libjin\Audio\OpenAL\ALAudio.cpp" /> - <ClCompile Include="..\..\src\libjin\Audio\OpenAL\ALSource.cpp" /> - <ClCompile Include="..\..\src\libjin\Audio\SDL\SDLAudio.cpp" /> - <ClCompile Include="..\..\src\libjin\Audio\SDL\SDLSource.cpp" /> - <ClCompile Include="..\..\src\libjin\Audio\Source.cpp" /> - <ClCompile Include="..\..\src\libjin\Common\Object.cpp" /> - <ClCompile Include="..\..\src\libjin\Common\utf8.cpp" /> - <ClCompile Include="..\..\src\libjin\Core\Game.cpp" /> - <ClCompile Include="..\..\src\libjin\Filesystem\Filesystem.cpp" /> <ClCompile Include="..\..\src\jinc.cpp" /> - <ClCompile Include="..\..\src\libjin\Graphics\Canvas.cpp" /> - <ClCompile Include="..\..\src\libjin\Graphics\Drawable.cpp" /> - <ClCompile Include="..\..\src\libjin\Graphics\Font.cpp" /> - <ClCompile Include="..\..\src\libjin\Graphics\Geometry.cpp" /> - <ClCompile Include="..\..\src\libjin\Graphics\JSL.cpp" /> - <ClCompile Include="..\..\src\libjin\Graphics\Texture.cpp" /> - <ClCompile Include="..\..\src\libjin\Graphics\Window.cpp" /> - <ClCompile Include="..\..\src\libjin\Input\Event.cpp" /> - <ClCompile Include="..\..\src\libjin\Input\Joypad.cpp" /> - <ClCompile Include="..\..\src\libjin\Input\Keyboard.cpp" /> - <ClCompile Include="..\..\src\libjin\Input\Mouse.cpp" /> - <ClCompile Include="..\..\src\libjin\Math\Matrix.cpp" /> - <ClCompile Include="..\..\src\libjin\Math\Vector.cpp" /> - <ClCompile Include="..\..\src\libjin\Net\Net.cpp" /> - <ClCompile Include="..\..\src\libjin\Net\Socket.cpp" /> - <ClCompile Include="..\..\src\libjin\Thread\Thread.cpp" /> - <ClCompile Include="..\..\src\libjin\Time\Timer.cpp" /> - <ClCompile Include="..\..\src\libjin\Utils\Log.cpp" /> - <ClCompile Include="..\..\src\libjin\Utils\unittest.cpp" /> <ClCompile Include="..\..\src\lua\modules\audio\luaopen_audio.cpp" /> <ClCompile Include="..\..\src\lua\modules\audio\luaopen_Source.cpp" /> <ClCompile Include="..\..\src\lua\modules\bit\luaopen_bit.cpp" /> @@ -199,64 +165,6 @@ <ClCompile Include="..\..\src\main.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\libjin\3rdparty\GLee\GLee.h" /> - <ClInclude Include="..\..\src\libjin\3rdparty\smount\dirent.h" /> - <ClInclude Include="..\..\src\libjin\3rdparty\smount\smount.h" /> - <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_image.h" /> - <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_truetype.h" /> - <ClInclude Include="..\..\src\libjin\3rdparty\tekcos\tekcos.h" /> - <ClInclude Include="..\..\src\libjin\3rdparty\wav\wav.h" /> - <ClInclude Include="..\..\src\libjin\Audio\Audio.h" /> - <ClInclude Include="..\..\src\libjin\Audio\OpenAL\ALAudio.h" /> - <ClInclude Include="..\..\src\libjin\Audio\OpenAL\ALSource.h" /> - <ClInclude Include="..\..\src\libjin\Audio\SDL\SDLAudio.h" /> - <ClInclude Include="..\..\src\libjin\Audio\SDL\SDLSource.h" /> - <ClInclude Include="..\..\src\libjin\Audio\Source.h" /> - <ClInclude Include="..\..\src\libjin\Common\Object.h" /> - <ClInclude Include="..\..\src\libjin\Common\Singleton.hpp" /> - <ClInclude Include="..\..\src\libjin\Common\StringMap.hpp" /> - <ClInclude Include="..\..\src\libjin\Common\Subsystem.hpp" /> - <ClInclude Include="..\..\src\libjin\Common\utf8.h" /> - <ClInclude Include="..\..\src\libjin\Core\Core.h" /> - <ClInclude Include="..\..\src\libjin\Core\Game.h" /> - <ClInclude Include="..\..\src\libjin\Debug\Debug.h" /> - <ClInclude Include="..\..\src\libjin\Debug\Log.h" /> - <ClInclude Include="..\..\src\libjin\Filesystem\Buffer.h" /> - <ClInclude Include="..\..\src\libjin\Filesystem\Filesystem.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Canvas.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Color.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Drawable.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Font.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Geometry.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Graphics.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\JSL.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Texture.h" /> - <ClInclude Include="..\..\src\libjin\Graphics\Window.h" /> - <ClInclude Include="..\..\src\libjin\Input\Event.h" /> - <ClInclude Include="..\..\src\libjin\Input\Input.h" /> - <ClInclude Include="..\..\src\libjin\Input\Joypad.h" /> - <ClInclude Include="..\..\src\libjin\Input\Keyboard.h" /> - <ClInclude Include="..\..\src\libjin\Input\Mouse.h" /> - <ClInclude Include="..\..\src\libjin\jin.h" /> - <ClInclude Include="..\..\src\libjin\Math\constant.h" /> - <ClInclude Include="..\..\src\libjin\Math\Math.h" /> - <ClInclude Include="..\..\src\libjin\Math\Matrix.h" /> - <ClInclude Include="..\..\src\libjin\Math\Quad.h" /> - <ClInclude Include="..\..\src\libjin\Math\Vector.h" /> - <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" /> - <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h" /> - <ClInclude Include="..\..\src\libjin\UI\UI.h" /> - <ClInclude Include="..\..\src\libjin\Utils\endian.h" /> - <ClInclude Include="..\..\src\libjin\Utils\Log.h" /> - <ClInclude Include="..\..\src\libjin\Utils\macros.h" /> - <ClInclude Include="..\..\src\libjin\Utils\utils.h" /> <ClInclude Include="..\..\src\lua\common\common.h" /> <ClInclude Include="..\..\src\lua\common\constant.h" /> <ClInclude Include="..\..\src\lua\common\Proxy.h" /> @@ -278,14 +186,16 @@ <ClInclude Include="resource.h" /> </ItemGroup> <ItemGroup> - <None Include="..\..\src\libjin\README.md" /> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="jin.rc" /> </ItemGroup> <ItemGroup> <Image Include="..\..\res\icon.ico" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="libjin\libjin.vcxproj"> + <Project>{9ee02090-c15e-4520-9c05-c435e45ef2fc}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters index 25b8715..f223626 100644 --- a/build/vs2015/jin.vcxproj.filters +++ b/build/vs2015/jin.vcxproj.filters @@ -4,87 +4,9 @@ <Filter Include="src"> <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad9}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin"> - <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad0}</UniqueIdentifier> - </Filter> <Filter Include="src\lua"> <UniqueIdentifier>{e082b09b-1cdc-4c21-967b-eaf7130cf620}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\Audio"> - <UniqueIdentifier>{4e3c38b2-8076-4927-993d-e59607d4256a}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Common"> - <UniqueIdentifier>{8222e176-beec-43ee-8604-3e6491dc45bb}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Core"> - <UniqueIdentifier>{7467bc99-3a63-4b92-b3ab-b5a3d86ead1b}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Debug"> - <UniqueIdentifier>{5087c206-df20-4380-b929-eb5b466d42b3}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Filesystem"> - <UniqueIdentifier>{bb4a9832-a45a-445d-8199-80d3e97f9415}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Input"> - <UniqueIdentifier>{14253521-dbe9-4289-b100-47b4deb41331}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Math"> - <UniqueIdentifier>{3c5d715c-d885-4af9-95db-3b1ca43cae58}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Net"> - <UniqueIdentifier>{fe12237c-986f-42f3-86d9-1fe848e1e058}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Physics"> - <UniqueIdentifier>{3eded42e-5a27-433d-9b0a-c25190008be7}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Thread"> - <UniqueIdentifier>{31ad905a-11d7-4a67-ab7a-66caa3ae54fc}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Tilemap"> - <UniqueIdentifier>{be27da6f-98b1-4e99-ac75-c3116f1618de}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Tools"> - <UniqueIdentifier>{8fb29df7-e8de-4bce-944b-b8822e21f4c5}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Tools\EventMsgCenter"> - <UniqueIdentifier>{f7c7c527-a154-4bfe-a3a9-d34a3828da58}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\UI"> - <UniqueIdentifier>{bdf3096e-923f-4c91-bafe-03cf47f25ff2}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Utils"> - <UniqueIdentifier>{e9abe7cb-bbbf-4315-a9ab-285b52efa3b7}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Audio\SDL"> - <UniqueIdentifier>{14019a9d-eeaf-42be-b0ec-833217f3c131}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Audio\OpenAL"> - <UniqueIdentifier>{eb34937f-6278-4d8e-ad48-3c7a6dd6606c}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\3rdparty"> - <UniqueIdentifier>{82885ffb-90e6-46d6-b92d-5d96188809b2}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\3rdparty\GLee"> - <UniqueIdentifier>{8e02a165-9a07-40ed-a7cb-1992fe1b354d}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\3rdparty\stb"> - <UniqueIdentifier>{82ff6d68-7fc7-47fd-8817-81f2a01338fa}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\3rdparty\wav"> - <UniqueIdentifier>{f590a5f6-f8d5-4607-8280-9d436fc0988b}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\3rdparty\tekcos"> - <UniqueIdentifier>{d1f6dace-eb73-49f8-8731-eeec095956eb}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\3rdparty\smount"> - <UniqueIdentifier>{2add7117-cbae-4454-a5f1-93eaed51b3e6}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Graphics"> - <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\Time"> - <UniqueIdentifier>{2ca0fd6f-0e11-4215-9ca6-c58179928bd5}</UniqueIdentifier> - </Filter> <Filter Include="res"> <UniqueIdentifier>{579f12b8-5758-4be5-9cd7-e1fa62fdef74}</UniqueIdentifier> </Filter> @@ -153,102 +75,6 @@ <ClCompile Include="..\..\src\jinc.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\Audio\Audio.cpp"> - <Filter>src\libjin\Audio</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Audio\Source.cpp"> - <Filter>src\libjin\Audio</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Core\Game.cpp"> - <Filter>src\libjin\Core</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Filesystem\Filesystem.cpp"> - <Filter>src\libjin\Filesystem</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Input\Event.cpp"> - <Filter>src\libjin\Input</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Input\Joypad.cpp"> - <Filter>src\libjin\Input</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Input\Keyboard.cpp"> - <Filter>src\libjin\Input</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Input\Mouse.cpp"> - <Filter>src\libjin\Input</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Math\Matrix.cpp"> - <Filter>src\libjin\Math</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Math\Vector.cpp"> - <Filter>src\libjin\Math</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Net\Net.cpp"> - <Filter>src\libjin\Net</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Thread\Thread.cpp"> - <Filter>src\libjin\Thread</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Utils\Log.cpp"> - <Filter>src\libjin\Utils</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Utils\unittest.cpp"> - <Filter>src\libjin\Utils</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Audio\SDL\SDLAudio.cpp"> - <Filter>src\libjin\Audio\SDL</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Audio\SDL\SDLSource.cpp"> - <Filter>src\libjin\Audio\SDL</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Audio\OpenAL\ALAudio.cpp"> - <Filter>src\libjin\Audio\OpenAL</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Audio\OpenAL\ALSource.cpp"> - <Filter>src\libjin\Audio\OpenAL</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\3rdparty\GLee\GLee.c"> - <Filter>src\libjin\3rdparty\GLee</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\3rdparty\stb\stb_vorbis.c"> - <Filter>src\libjin\3rdparty\stb</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\3rdparty\wav\wav.c"> - <Filter>src\libjin\3rdparty\wav</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\3rdparty\tekcos\tekcos.c"> - <Filter>src\libjin\3rdparty\tekcos</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\3rdparty\smount\smount.c"> - <Filter>src\libjin\3rdparty\smount</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Graphics\Canvas.cpp"> - <Filter>src\libjin\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Graphics\Drawable.cpp"> - <Filter>src\libjin\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Graphics\Font.cpp"> - <Filter>src\libjin\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Graphics\Geometry.cpp"> - <Filter>src\libjin\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Graphics\JSL.cpp"> - <Filter>src\libjin\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Graphics\Texture.cpp"> - <Filter>src\libjin\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Graphics\Window.cpp"> - <Filter>src\libjin\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Time\Timer.cpp"> - <Filter>src\libjin\Time</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Net\Socket.cpp"> - <Filter>src\libjin\Net</Filter> - </ClCompile> <ClCompile Include="..\..\src\lua\modules\audio\luaopen_audio.cpp"> <Filter>src\lua\modules\audio</Filter> </ClCompile> @@ -315,182 +141,11 @@ <ClCompile Include="..\..\src\lua\modules\luaopen_jin.cpp"> <Filter>src\lua\modules</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\Common\Object.cpp"> - <Filter>src\libjin\Common</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\Common\utf8.cpp"> - <Filter>src\libjin\Common</Filter> - </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\libjin\jin.h"> - <Filter>src\libjin</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\modules.h"> - <Filter>src\libjin</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h"> - <Filter>src\libjin\Tools\EventMsgCenter</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Audio\Audio.h"> - <Filter>src\libjin\Audio</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Audio\Source.h"> - <Filter>src\libjin\Audio</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Core\Game.h"> - <Filter>src\libjin\Core</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Core\Core.h"> - <Filter>src\libjin\Core</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Debug\Debug.h"> - <Filter>src\libjin\Debug</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Debug\Log.h"> - <Filter>src\libjin\Debug</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Filesystem\Buffer.h"> - <Filter>src\libjin\Filesystem</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Filesystem\Filesystem.h"> - <Filter>src\libjin\Filesystem</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Input\Event.h"> - <Filter>src\libjin\Input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Input\Input.h"> - <Filter>src\libjin\Input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Input\Joypad.h"> - <Filter>src\libjin\Input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Input\Keyboard.h"> - <Filter>src\libjin\Input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Input\Mouse.h"> - <Filter>src\libjin\Input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Math\constant.h"> - <Filter>src\libjin\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Math\Math.h"> - <Filter>src\libjin\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Math\Matrix.h"> - <Filter>src\libjin\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Math\Quad.h"> - <Filter>src\libjin\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Math\Vector.h"> - <Filter>src\libjin\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Net\Net.h"> - <Filter>src\libjin\Net</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Physics\Physics.h"> - <Filter>src\libjin\Physics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Physics\Rigid.h"> - <Filter>src\libjin\Physics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Thread\Thread.h"> - <Filter>src\libjin\Thread</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Tilemap\Tilemap.h"> - <Filter>src\libjin\Tilemap</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\UI\UI.h"> - <Filter>src\libjin\UI</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Utils\endian.h"> - <Filter>src\libjin\Utils</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Utils\Log.h"> - <Filter>src\libjin\Utils</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Utils\macros.h"> - <Filter>src\libjin\Utils</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Utils\utils.h"> - <Filter>src\libjin\Utils</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Audio\SDL\SDLAudio.h"> - <Filter>src\libjin\Audio\SDL</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Audio\SDL\SDLSource.h"> - <Filter>src\libjin\Audio\SDL</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Audio\OpenAL\ALAudio.h"> - <Filter>src\libjin\Audio\OpenAL</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Audio\OpenAL\ALSource.h"> - <Filter>src\libjin\Audio\OpenAL</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\3rdparty\GLee\GLee.h"> - <Filter>src\libjin\3rdparty\GLee</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_image.h"> - <Filter>src\libjin\3rdparty\stb</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_truetype.h"> - <Filter>src\libjin\3rdparty\stb</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\3rdparty\wav\wav.h"> - <Filter>src\libjin\3rdparty\wav</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\3rdparty\tekcos\tekcos.h"> - <Filter>src\libjin\3rdparty\tekcos</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\3rdparty\smount\dirent.h"> - <Filter>src\libjin\3rdparty\smount</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\3rdparty\smount\smount.h"> - <Filter>src\libjin\3rdparty\smount</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Canvas.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Color.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Drawable.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Font.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Geometry.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Graphics.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\JSL.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Texture.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Graphics\Window.h"> - <Filter>src\libjin\Graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Time\Timer.h"> - <Filter>src\libjin\Time</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Common\Singleton.hpp"> - <Filter>src\libjin\Common</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Common\Subsystem.hpp"> - <Filter>src\libjin\Common</Filter> - </ClInclude> <ClInclude Include="resource.h"> <Filter>res</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\Net\Socket.h"> - <Filter>src\libjin\Net</Filter> - </ClInclude> <ClInclude Include="..\..\src\lua\common\Reference.hpp"> <Filter>src\lua\common</Filter> </ClInclude> @@ -545,20 +200,6 @@ <ClInclude Include="..\..\src\lua\modules\types.h"> <Filter>src\lua\modules</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\Common\Object.h"> - <Filter>src\libjin\Common</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Common\StringMap.hpp"> - <Filter>src\libjin\Common</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\Common\utf8.h"> - <Filter>src\libjin\Common</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="..\..\src\libjin\README.md"> - <Filter>src\libjin</Filter> - </None> </ItemGroup> <ItemGroup> <ResourceCompile Include="jin.rc"> diff --git a/build/vs2015/libjin/libjin.vcxproj b/build/vs2015/libjin/libjin.vcxproj new file mode 100644 index 0000000..97562ee --- /dev/null +++ b/build/vs2015/libjin/libjin.vcxproj @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{9EE02090-C15E-4520-9C05-C435E45EF2FC}</ProjectGuid> + <RootNamespace>libjin</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>$(SolutionDir)..\..\bin</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>$(SolutionDir)..\..\bin</OutDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MinSpace</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + <CompileAs>CompileAsCpp</CompileAs> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> + <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <CompileAs>CompileAsCpp</CompileAs> + <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\libjin\3rdparty\GLee\GLee.h" /> + <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\dirent.h" /> + <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\smount.h" /> + <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_image.h" /> + <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_truetype.h" /> + <ClInclude Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.h" /> + <ClInclude Include="..\..\..\src\libjin\3rdparty\wav\wav.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\Audio.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\OpenAL\ALAudio.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\OpenAL\ALSource.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLSource.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\Source.h" /> + <ClInclude Include="..\..\..\src\libjin\Common\Object.h" /> + <ClInclude Include="..\..\..\src\libjin\Common\Singleton.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Common\StringMap.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Common\Subsystem.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Common\utf8.h" /> + <ClInclude Include="..\..\..\src\libjin\Core\Core.h" /> + <ClInclude Include="..\..\..\src\libjin\Core\Game.h" /> + <ClInclude Include="..\..\..\src\libjin\Debug\Debug.h" /> + <ClInclude Include="..\..\..\src\libjin\Debug\Log.h" /> + <ClInclude Include="..\..\..\src\libjin\Filesystem\Buffer.h" /> + <ClInclude Include="..\..\..\src\libjin\Filesystem\Filesystem.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Canvas.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Color.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Drawable.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Geometry.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\JSL.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\Event.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\Input.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\Joypad.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\Keyboard.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\Mouse.h" /> + <ClInclude Include="..\..\..\src\libjin\jin.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\constant.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\Math.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\Matrix.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\Quad.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\Vector.h" /> + <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" /> + <ClInclude Include="..\..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h" /> + <ClInclude Include="..\..\..\src\libjin\UI\UI.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\endian.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\Log.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\macros.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\utils.h" /> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\src\libjin\README.md" /> + </ItemGroup> + <ItemGroup> + <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" /> + <ClCompile Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.c" /> + <ClCompile Include="..\..\..\src\libjin\3rdparty\wav\wav.c" /> + <ClCompile Include="..\..\..\src\libjin\Audio\Audio.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\OpenAL\ALAudio.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\OpenAL\ALSource.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLSource.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\Source.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Common\Object.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Common\utf8.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Core\Game.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Filesystem\Filesystem.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\Canvas.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\Drawable.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\Font.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\Geometry.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\JSL.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Input\Event.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Input\Joypad.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Input\Keyboard.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Input\Mouse.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Math\Matrix.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Math\Vector.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Net\Net.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Net\Socket.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Thread\Thread.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Time\Timer.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Utils\Log.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Utils\unittest.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/build/vs2015/libjin/libjin.vcxproj.filters b/build/vs2015/libjin/libjin.vcxproj.filters new file mode 100644 index 0000000..5d35e1e --- /dev/null +++ b/build/vs2015/libjin/libjin.vcxproj.filters @@ -0,0 +1,368 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source"> + <UniqueIdentifier>{708c6303-1b76-4db4-bac5-be6fa9179e98}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Audio"> + <UniqueIdentifier>{27146cd2-84fe-4eaf-a45b-641a463d381b}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Audio\SDL"> + <UniqueIdentifier>{2dc5e4ca-0904-4b49-8043-5d02db438008}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Audio\OpenAL"> + <UniqueIdentifier>{5a317104-8e72-4adf-9ba5-73fc7ba5f08a}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Common"> + <UniqueIdentifier>{908f94da-1fc4-42db-abe9-8c8e17051f9d}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Core"> + <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Debug"> + <UniqueIdentifier>{aa4b3ca5-8f5b-4150-9482-21d3aa6eb902}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Filesystem"> + <UniqueIdentifier>{3a98cf95-d45a-4a0e-b3fe-65b5accdb75f}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Input"> + <UniqueIdentifier>{e4d464ae-1cb5-47fd-b24a-fd35708aead0}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Math"> + <UniqueIdentifier>{17b71ceb-a8ff-4ec0-aa18-b51e265bec34}</UniqueIdentifier> + </Filter> + <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> + <Filter Include="Source\Tilemap"> + <UniqueIdentifier>{7a39e6c4-8899-4bb7-bbad-cfb294fcd729}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Tools"> + <UniqueIdentifier>{aa8fe913-0a49-4fed-8ad8-92a8339e9ed7}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Tools\EventMsgCenter"> + <UniqueIdentifier>{6d942940-9b42-49b8-82d0-d5495254dc99}</UniqueIdentifier> + </Filter> + <Filter Include="Source\UI"> + <UniqueIdentifier>{6340a8aa-ed06-4090-849e-cd7b2def4ba7}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Utils"> + <UniqueIdentifier>{6259760f-501a-4b52-b9a1-4abb4d788a99}</UniqueIdentifier> + </Filter> + <Filter Include="Source\3rdparty"> + <UniqueIdentifier>{3634a892-8e97-442c-b855-80a26dff2143}</UniqueIdentifier> + </Filter> + <Filter Include="Source\3rdparty\GLee"> + <UniqueIdentifier>{230b5ce5-8893-4aed-8f96-576d5f0aa3a2}</UniqueIdentifier> + </Filter> + <Filter Include="Source\3rdparty\stb"> + <UniqueIdentifier>{d3f9b98c-e18c-4603-be4a-40cf5270c8a0}</UniqueIdentifier> + </Filter> + <Filter Include="Source\3rdparty\wav"> + <UniqueIdentifier>{6f4aa0ff-3d1b-40ff-8da9-ce7292ac83b2}</UniqueIdentifier> + </Filter> + <Filter Include="Source\3rdparty\tekcos"> + <UniqueIdentifier>{06d4dd93-7a6d-4b9e-a841-c7f8fbccafe0}</UniqueIdentifier> + </Filter> + <Filter Include="Source\3rdparty\smount"> + <UniqueIdentifier>{60deec03-f023-4417-a058-c955d23f01d4}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Graphics"> + <UniqueIdentifier>{bb6c372a-520b-4de3-ab14-64839a6166d9}</UniqueIdentifier> + </Filter> + <Filter Include="Source\Time"> + <UniqueIdentifier>{e11ee8ea-9e7d-4906-a6fd-8df56cb6a3e9}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\libjin\jin.h"> + <Filter>Source</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\modules.h"> + <Filter>Source</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Audio\Audio.h"> + <Filter>Source\Audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Audio\Source.h"> + <Filter>Source\Audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.h"> + <Filter>Source\Audio\SDL</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLSource.h"> + <Filter>Source\Audio\SDL</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Audio\OpenAL\ALAudio.h"> + <Filter>Source\Audio\OpenAL</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Audio\OpenAL\ALSource.h"> + <Filter>Source\Audio\OpenAL</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Common\Object.h"> + <Filter>Source\Common</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Common\Singleton.hpp"> + <Filter>Source\Common</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Common\StringMap.hpp"> + <Filter>Source\Common</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Common\Subsystem.hpp"> + <Filter>Source\Common</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Common\utf8.h"> + <Filter>Source\Common</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Core\Core.h"> + <Filter>Source\Core</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Core\Game.h"> + <Filter>Source\Core</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Debug\Debug.h"> + <Filter>Source\Debug</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Debug\Log.h"> + <Filter>Source\Debug</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Filesystem\Buffer.h"> + <Filter>Source\Filesystem</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Filesystem\Filesystem.h"> + <Filter>Source\Filesystem</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Input\Event.h"> + <Filter>Source\Input</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Input\Input.h"> + <Filter>Source\Input</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Input\Joypad.h"> + <Filter>Source\Input</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Input\Keyboard.h"> + <Filter>Source\Input</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Input\Mouse.h"> + <Filter>Source\Input</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Math\constant.h"> + <Filter>Source\Math</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Math\Math.h"> + <Filter>Source\Math</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Math\Matrix.h"> + <Filter>Source\Math</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Math\Quad.h"> + <Filter>Source\Math</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Math\Vector.h"> + <Filter>Source\Math</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Net\Net.h"> + <Filter>Source\Net</Filter> + </ClInclude> + <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> + <ClInclude Include="..\..\..\src\libjin\Tilemap\Tilemap.h"> + <Filter>Source\Tilemap</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h"> + <Filter>Source\Tools\EventMsgCenter</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\UI\UI.h"> + <Filter>Source\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Utils\endian.h"> + <Filter>Source\Utils</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Utils\Log.h"> + <Filter>Source\Utils</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Utils\macros.h"> + <Filter>Source\Utils</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Utils\utils.h"> + <Filter>Source\Utils</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\GLee\GLee.h"> + <Filter>Source\3rdparty\GLee</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_image.h"> + <Filter>Source\3rdparty\stb</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_truetype.h"> + <Filter>Source\3rdparty\stb</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\wav\wav.h"> + <Filter>Source\3rdparty\wav</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.h"> + <Filter>Source\3rdparty\tekcos</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\dirent.h"> + <Filter>Source\3rdparty\smount</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\smount.h"> + <Filter>Source\3rdparty\smount</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Canvas.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Color.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Drawable.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Geometry.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\JSL.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h"> + <Filter>Source\Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Time\Timer.h"> + <Filter>Source\Time</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\src\libjin\README.md"> + <Filter>Source</Filter> + </None> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\libjin\Audio\Audio.cpp"> + <Filter>Source\Audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Audio\Source.cpp"> + <Filter>Source\Audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.cpp"> + <Filter>Source\Audio\SDL</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLSource.cpp"> + <Filter>Source\Audio\SDL</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Audio\OpenAL\ALAudio.cpp"> + <Filter>Source\Audio\OpenAL</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Audio\OpenAL\ALSource.cpp"> + <Filter>Source\Audio\OpenAL</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Common\Object.cpp"> + <Filter>Source\Common</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Common\utf8.cpp"> + <Filter>Source\Common</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Core\Game.cpp"> + <Filter>Source\Core</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Filesystem\Filesystem.cpp"> + <Filter>Source\Filesystem</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Input\Event.cpp"> + <Filter>Source\Input</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Input\Joypad.cpp"> + <Filter>Source\Input</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Input\Keyboard.cpp"> + <Filter>Source\Input</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Input\Mouse.cpp"> + <Filter>Source\Input</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Math\Matrix.cpp"> + <Filter>Source\Math</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Math\Vector.cpp"> + <Filter>Source\Math</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Net\Net.cpp"> + <Filter>Source\Net</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Net\Socket.cpp"> + <Filter>Source\Net</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Thread\Thread.cpp"> + <Filter>Source\Thread</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Utils\Log.cpp"> + <Filter>Source\Utils</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Utils\unittest.cpp"> + <Filter>Source\Utils</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\3rdparty\GLee\GLee.c"> + <Filter>Source\3rdparty\GLee</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\3rdparty\stb\stb_vorbis.c"> + <Filter>Source\3rdparty\stb</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\3rdparty\wav\wav.c"> + <Filter>Source\3rdparty\wav</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.c"> + <Filter>Source\3rdparty\tekcos</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\3rdparty\smount\smount.c"> + <Filter>Source\3rdparty\smount</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Graphics\Canvas.cpp"> + <Filter>Source\Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Graphics\Drawable.cpp"> + <Filter>Source\Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Graphics\Font.cpp"> + <Filter>Source\Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Graphics\Geometry.cpp"> + <Filter>Source\Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Graphics\JSL.cpp"> + <Filter>Source\Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp"> + <Filter>Source\Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp"> + <Filter>Source\Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Time\Timer.cpp"> + <Filter>Source\Time</Filter> + </ClCompile> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/vs2015/libjin/libjin.vcxproj.user b/build/vs2015/libjin/libjin.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/vs2015/libjin/libjin.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup /> +</Project>
\ No newline at end of file diff --git a/src/libjin/3rdparty/tekcos/tekcos.c b/src/libjin/3rdparty/tekcos/tekcos.c index 0eed75b..e2b7e5c 100644 --- a/src/libjin/3rdparty/tekcos/tekcos.c +++ b/src/libjin/3rdparty/tekcos/tekcos.c @@ -168,15 +168,17 @@ error: int tk_tcp_send(tk_TCPsocket* client, const void* buffer, int size, int* sent) { const char *data = (const char*)buffer; + int left; + int len; if (client->type != SOCKET_TCLIENT) { state = TK_WRONGSOCKETTPYE; goto error; } - int left = size; + left = size; if(sent) *sent = 0; - int len = 0; + len = 0; do { len = send(client->id, data, left, 0); if (len > 0) { @@ -194,12 +196,13 @@ error: int tk_tcp_recv(tk_TCPsocket* client, char* buffer, int size, int* len) { *len = 0; + int l; if (client->type != SOCKET_TCLIENT) { state = TK_WRONGSOCKETTPYE; goto error; } - int l = 0; + l = 0; do { l = recv(client->id, buffer, size - *len, 0); @@ -221,6 +224,7 @@ tk_TCPsocket tk_tcp_accept(tk_TCPsocket* server) // client socket tk_TCPsocket csk; memset(&csk, 0, sizeof(csk)); + int addr_len; if (server->type != SOCKET_TSERVER) { state = TK_WRONGSOCKETTPYE; @@ -228,7 +232,7 @@ tk_TCPsocket tk_tcp_accept(tk_TCPsocket* server) } struct sockaddr_in addr; memset(&addr, 0, sizeof(addr)); - int addr_len = sizeof(addr); + addr_len = sizeof(addr); csk.id = accept(server->id, (struct sockaddr *)&addr, &addr_len); if (csk.id == INVALID_SOCKET) { diff --git a/src/libjin/Audio/Source.cpp b/src/libjin/Audio/Source.cpp index ceb882d..61f4055 100644 --- a/src/libjin/Audio/Source.cpp +++ b/src/libjin/Audio/Source.cpp @@ -9,7 +9,7 @@ namespace jin namespace audio { - static int check_header(const void *data, int size, char *str, int offset) { + static int check_header(const void *data, int size, const char *str, int offset) { int len = strlen(str); return (size >= offset + len) && !memcmp((char*)data + offset, str, len); } diff --git a/src/libjin/Common/Subsystem.hpp b/src/libjin/Common/Subsystem.hpp index c3af3dc..1374ad1 100644 --- a/src/libjin/Common/Subsystem.hpp +++ b/src/libjin/Common/Subsystem.hpp @@ -23,7 +23,7 @@ namespace jin void quit() { CALLONCE(quitSystem()); - destroy(); + Singleton<System>::destroy(); } protected: @@ -33,8 +33,8 @@ namespace jin SINGLETON(System); - virtual onlyonce bool initSystem(const Setting* setting) = 0; - virtual onlyonce void quitSystem() = 0; + /*onlyonce*/ virtual bool initSystem(const Setting* setting) = 0; + /*onlyonce*/ virtual void quitSystem() = 0; }; diff --git a/src/libjin/Graphics/Drawable.h b/src/libjin/Graphics/Drawable.h index 0b96379..e04ac6b 100644 --- a/src/libjin/Graphics/Drawable.h +++ b/src/libjin/Graphics/Drawable.h @@ -19,12 +19,12 @@ namespace graphics void draw(int x, int y, float sx, float sy, float r); - inline int Drawable::getWidth() const + inline int getWidth() const { return width; } - inline int Drawable::getHeight() const + inline int getHeight() const { return height; } diff --git a/src/libjin/Graphics/JSL.h b/src/libjin/Graphics/JSL.h index df942fd..8d4712b 100644 --- a/src/libjin/Graphics/JSL.h +++ b/src/libjin/Graphics/JSL.h @@ -24,13 +24,13 @@ namespace graphics virtual ~JSLProgram(); - inline void JSLProgram::use() + inline void use() { glUseProgram(pid); currentJSLProgram = this; } - static inline void JSLProgram::unuse() + static inline void unuse() { glUseProgram(0); currentJSLProgram = nullptr; diff --git a/src/libjin/Utils/Log.h b/src/libjin/Utils/Log.h index 50ec3c8..e4ed879 100644 --- a/src/libjin/Utils/Log.h +++ b/src/libjin/Utils/Log.h @@ -61,7 +61,7 @@ void Loghelper::log(Level _level, const char* _fmt, ...) if (!hasbit(levels, _level)) return; #define FORMAT_MSG_BUFFER_SIZE (204800) - char* levelStr = nullptr; + const char* levelStr = nullptr; switch (_level) { case LV_ERROR: diff --git a/src/libjin/Utils/log.h b/src/libjin/Utils/log.h index 50ec3c8..e4ed879 100644 --- a/src/libjin/Utils/log.h +++ b/src/libjin/Utils/log.h @@ -61,7 +61,7 @@ void Loghelper::log(Level _level, const char* _fmt, ...) if (!hasbit(levels, _level)) return; #define FORMAT_MSG_BUFFER_SIZE (204800) - char* levelStr = nullptr; + const char* levelStr = nullptr; switch (_level) { case LV_ERROR: diff --git a/src/libjin/audio/source.cpp b/src/libjin/audio/source.cpp index ceb882d..61f4055 100644 --- a/src/libjin/audio/source.cpp +++ b/src/libjin/audio/source.cpp @@ -9,7 +9,7 @@ namespace jin namespace audio { - static int check_header(const void *data, int size, char *str, int offset) { + static int check_header(const void *data, int size, const char *str, int offset) { int len = strlen(str); return (size >= offset + len) && !memcmp((char*)data + offset, str, len); } diff --git a/src/libjin/utils/log.h b/src/libjin/utils/log.h index 50ec3c8..e4ed879 100644 --- a/src/libjin/utils/log.h +++ b/src/libjin/utils/log.h @@ -61,7 +61,7 @@ void Loghelper::log(Level _level, const char* _fmt, ...) if (!hasbit(levels, _level)) return; #define FORMAT_MSG_BUFFER_SIZE (204800) - char* levelStr = nullptr; + const char* levelStr = nullptr; switch (_level) { case LV_ERROR: |