diff options
Diffstat (limited to 'build/vc++')
| -rw-r--r-- | build/vc++/3rdparty/GLee/GLee.vcxproj.filters | 18 | ||||
| -rw-r--r-- | build/vc++/3rdparty/glad/glad.vcxproj (renamed from build/vc++/3rdparty/GLee/GLee.vcxproj) | 64 | ||||
| -rw-r--r-- | build/vc++/3rdparty/glad/glad.vcxproj.filters | 10 | ||||
| -rw-r--r-- | build/vc++/3rdparty/glad/glad.vcxproj.user (renamed from build/vc++/3rdparty/GLee/GLee.vcxproj.user) | 0 | ||||
| -rw-r--r-- | build/vc++/jin.sln | 11 | ||||
| -rw-r--r-- | build/vc++/libjin/libjin.vcxproj | 3 |
6 files changed, 50 insertions, 56 deletions
diff --git a/build/vc++/3rdparty/GLee/GLee.vcxproj.filters b/build/vc++/3rdparty/GLee/GLee.vcxproj.filters deleted file mode 100644 index 2822148..0000000 --- a/build/vc++/3rdparty/GLee/GLee.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="source"> - <UniqueIdentifier>{eebe1ebb-f43f-4b31-9c61-4cd44565461e}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\GLee\GLee.c"> - <Filter>source</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\3rdparty\GLee\GLee.h"> - <Filter>source</Filter> - </ClInclude> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/GLee/GLee.vcxproj b/build/vc++/3rdparty/glad/glad.vcxproj index fdc6f0a..5db09c5 100644 --- a/build/vc++/3rdparty/GLee/GLee.vcxproj +++ b/build/vc++/3rdparty/glad/glad.vcxproj @@ -18,11 +18,18 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\3rdparty\glad\glad.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\src\3rdparty\glad\glad.h" /> + <ClInclude Include="..\..\..\..\src\3rdparty\glad\khrplatform.h" /> + </ItemGroup> <PropertyGroup Label="Globals"> <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{8828F6B1-F167-4BC9-B7C7-7CC34CDDEE8A}</ProjectGuid> - <RootNamespace>GLee</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <ProjectGuid>{F1AFF637-069B-4013-AB50-4BE5D92BCBC7}</ProjectGuid> + <RootNamespace>glad</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -69,51 +76,38 @@ <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)'=='Debug|Win32'"> + <PropertyGroup /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> - <ConformanceMode>false</ConformanceMode> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <CompileAs>CompileAsCpp</CompileAs> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> - <BrowseInformation>true</BrowseInformation> + <ConformanceMode>true</ConformanceMode> + <CompileAs>CompileAsC</CompileAs> </ClCompile> - <Bscmake> - <PreserveSbr>true</PreserveSbr> - </Bscmake> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> + <CompileAs>CompileAsC</CompileAs> </ClCompile> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> - <Optimization>MinSpace</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> - <ConformanceMode>false</ConformanceMode> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <CompileAs>CompileAsCpp</CompileAs> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> + <ConformanceMode>true</ConformanceMode> </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> @@ -129,12 +123,6 @@ <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\GLee\GLee.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\3rdparty\GLee\GLee.h" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/build/vc++/3rdparty/glad/glad.vcxproj.filters b/build/vc++/3rdparty/glad/glad.vcxproj.filters new file mode 100644 index 0000000..e76ca77 --- /dev/null +++ b/build/vc++/3rdparty/glad/glad.vcxproj.filters @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\3rdparty\glad\glad.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\src\3rdparty\glad\glad.h" /> + <ClInclude Include="..\..\..\..\src\3rdparty\glad\khrplatform.h" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/GLee/GLee.vcxproj.user b/build/vc++/3rdparty/glad/glad.vcxproj.user index be25078..be25078 100644 --- a/build/vc++/3rdparty/GLee/GLee.vcxproj.user +++ b/build/vc++/3rdparty/glad/glad.vcxproj.user diff --git a/build/vc++/jin.sln b/build/vc++/jin.sln index 1d81611..6a13036 100644 --- a/build/vc++/jin.sln +++ b/build/vc++/jin.sln @@ -41,6 +41,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua51", "3rdparty\Lua51\Lua EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "3rdparty\cembed\cembed.vcxproj", "{DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glad", "3rdparty\glad\glad.vcxproj", "{F1AFF637-069B-4013-AB50-4BE5D92BCBC7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -161,6 +163,14 @@ Global {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Release|x64.Build.0 = Release|x64 {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Release|x86.ActiveCfg = Release|Win32 {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Release|x86.Build.0 = Release|Win32 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Debug|x64.ActiveCfg = Debug|x64 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Debug|x64.Build.0 = Debug|x64 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Debug|x86.ActiveCfg = Debug|Win32 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Debug|x86.Build.0 = Debug|Win32 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Release|x64.ActiveCfg = Release|x64 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Release|x64.Build.0 = Release|x64 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Release|x86.ActiveCfg = Release|Win32 + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -182,6 +192,7 @@ Global {C6B16179-5640-4D41-8756-0525D25EB569} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {4156CD69-6FC4-4B32-B008-BB94C8AE17F5} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} + {F1AFF637-069B-4013-AB50-4BE5D92BCBC7} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8} diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj index 1eea6e7..e94156f 100644 --- a/build/vc++/libjin/libjin.vcxproj +++ b/build/vc++/libjin/libjin.vcxproj @@ -279,6 +279,9 @@ <ClCompile Include="..\..\..\src\libjin\Utils\je_unittest.cpp" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\3rdparty\glad\glad.vcxproj"> + <Project>{f1aff637-069b-4013-ab50-4be5d92bcbc7}</Project> + </ProjectReference> <ProjectReference Include="..\3rdparty\GLee\GLee.vcxproj"> <Project>{8828f6b1-f167-4bc9-b7c7-7cc34cddee8a}</Project> </ProjectReference> |