Debugger stuff, and changing to vcproj's/sln.

This commit is contained in:
Ben Vanik
2015-05-09 17:48:12 -07:00
parent 4411a4499d
commit 7a00b76a6e
97 changed files with 4039 additions and 1643 deletions

View File

@@ -1,36 +0,0 @@
# Copyright 2013 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'beaengine',
'type': '<(library)',
'direct_dependent_settings': {
'include_dirs': [
'beaengine/include/',
],
'defines': [
'BEA_ENGINE_STATIC=1',
],
},
'sources': [
'beaengine/beaengineSources/BeaEngine.c',
'beaengine/include/beaengine/basic_types.h',
'beaengine/include/beaengine/BeaEngine.h',
'beaengine/include/beaengine/export.h',
'beaengine/include/beaengine/macros.h',
],
'include_dirs': [
'beaengine/beaengineSources/',
'beaengine/include/',
],
'defines': [
'BEA_ENGINE_STATIC=1',
#'BEA_LIGHT_DISASSEMBLY=1',
],
}
]
}

View File

@@ -62,4 +62,4 @@ cd ..
echo ""
echo "Cleaning up binutils build temp"
rm -rf ./binutils-$SNAPSHOT_VERSION
#rm -rf ./binutils-$SNAPSHOT_VERSION

1
third_party/flatbuffers vendored Submodule

Submodule third_party/flatbuffers added at ecb27817ca

137
third_party/flatc.vcxproj vendored Normal file
View File

@@ -0,0 +1,137 @@
<?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="Checked|x64">
<Configuration>Checked</Configuration>
<Platform>x64</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">
<ProjectGuid>{D3069A06-62FC-479F-9F5C-23B4377481B0}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>flatc</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
<Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Release.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\third_party\flatbuffers\include\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\third_party;$(SolutionDir)\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\third_party\flatbuffers\include\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\third_party;$(SolutionDir)\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\third_party\flatbuffers\include\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\third_party;$(SolutionDir)\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="flatbuffers\include\flatbuffers\flatbuffers.h" />
<ClInclude Include="flatbuffers\include\flatbuffers\hash.h" />
<ClInclude Include="flatbuffers\include\flatbuffers\idl.h" />
<ClInclude Include="flatbuffers\include\flatbuffers\util.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="flatbuffers\src\flatc.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_cpp.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_fbs.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_general.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_go.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_text.cpp" />
<ClCompile Include="flatbuffers\src\idl_parser.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

18
third_party/flatc.vcxproj.filters vendored Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="flatbuffers\include\flatbuffers\flatbuffers.h" />
<ClInclude Include="flatbuffers\include\flatbuffers\hash.h" />
<ClInclude Include="flatbuffers\include\flatbuffers\idl.h" />
<ClInclude Include="flatbuffers\include\flatbuffers\util.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="flatbuffers\src\flatc.cpp" />
<ClCompile Include="flatbuffers\src\idl_parser.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_text.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_general.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_go.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_fbs.cpp" />
<ClCompile Include="flatbuffers\src\idl_gen_cpp.cpp" />
</ItemGroup>
</Project>

View File

@@ -1,59 +0,0 @@
# Copyright 2013 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'gflags',
'type': '<(library)',
'direct_dependent_settings': {
'conditions': [
['OS != "win"', {
'include_dirs': [
'gflags/src/',
],
}],
['OS == "win"', {
'include_dirs': [
'gflags/src/windows/',
],
'defines': [
'GFLAGS_DLL_DECL=',
'GFLAGS_DLL_DEFINE_FLAG=',
'GFLAGS_DLL_DECLARE_FLAG=',
],
}],
],
},
'sources': [
'gflags/src/gflags.cc',
'gflags/src/gflags_completions.cc',
'gflags/src/gflags_nc.cc',
'gflags/src/gflags_reporting.cc',
],
'conditions': [
['OS != "win"', {
'include_dirs': [
'gflags/src/',
],
}],
['OS == "win"', {
'include_dirs': [
'gflags/src/windows/',
'gflags/src/',
],
'sources+': [
'gflags/src/windows/port.cc',
],
'defines': [
'PATH_SEPARATOR=\'\\\\\'',
'GFLAGS_DLL_DECL=',
'GFLAGS_DLL_DEFINE_FLAG=',
'GFLAGS_DLL_DECLARE_FLAG=',
],
}],
],
}
]
}

41
third_party/glew.gypi vendored
View File

@@ -1,41 +0,0 @@
# Copyright 2014 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'glew',
'type': '<(library)',
'direct_dependent_settings': {
'include_dirs': [
'GL/',
],
'defines': [
'GLEW_STATIC=1',
'GLEW_MX=1',
],
},
'include_dirs': [
'GL/',
],
'defines': [
'GLEW_STATIC=1',
'GLEW_MX=1',
],
'sources': [
# Khronos sources:
'GL/glcorearb.h',
'GL/glext.h',
'GL/glxext.h',
'GL/wglext.h',
# GLEW sources:
'GL/glew.c',
'GL/glew.h',
'GL/glxew.h',
'GL/wglew.h',
],
}
]
}

1
third_party/gyp vendored

Submodule third_party/gyp deleted from 6194e32f7f

26
third_party/gyp.patch vendored
View File

@@ -1,26 +0,0 @@
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py
index 05783d6..539614c 100644
--- a/pylib/gyp/generator/msvs.py
+++ b/pylib/gyp/generator/msvs.py
@@ -1963,13 +1963,17 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources,
if isinstance(source, MSVSProject.Filter):
# We have a sub-filter. Create the name of that sub-filter.
if not parent_filter_name:
- filter_name = source.name
+ if source.name == '..':
+ filter_name = ''
+ else:
+ filter_name = source.name
else:
filter_name = '%s\\%s' % (parent_filter_name, source.name)
# Add the filter to the group.
- filter_group.append(
- ['Filter', {'Include': filter_name},
- ['UniqueIdentifier', MSVSNew.MakeGuid(source.name)]])
+ if filter_name:
+ filter_group.append(
+ ['Filter', {'Include': filter_name},
+ ['UniqueIdentifier', MSVSNew.MakeGuid(source.name)]])
# Recurse and add its dependents.
_AppendFiltersForMSBuild(filter_name, source.contents,
extension_to_rule_name,

View File

@@ -1,28 +0,0 @@
# Copyright 2015 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'imgui',
'type': '<(library)',
'direct_dependent_settings': {
'include_dirs': [
'imgui/',
],
},
'include_dirs': [
'imgui/',
],
'sources': [
'imgui/imconfig.h',
'imgui/imgui.cpp',
'imgui/imgui.h',
'imgui/stb_rect_pack.h',
'imgui/stb_textedit.h',
'imgui/stb_truetype.h',
],
}
]
}

132
third_party/libgflags.vcxproj vendored Normal file
View File

@@ -0,0 +1,132 @@
<?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="Checked|x64">
<Configuration>Checked</Configuration>
<Platform>x64</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>
<ItemGroup>
<ClInclude Include="gflags\src\mutex.h" />
<ClInclude Include="gflags\src\util.h" />
<ClInclude Include="gflags\src\windows\config.h" />
<ClInclude Include="gflags\src\windows\gflags\gflags.h" />
<ClInclude Include="gflags\src\windows\gflags\gflags_completions.h" />
<ClInclude Include="gflags\src\windows\gflags\gflags_declare.h" />
<ClInclude Include="gflags\src\windows\port.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="gflags\src\gflags.cc" />
<ClCompile Include="gflags\src\gflags_completions.cc" />
<ClCompile Include="gflags\src\gflags_reporting.cc" />
<ClCompile Include="gflags\src\windows\port.cc" />
</ItemGroup>
<ItemGroup>
<None Include="gflags\src\gflags_completions.sh" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{838020F9-94AA-4314-996D-69B923C45D39}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libgflags</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
<Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Release.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>PATH_SEPARATOR=%27\\%27;GFLAGS_DLL_DECL=;GFLAGS_DLL_DEFINE_FLAG=;GFLAGS_DLL_DECLARE_FLAG=;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\third_party\gflags\src\windows\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>PATH_SEPARATOR=%27\\%27;GFLAGS_DLL_DECL=;GFLAGS_DLL_DEFINE_FLAG=;GFLAGS_DLL_DECLARE_FLAG=;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\third_party\gflags\src\windows\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>PATH_SEPARATOR=%27\\%27;GFLAGS_DLL_DECL=;GFLAGS_DLL_DEFINE_FLAG=;GFLAGS_DLL_DECLARE_FLAG=;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\third_party\gflags\src\windows\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

21
third_party/libgflags.vcxproj.filters vendored Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="gflags\src\windows\gflags\gflags.h" />
<ClInclude Include="gflags\src\windows\gflags\gflags_completions.h" />
<ClInclude Include="gflags\src\windows\gflags\gflags_declare.h" />
<ClInclude Include="gflags\src\windows\config.h" />
<ClInclude Include="gflags\src\windows\port.h" />
<ClInclude Include="gflags\src\mutex.h" />
<ClInclude Include="gflags\src\util.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="gflags\src\windows\port.cc" />
<ClCompile Include="gflags\src\gflags.cc" />
<ClCompile Include="gflags\src\gflags_completions.cc" />
<ClCompile Include="gflags\src\gflags_reporting.cc" />
</ItemGroup>
<ItemGroup>
<None Include="gflags\src\gflags_completions.sh" />
</ItemGroup>
</Project>

123
third_party/libglew.vcxproj vendored Normal file
View File

@@ -0,0 +1,123 @@
<?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="Checked|x64">
<Configuration>Checked</Configuration>
<Platform>x64</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>
<ItemGroup>
<ClInclude Include="GL\glcorearb.h" />
<ClInclude Include="GL\glew.h" />
<ClInclude Include="GL\glext.h" />
<ClInclude Include="GL\glxew.h" />
<ClInclude Include="GL\glxext.h" />
<ClInclude Include="GL\wglew.h" />
<ClInclude Include="GL\wglext.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="GL\glew.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{AE4AF147-715A-4C24-8BFA-136332DED28F}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libglew</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
<Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Release.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

15
third_party/libglew.vcxproj.filters vendored Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="GL\glcorearb.h" />
<ClInclude Include="GL\glew.h" />
<ClInclude Include="GL\glext.h" />
<ClInclude Include="GL\glxew.h" />
<ClInclude Include="GL\glxext.h" />
<ClInclude Include="GL\wglew.h" />
<ClInclude Include="GL\wglext.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="GL\glew.c" />
</ItemGroup>
</Project>

121
third_party/libimgui.vcxproj vendored Normal file
View File

@@ -0,0 +1,121 @@
<?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="Checked|x64">
<Configuration>Checked</Configuration>
<Platform>x64</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>
<ItemGroup>
<ClInclude Include="imgui\imconfig.h" />
<ClInclude Include="imgui\imgui.h" />
<ClInclude Include="imgui\stb_rect_pack.h" />
<ClInclude Include="imgui\stb_textedit.h" />
<ClInclude Include="imgui\stb_truetype.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="imgui\imgui.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CE3A80D4-12DB-4164-A050-67E5796A019B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libimgui</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
<Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\build\Xenia.Cpp.x64.Common.props" />
<Import Project="..\build\Xenia.Cpp.x64.Release.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

13
third_party/libimgui.vcxproj.filters vendored Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="imgui\imconfig.h" />
<ClInclude Include="imgui\imgui.h" />
<ClInclude Include="imgui\stb_textedit.h" />
<ClInclude Include="imgui\stb_rect_pack.h" />
<ClInclude Include="imgui\stb_truetype.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="imgui\imgui.cpp" />
</ItemGroup>
</Project>

35
third_party/llvm.gypi vendored
View File

@@ -1,35 +0,0 @@
# Copyright 2014 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'llvm',
'type': '<(library)',
'direct_dependent_settings': {
'include_dirs': [
'llvm/include/',
],
'defines': [
],
},
'msvs_disabled_warnings': [4267],
'defines': [
],
'include_dirs': [
'llvm/include/',
],
'sources': [
'llvm/dummy.cc',
'llvm/include/llvm/ADT/BitVector.h',
'llvm/include/llvm/Support/Compiler.h',
'llvm/include/llvm/Support/MathExtras.h',
'llvm/include/llvm/Support/type_traits.h',
],
}
]
}

View File

@@ -1666,7 +1666,7 @@ uint32_t MicroProfileWebServerPort()
void MicroProfileDumpHtml(const char* pFile)
{
uint32_t nLen = strlen(pFile);
uint32_t nLen = uint32_t(strlen(pFile));
if(nLen > sizeof(S.HtmlDumpPath)-1)
{
return;
@@ -1914,7 +1914,7 @@ static uint64_t g_nMicroProfileDataSent = 0;
void MicroProfileWriteSocket(void* Handle, size_t nSize, const char* pData)
{
g_nMicroProfileDataSent += nSize;
send(*(MpSocket*)Handle, pData, nSize, 0);
send(*(MpSocket*)Handle, pData, int(nSize), 0);
}

View File

@@ -49,6 +49,8 @@
#define MicroProfileSetDisplayMode(f) do{}while(0)
#else
#pragma warning(disable: 4244) // implicit conversion from float -> int
#ifndef MICROPROFILE_DRAWCURSOR
#define MICROPROFILE_DRAWCURSOR 0
#endif

Submodule third_party/sparsehash deleted from 09af64be1e

View File

@@ -1,30 +0,0 @@
# Copyright 2013 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'sparsehash',
'type': '<(library)',
'direct_dependent_settings': {
'include_dirs': [
'sparsehash/src/',
],
},
'include_dirs': [
'sparsehash/src/',
],
'sources': [
],
'conditions': [
['OS == "win"', {
'sources!': [
'sparsehash/src/windows/port.cc',
],
}],
],
}
]
}

View File

@@ -1,18 +0,0 @@
# Copyright 2014 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'xxhash',
'type': '<(library)',
'include_dirs': [
'xxhash/',
],
'sources': [
'xxhash/xxhash.c',
'xxhash/xxhash.h',
],
}
]
}