diff options
| author | chai <chaifix@163.com> | 2018-09-13 07:55:14 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-09-13 07:55:14 +0800 |
| commit | e85fcaf2c40da42c5949f8dbeae8db1053251732 (patch) | |
| tree | 50731806680a1769525f8e2b63625322edaea035 | |
| parent | bef239070882c3b355f1689bcd2c08e0eb6dc8ba (diff) | |
*update
49 files changed, 112 insertions, 110 deletions
diff --git a/build/01HelloWorld/01HelloWorld.vcxproj b/build/01HelloWorld/01HelloWorld.vcxproj index cab9535..fb2a36a 100644 --- a/build/01HelloWorld/01HelloWorld.vcxproj +++ b/build/01HelloWorld/01HelloWorld.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -21,32 +21,32 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{F1B984AA-F46D-46C9-9A5A-7606A30E0599}</ProjectGuid> <RootNamespace>My01HelloWorld</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <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>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> diff --git a/build/02Audio/02Audio.vcxproj b/build/02Audio/02Audio.vcxproj index 5aa3542..1c7ae98 100644 --- a/build/02Audio/02Audio.vcxproj +++ b/build/02Audio/02Audio.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -21,32 +21,32 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{A2D75980-B0AC-498C-B507-4727B4A38E83}</ProjectGuid> <RootNamespace>My02Audio</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <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>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> diff --git a/build/03Thread/03Thread.vcxproj b/build/03Thread/03Thread.vcxproj index 6cad582..06187a8 100644 --- a/build/03Thread/03Thread.vcxproj +++ b/build/03Thread/03Thread.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -21,32 +21,32 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{0E49D105-2032-4825-9FA1-54B1B94E3655}</ProjectGuid> <RootNamespace>My03Thread</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <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>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> diff --git a/build/04Network/04Network.vcxproj b/build/04Network/04Network.vcxproj index b992a7a..e428352 100644 --- a/build/04Network/04Network.vcxproj +++ b/build/04Network/04Network.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -21,32 +21,32 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{85071432-24B6-46D4-98D8-DAA63183093C}</ProjectGuid> <RootNamespace>My04Network</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <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>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj index a00e954..b91de18 100644 --- a/build/libjin/libjin.vcxproj +++ b/build/libjin/libjin.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -25,15 +25,13 @@ <ClCompile Include="..\..\libjin\3rdparty\tekcos\tekcos.c" /> <ClCompile Include="..\..\libjin\3rdparty\wav\wav.c" /> <ClCompile Include="..\..\libjin\Audio\Audio.cpp" /> - <ClCompile Include="..\..\libjin\Audio\OpenAL\ALAudio.cpp" /> - <ClCompile Include="..\..\libjin\Audio\OpenAL\ALSource.cpp" /> <ClCompile Include="..\..\libjin\Audio\SDL\SDLAudio.cpp" /> <ClCompile Include="..\..\libjin\Audio\SDL\SDLSource.cpp" /> <ClCompile Include="..\..\libjin\Audio\Source.cpp" /> <ClCompile Include="..\..\libjin\Common\Object.cpp" /> <ClCompile Include="..\..\libjin\Common\utf8.cpp" /> - <ClCompile Include="..\..\libjin\Core\Game.cpp" /> <ClCompile Include="..\..\libjin\Filesystem\Filesystem.cpp" /> + <ClCompile Include="..\..\libjin\Game\Game.cpp" /> <ClCompile Include="..\..\libjin\Graphics\Bitmap.cpp" /> <ClCompile Include="..\..\libjin\Graphics\Canvas.cpp" /> <ClCompile Include="..\..\libjin\Graphics\Color.cpp" /> @@ -70,8 +68,6 @@ <ClInclude Include="..\..\libjin\3rdparty\tekcos\tekcos.h" /> <ClInclude Include="..\..\libjin\3rdparty\wav\wav.h" /> <ClInclude Include="..\..\libjin\Audio\Audio.h" /> - <ClInclude Include="..\..\libjin\Audio\OpenAL\ALAudio.h" /> - <ClInclude Include="..\..\libjin\Audio\OpenAL\ALSource.h" /> <ClInclude Include="..\..\libjin\Audio\SDL\SDLAudio.h" /> <ClInclude Include="..\..\libjin\Audio\SDL\SDLSource.h" /> <ClInclude Include="..\..\libjin\Audio\Source.h" /> @@ -80,13 +76,13 @@ <ClInclude Include="..\..\libjin\Common\Singleton.hpp" /> <ClInclude Include="..\..\libjin\Common\StringMap.hpp" /> <ClInclude Include="..\..\libjin\Common\Subsystem.hpp" /> + <ClInclude Include="..\..\libjin\Common\types.h" /> <ClInclude Include="..\..\libjin\Common\utf8.h" /> - <ClInclude Include="..\..\libjin\Core\Core.h" /> - <ClInclude Include="..\..\libjin\Core\Game.h" /> <ClInclude Include="..\..\libjin\Debug\Debug.h" /> <ClInclude Include="..\..\libjin\Debug\Log.h" /> <ClInclude Include="..\..\libjin\Filesystem\Buffer.h" /> <ClInclude Include="..\..\libjin\Filesystem\Filesystem.h" /> + <ClInclude Include="..\..\libjin\Game\Game.h" /> <ClInclude Include="..\..\libjin\Graphics\base.shader.h" /> <ClInclude Include="..\..\libjin\Graphics\Bitmap.h" /> <ClInclude Include="..\..\libjin\Graphics\Canvas.h" /> @@ -94,6 +90,7 @@ <ClInclude Include="..\..\libjin\Graphics\Drawable.h" /> <ClInclude Include="..\..\libjin\Graphics\Font.h" /> <ClInclude Include="..\..\libjin\Graphics\Graphics.h" /> + <ClInclude Include="..\..\libjin\Graphics\jin_opengl.h" /> <ClInclude Include="..\..\libjin\Graphics\Shader.h" /> <ClInclude Include="..\..\libjin\Graphics\Shapes.h" /> <ClInclude Include="..\..\libjin\Graphics\Texture.h" /> @@ -109,7 +106,7 @@ <ClInclude Include="..\..\libjin\Math\Matrix.h" /> <ClInclude Include="..\..\libjin\Math\Quad.h" /> <ClInclude Include="..\..\libjin\Math\Vector.h" /> - <ClInclude Include="..\..\libjin\modules.h" /> + <ClInclude Include="..\..\libjin\jin_configuration.h" /> <ClInclude Include="..\..\libjin\Net\Net.h" /> <ClInclude Include="..\..\libjin\Net\Socket.h" /> <ClInclude Include="..\..\libjin\Physics\Physics.h" /> @@ -138,32 +135,32 @@ <ProjectGuid>{407E9199-D39C-4460-B218-0C29AB42483B}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>libjin</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.14393.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>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters index c24d727..1fa6de6 100644 --- a/build/libjin/libjin.vcxproj.filters +++ b/build/libjin/libjin.vcxproj.filters @@ -25,9 +25,6 @@ <Filter Include="Common"> <UniqueIdentifier>{2277fe39-88f2-4009-94ba-80c093d01a84}</UniqueIdentifier> </Filter> - <Filter Include="Core"> - <UniqueIdentifier>{0de74e8c-939d-4275-a4d6-a1c075b8eeb2}</UniqueIdentifier> - </Filter> <Filter Include="Debug"> <UniqueIdentifier>{fe7b76de-1e3e-427f-9885-19f6d54d79e1}</UniqueIdentifier> </Filter> @@ -64,9 +61,6 @@ <Filter Include="Audio\SDL"> <UniqueIdentifier>{1f73d1ca-ab45-47b2-bd2e-5b4f8cd8ee40}</UniqueIdentifier> </Filter> - <Filter Include="Audio\OpenAL"> - <UniqueIdentifier>{c2b1ec18-2952-4461-92d3-79226870e1a2}</UniqueIdentifier> - </Filter> <Filter Include="Time"> <UniqueIdentifier>{53e06a65-a5ba-41d8-a1f6-6fb5680207ba}</UniqueIdentifier> </Filter> @@ -103,6 +97,9 @@ <Filter Include="Utils\Proxy"> <UniqueIdentifier>{84e2ae2f-5cec-4904-9611-330a0362a288}</UniqueIdentifier> </Filter> + <Filter Include="Game"> + <UniqueIdentifier>{0de74e8c-939d-4275-a4d6-a1c075b8eeb2}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\libjin\3rdparty\GLee\GLee.c"> @@ -132,15 +129,6 @@ <ClCompile Include="..\..\libjin\Audio\SDL\SDLSource.cpp"> <Filter>Audio\SDL</Filter> </ClCompile> - <ClCompile Include="..\..\libjin\Audio\OpenAL\ALAudio.cpp"> - <Filter>Audio\OpenAL</Filter> - </ClCompile> - <ClCompile Include="..\..\libjin\Audio\OpenAL\ALSource.cpp"> - <Filter>Audio\OpenAL</Filter> - </ClCompile> - <ClCompile Include="..\..\libjin\Core\Game.cpp"> - <Filter>Core</Filter> - </ClCompile> <ClCompile Include="..\..\libjin\Filesystem\Filesystem.cpp"> <Filter>Filesystem</Filter> </ClCompile> @@ -225,6 +213,9 @@ <ClCompile Include="..\..\libjin\Graphics\Shapes.cpp"> <Filter>Graphics</Filter> </ClCompile> + <ClCompile Include="..\..\libjin\Game\Game.cpp"> + <Filter>Game</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\libjin\3rdparty\GLee\GLee.h"> @@ -263,21 +254,9 @@ <ClInclude Include="..\..\libjin\Audio\SDL\SDLSource.h"> <Filter>Audio\SDL</Filter> </ClInclude> - <ClInclude Include="..\..\libjin\Audio\OpenAL\ALAudio.h"> - <Filter>Audio\OpenAL</Filter> - </ClInclude> - <ClInclude Include="..\..\libjin\Audio\OpenAL\ALSource.h"> - <Filter>Audio\OpenAL</Filter> - </ClInclude> <ClInclude Include="..\..\libjin\Common\Data.h"> <Filter>Common</Filter> </ClInclude> - <ClInclude Include="..\..\libjin\Core\Core.h"> - <Filter>Core</Filter> - </ClInclude> - <ClInclude Include="..\..\libjin\Core\Game.h"> - <Filter>Core</Filter> - </ClInclude> <ClInclude Include="..\..\libjin\Debug\Debug.h"> <Filter>Debug</Filter> </ClInclude> @@ -372,7 +351,6 @@ <Filter>Physics</Filter> </ClInclude> <ClInclude Include="..\..\libjin\jin.h" /> - <ClInclude Include="..\..\libjin\modules.h" /> <ClInclude Include="..\..\libjin\Time\Timer.h"> <Filter>Time</Filter> </ClInclude> @@ -430,6 +408,16 @@ <ClInclude Include="..\..\libjin\Graphics\Shapes.h"> <Filter>Graphics</Filter> </ClInclude> + <ClInclude Include="..\..\libjin\Graphics\jin_opengl.h"> + <Filter>Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\libjin\jin_configuration.h" /> + <ClInclude Include="..\..\libjin\Game\Game.h"> + <Filter>Game</Filter> + </ClInclude> + <ClInclude Include="..\..\libjin\Common\types.h"> + <Filter>Common</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\libjin\README.md" /> diff --git a/libjin/Audio/Audio.cpp b/libjin/Audio/Audio.cpp index c9a3e40..798269a 100644 --- a/libjin/Audio/Audio.cpp +++ b/libjin/Audio/Audio.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" diff --git a/libjin/Audio/Audio.h b/libjin/Audio/Audio.h index 9faf0bc..b9812dd 100644 --- a/libjin/Audio/Audio.h +++ b/libjin/Audio/Audio.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_H #define __LIBJIN_AUDIO_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" diff --git a/libjin/Audio/SDL/SDLAudio.cpp b/libjin/Audio/SDL/SDLAudio.cpp index d457dca..9a256b1 100644 --- a/libjin/Audio/SDL/SDLAudio.cpp +++ b/libjin/Audio/SDL/SDLAudio.cpp @@ -1,4 +1,4 @@ -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include <iostream> diff --git a/libjin/Audio/SDL/SDLAudio.h b/libjin/Audio/SDL/SDLAudio.h index 97ed664..db232b7 100644 --- a/libjin/Audio/SDL/SDLAudio.h +++ b/libjin/Audio/SDL/SDLAudio.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_SDL_H #define __LIBJIN_AUDIO_SDL_H -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include "SDLSource.h" diff --git a/libjin/Audio/SDL/SDLSource.cpp b/libjin/Audio/SDL/SDLSource.cpp index 00193a4..251ef27 100644 --- a/libjin/Audio/SDL/SDLSource.cpp +++ b/libjin/Audio/SDL/SDLSource.cpp @@ -1,4 +1,4 @@ -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include <exception> diff --git a/libjin/Audio/SDL/SDLSource.h b/libjin/Audio/SDL/SDLSource.h index 7e407ee..40f4693 100644 --- a/libjin/Audio/SDL/SDLSource.h +++ b/libjin/Audio/SDL/SDLSource.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_SOURCE_SDL_H #define __LIBJIN_SOURCE_SDL_H -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include <vector> diff --git a/libjin/Audio/Source.cpp b/libjin/Audio/Source.cpp index 7ac4e60..1dcd482 100644 --- a/libjin/Audio/Source.cpp +++ b/libjin/Audio/Source.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include <cstring> diff --git a/libjin/Audio/Source.h b/libjin/Audio/Source.h index b227db2..e1ca6d0 100644 --- a/libjin/Audio/Source.h +++ b/libjin/Audio/Source.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_SOURCE_H #define __LIBJIN_AUDIO_SOURCE_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" diff --git a/libjin/Common/types.h b/libjin/Common/types.h new file mode 100644 index 0000000..7e335c0 --- /dev/null +++ b/libjin/Common/types.h @@ -0,0 +1,23 @@ +#ifndef __LIBJIN_TYPES_H +#define __LIBJIN_TYPES_H +#include <stdint.h> + +namespace jin +{ +namespace common +{ + + typedef int8_t int8; + typedef uint8_t uint8; + typedef uint8 byte; + typedef int16_t int16; + typedef uint16_t uint16; + typedef int32_t int32; + typedef uint32_t uint32; + typedef int64_t int64; + typedef uint64_t uint64; + +} +} + +#endif
\ No newline at end of file diff --git a/libjin/Common/utf8.cpp b/libjin/Common/utf8.cpp index 8c05da8..f00d03c 100644 --- a/libjin/Common/utf8.cpp +++ b/libjin/Common/utf8.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_OS == LIBJIN_WINDOWS #include "utf8.h" diff --git a/libjin/Common/utf8.h b/libjin/Common/utf8.h index 5985684..fd6ce1f 100644 --- a/libjin/Common/utf8.h +++ b/libjin/Common/utf8.h @@ -1,7 +1,7 @@ #ifndef __LIBJIN_COMMON_UTF8_H #define __LIBJIN_COMMON_UTF8_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_OS == LIBJIN_WINDOWS #include <string> diff --git a/libjin/Core/Core.h b/libjin/Core/Core.h deleted file mode 100644 index 4b4df8f..0000000 --- a/libjin/Core/Core.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LIBJIN_CORE_H -#define __LIBJIN_CORE_H - -#include "game.h" - -#endif
\ No newline at end of file diff --git a/libjin/Core/Game.cpp b/libjin/Game/Game.cpp index 3f905f2..3f905f2 100644 --- a/libjin/Core/Game.cpp +++ b/libjin/Game/Game.cpp diff --git a/libjin/Core/Game.h b/libjin/Game/Game.h index 725c62c..725c62c 100644 --- a/libjin/Core/Game.h +++ b/libjin/Game/Game.h diff --git a/libjin/Graphics/Bitmap.h b/libjin/Graphics/Bitmap.h index ab84388..5754145 100644 --- a/libjin/Graphics/Bitmap.h +++ b/libjin/Graphics/Bitmap.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_BITMAP_H #define __LIBJIN_BITMAP_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../Math/Vector2.hpp" diff --git a/libjin/Graphics/Canvas.cpp b/libjin/Graphics/Canvas.cpp index efcd12d..d5f7729 100644 --- a/libjin/Graphics/Canvas.cpp +++ b/libjin/Graphics/Canvas.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/macros.h" diff --git a/libjin/Graphics/Canvas.h b/libjin/Graphics/Canvas.h index a6a52ea..041005a 100644 --- a/libjin/Graphics/Canvas.h +++ b/libjin/Graphics/Canvas.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_CANVAS_H #define __LIBJIN_CANVAS_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "drawable.h" diff --git a/libjin/Graphics/Color.h b/libjin/Graphics/Color.h index a5bc5d0..97a87d6 100644 --- a/libjin/Graphics/Color.h +++ b/libjin/Graphics/Color.h @@ -3,7 +3,7 @@ */ #ifndef __LIBJIN_COLOR_H #define __LIBJIN_COLOR_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/endian.h" diff --git a/libjin/Graphics/Drawable.cpp b/libjin/Graphics/Drawable.cpp index 675c54d..ad87841 100644 --- a/libjin/Graphics/Drawable.cpp +++ b/libjin/Graphics/Drawable.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "drawable.h" diff --git a/libjin/Graphics/Drawable.h b/libjin/Graphics/Drawable.h index ff82365..3aee208 100644 --- a/libjin/Graphics/Drawable.h +++ b/libjin/Graphics/Drawable.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_DRAWABLE #define __LIBJIN_DRAWABLE -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../math/Vector2.hpp" diff --git a/libjin/Graphics/Font.cpp b/libjin/Graphics/Font.cpp index 17653f0..ec4f7fb 100644 --- a/libjin/Graphics/Font.cpp +++ b/libjin/Graphics/Font.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "font.h" diff --git a/libjin/Graphics/Font.h b/libjin/Graphics/Font.h index 10fd242..fa54337 100644 --- a/libjin/Graphics/Font.h +++ b/libjin/Graphics/Font.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_FONT_H #define __LIBJIN_FONT_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include <vector> diff --git a/libjin/Graphics/Graphics.h b/libjin/Graphics/Graphics.h index dfd6048..961f9b1 100644 --- a/libjin/Graphics/Graphics.h +++ b/libjin/Graphics/Graphics.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_GRAPHICS_H #define __LIBJIN_GRAPHICS_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "canvas.h" diff --git a/libjin/Graphics/Shader.cpp b/libjin/Graphics/Shader.cpp index e882d35..0f9dab6 100644 --- a/libjin/Graphics/Shader.cpp +++ b/libjin/Graphics/Shader.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/macros.h" diff --git a/libjin/Graphics/Shader.h b/libjin/Graphics/Shader.h index 83a2831..cf73f3c 100644 --- a/libjin/Graphics/Shader.h +++ b/libjin/Graphics/Shader.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_JSL_H #define __LIBJIN_JSL_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include <string> diff --git a/libjin/Graphics/Shapes.cpp b/libjin/Graphics/Shapes.cpp index 2cb33a2..f80aa18 100644 --- a/libjin/Graphics/Shapes.cpp +++ b/libjin/Graphics/Shapes.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "Shapes.h" diff --git a/libjin/Graphics/Shapes.h b/libjin/Graphics/Shapes.h index dc9f272..b248cca 100644 --- a/libjin/Graphics/Shapes.h +++ b/libjin/Graphics/Shapes.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_GEOMETRY_H #define __LIBJIN_GEOMETRY_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "color.h" diff --git a/libjin/Graphics/Texture.cpp b/libjin/Graphics/Texture.cpp index 9ffe946..45aedfb 100644 --- a/libjin/Graphics/Texture.cpp +++ b/libjin/Graphics/Texture.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include <fstream> diff --git a/libjin/Graphics/Texture.h b/libjin/Graphics/Texture.h index f2e45f0..d088928 100644 --- a/libjin/Graphics/Texture.h +++ b/libjin/Graphics/Texture.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_IMAGE_H #define __LIBJIN_IMAGE_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../3rdparty/GLee/GLee.h" diff --git a/libjin/Graphics/Window.cpp b/libjin/Graphics/Window.cpp index 1fb60cc..bafc9ea 100644 --- a/libjin/Graphics/Window.cpp +++ b/libjin/Graphics/Window.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include <iostream> diff --git a/libjin/Graphics/Window.h b/libjin/Graphics/Window.h index 6b247a6..301b0b5 100644 --- a/libjin/Graphics/Window.h +++ b/libjin/Graphics/Window.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_RENDER_WINDOW #define __LIBJIN_RENDER_WINDOW -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "SDL2/SDL.h" diff --git a/libjin/Graphics/jin_opengl.h b/libjin/Graphics/jin_opengl.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/libjin/Graphics/jin_opengl.h diff --git a/libjin/Input/Event.h b/libjin/Input/Event.h index cef6b88..7ab07da 100644 --- a/libjin/Input/Event.h +++ b/libjin/Input/Event.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_EVENT_H #define __LIBJIN_EVENT_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_INPUT namespace jin diff --git a/libjin/Input/Mouse.cpp b/libjin/Input/Mouse.cpp index 892d140..31c29f9 100644 --- a/libjin/Input/Mouse.cpp +++ b/libjin/Input/Mouse.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #ifdef LIBJIN_MODULES_INPUT #include "SDL.h" diff --git a/libjin/Input/Mouse.h b/libjin/Input/Mouse.h index 25dd4c3..09db5d2 100644 --- a/libjin/Input/Mouse.h +++ b/libjin/Input/Mouse.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_MOUSE_H #define __LIBJIN_MOUSE_H -#include "../modules.h" +#include "../jin_configuration.h" #ifdef LIBJIN_MODULES_INPUT #include "../Common/Singleton.hpp" diff --git a/libjin/Net/Net.h b/libjin/Net/Net.h index 4727667..27353dc 100644 --- a/libjin/Net/Net.h +++ b/libjin/Net/Net.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_NET_H #define __LIBJIN_NET_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_NET #include "../Common/Subsystem.hpp" diff --git a/libjin/Net/Socket.h b/libjin/Net/Socket.h index 1a2256c..32ef86f 100644 --- a/libjin/Net/Socket.h +++ b/libjin/Net/Socket.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_NET_SOCKET_H #define __LIBJIN_NET_SOCKET_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_NET #include "../3rdparty/tekcos/tekcos.h" diff --git a/libjin/Thread/Thread.cpp b/libjin/Thread/Thread.cpp index c2b7b91..971fc03 100644 --- a/libjin/Thread/Thread.cpp +++ b/libjin/Thread/Thread.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_THREAD #include "Thread.h" diff --git a/libjin/Thread/Thread.h b/libjin/Thread/Thread.h index 3c41949..3a7b4ba 100644 --- a/libjin/Thread/Thread.h +++ b/libjin/Thread/Thread.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_THREAD_H #define __LIBJIN_THREAD_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_THREAD #include <string> diff --git a/libjin/Time/Timer.cpp b/libjin/Time/Timer.cpp index e5d0799..94d790d 100644 --- a/libjin/Time/Timer.cpp +++ b/libjin/Time/Timer.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_TIME #include "Timer.h" diff --git a/libjin/Time/Timer.h b/libjin/Time/Timer.h index aff2f70..7a58e14 100644 --- a/libjin/Time/Timer.h +++ b/libjin/Time/Timer.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_TIMER_H #define __LIBJIN_TIMER_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_TIME #include "SDL2/SDL.h" diff --git a/libjin/jin.h b/libjin/jin.h index a4bb37f..255616c 100644 --- a/libjin/jin.h +++ b/libjin/jin.h @@ -1,13 +1,13 @@ #ifndef __LIBJIN_H #define __LIBJIN_H -#include "modules.h" +#include "jin_configuration.h" #include "Utils/utils.h" #ifdef LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include "Audio/SDL/SDLAudio.h" #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO -#include "Core/Core.h" +#include "Game/Game.h" #include "Filesystem/Filesystem.h" #include "Filesystem/Buffer.h" #include "Input/Input.h" diff --git a/libjin/modules.h b/libjin/jin_configuration.h index 83eb90b..83eb90b 100644 --- a/libjin/modules.h +++ b/libjin/jin_configuration.h |