forked from OpenXRay/xray-16
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Externals: Replace glBinding with glew.
Unfortunately glBinding is much harder to debug. # Conflicts: # .gitmodules # src/Externals/glbinding.vcxproj # src/Externals/luabind # src/Externals/luajit # src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
- Loading branch information
Showing
14 changed files
with
12,849 additions
and
1,134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Submodule glbinding
deleted from
c031b7
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="14.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> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <SccProjectName /> | ||
| <SccLocalPath /> | ||
| <ProjectGuid>{664E6F0D-6784-4760-9565-D54F8EB1EDF4}</ProjectGuid> | ||
| <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| <UseOfMfc>false</UseOfMfc> | ||
| <CharacterSet>MultiByte</CharacterSet> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| <UseOfMfc>false</UseOfMfc> | ||
| <CharacterSet>MultiByte</CharacterSet> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <Import Project="..\Common.props" /> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <Import Project="..\Common.props" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <OutDir>$(xrBinDir)</OutDir> | ||
| <IntDir>$(xrIntDir)$(ProjectName)\</IntDir> | ||
| <TargetName>glew32</TargetName> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <OutDir>$(xrBinDir)</OutDir> | ||
| <IntDir>$(xrIntDir)$(ProjectName)\</IntDir> | ||
| <TargetName>glew32</TargetName> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <ClCompile> | ||
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| <StringPooling>true</StringPooling> | ||
| <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| <Optimization>MaxSpeed</Optimization> | ||
| <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| <WarningLevel>Level3</WarningLevel> | ||
| <AdditionalIncludeDirectories>glew/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| </ClCompile> | ||
| <ResourceCompile> | ||
| <Culture>0x0409</Culture> | ||
| <PreprocessorDefinitions>NDEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| </ResourceCompile> | ||
| <Bscmake> | ||
| <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| </Bscmake> | ||
| <Lib> | ||
| <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> | ||
| <TargetMachine>MachineX86</TargetMachine> | ||
| </Lib> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <ClCompile> | ||
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| <InlineFunctionExpansion>Default</InlineFunctionExpansion> | ||
| <FunctionLevelLinking>false</FunctionLevelLinking> | ||
| <Optimization>Disabled</Optimization> | ||
| <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| <WarningLevel>Level3</WarningLevel> | ||
| <AdditionalIncludeDirectories>glew/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| </ClCompile> | ||
| <ResourceCompile> | ||
| <Culture>0x0409</Culture> | ||
| <PreprocessorDefinitions>_DEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| </ResourceCompile> | ||
| <Bscmake> | ||
| <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| </Bscmake> | ||
| <Lib> | ||
| <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> | ||
| <TargetMachine>MachineX86</TargetMachine> | ||
| </Lib> | ||
| </ItemDefinitionGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="glew\src\glew.c" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="glew\include\GL\glew.h" /> | ||
| <ClInclude Include="glew\include\GL\wglew.h" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ResourceCompile Include="glew\build\glew.rc" /> | ||
| </ItemGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| </ImportGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters