diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/01HelloWorld/01HelloWorld.vcxproj | 12 | ||||
-rw-r--r-- | build/02Audio/02Audio.vcxproj | 12 | ||||
-rw-r--r-- | build/03Thread/03Thread.vcxproj | 12 | ||||
-rw-r--r-- | build/04Network/04Network.vcxproj | 12 | ||||
-rw-r--r-- | build/libjin/libjin.vcxproj | 25 | ||||
-rw-r--r-- | build/libjin/libjin.vcxproj.filters | 44 |
6 files changed, 51 insertions, 66 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" /> |