replaced printf's with fmt::print
This commit is contained in:
parent
699922f93e
commit
c54d31778f
|
@ -1,5 +1,5 @@
|
||||||
#include "Elf.h"
|
#include "Elf.h"
|
||||||
|
#include <fmt/core.h>
|
||||||
|
|
||||||
Elf::~Elf()
|
Elf::~Elf()
|
||||||
{
|
{
|
||||||
|
@ -231,91 +231,91 @@ bool Elf::isElfFile() const
|
||||||
|
|
||||||
void Elf::DebugDump() {
|
void Elf::DebugDump() {
|
||||||
printf("SELF header:\n");
|
printf("SELF header:\n");
|
||||||
printf(" magic ..............: 0x%08" PRIx32 "\n", m_self->magic);
|
fmt::print(" magic ..............: 0x{:x}\n", m_self->magic);
|
||||||
printf(" version .........: %" PRIu8 "\n", m_self->version);
|
fmt::print(" version .........: {}\n", m_self->version);
|
||||||
printf(" mode .........: 0x%02" PRIx8 "\n", m_self->mode);
|
fmt::print(" mode .........: {:#04x}\n", m_self->mode);
|
||||||
printf(" endian .........: %" PRIu8 "\n", m_self->endian);
|
fmt::print(" endian .........: {}\n", m_self->endian);
|
||||||
printf(" attributes .........: 0x%02" PRIx8 "\n", m_self->attributes);
|
fmt::print(" attributes .........: {:#04x}\n", m_self->attributes);
|
||||||
printf(" category .........: 0x%02" PRIx8 "\n", m_self->category);
|
fmt::print(" category .........: {:#04x}\n", m_self->category);
|
||||||
printf(" program_type........: 0x%02" PRIx8 "\n", m_self->program_type);
|
fmt::print(" program_type........: {:#04x}\n", m_self->program_type);
|
||||||
printf(" padding1 ...........: 0x%04" PRIx16 "\n", m_self->padding1);
|
fmt::print(" padding1 ...........: {:#06x}\n", m_self->padding1);
|
||||||
printf(" header size ........: %" PRIu16 "\n", m_self->header_size);
|
fmt::print(" header size ........: {}\n", m_self->header_size);
|
||||||
printf(" meta size .....: %" PRIu16 "\n", m_self->meta_size);
|
fmt::print(" meta size .....: {}\n", m_self->meta_size);
|
||||||
printf(" file size ..........: %" PRIu32 "\n", m_self->file_size);
|
fmt::print(" file size ..........: {}\n", m_self->file_size);
|
||||||
printf(" padding2 ...........: 0x%08" PRIx32 "\n", m_self->padding2);
|
fmt::print(" padding2 ...........: {:#010x}\n", m_self->padding2);
|
||||||
printf(" segment count ......: %" PRIu16 "\n", m_self->segment_count);
|
fmt::print(" segment count ......: {}\n", m_self->segment_count);
|
||||||
printf(" unknown 1A .........: 0x%04" PRIx16 "\n", m_self->unknown1A);
|
fmt::print(" unknown 1A .........: {:#06x}\n", m_self->unknown1A);
|
||||||
printf(" padding3 ...........: 0x%04" PRIx16 "\n", m_self->padding3);
|
fmt::print(" padding3 ...........: {:#010x}\n", m_self->padding3);
|
||||||
printf("\n");
|
fmt::print("\n");
|
||||||
|
|
||||||
printf("SELF segments:\n");
|
fmt::print("SELF segments:\n");
|
||||||
|
|
||||||
for (int i = 0; i < m_self->segment_count; i++)
|
for (int i = 0; i < m_self->segment_count; i++)
|
||||||
{
|
{
|
||||||
auto segment_header = m_self_segments[i];
|
auto segment_header = m_self_segments[i];
|
||||||
printf(" [%d]\n", i);
|
fmt::print(" [{}]\n", i);
|
||||||
printf(" flags ............: 0x%016" PRIx64 "\n", segment_header.flags);
|
fmt::print(" flags ............: {:#018x}\n", segment_header.flags);
|
||||||
printf(" file offset ......: 0x%016" PRIx64 "\n", segment_header.file_offset);
|
fmt::print(" file offset ......: {:#018x}\n", segment_header.file_offset);
|
||||||
printf(" file size ........: %" PRIu64 "\n", segment_header.file_size);
|
fmt::print(" file size ........: {}\n", segment_header.file_size);
|
||||||
printf(" memory size ......: %" PRIu64 "\n", segment_header.memory_size);
|
fmt::print(" memory size ......: {}\n", segment_header.memory_size);
|
||||||
}
|
}
|
||||||
printf("\n");
|
fmt::print("\n");
|
||||||
|
|
||||||
printf("Elf header:\n");
|
fmt::print("Elf header:\n");
|
||||||
printf(" ident .........: 0x");
|
fmt::print(" ident .........: 0x");
|
||||||
for (auto i : m_elf_header->e_ident)
|
for (auto i : m_elf_header->e_ident)
|
||||||
{
|
{
|
||||||
printf("%02x", i);
|
fmt::print("{:02x}", i);
|
||||||
}
|
}
|
||||||
printf("\n");
|
fmt::print("\n");
|
||||||
|
|
||||||
printf(" type .........: 0x%04" PRIx16 "\n", m_elf_header->e_type);
|
fmt::print(" type .........: {:#06x}\n", m_elf_header->e_type);
|
||||||
printf(" machine .......: 0x%04" PRIx16 "\n", m_elf_header->e_machine);
|
fmt::print(" machine .......: {:#06x}\n", m_elf_header->e_machine);
|
||||||
printf(" version .......: 0x%08" PRIx32 "\n", m_elf_header->e_version);
|
fmt::print(" version .......: {:#010x}\n", m_elf_header->e_version);
|
||||||
|
|
||||||
printf(" entry .........: 0x%016" PRIx64 "\n", m_elf_header->e_entry);
|
fmt::print(" entry .........: {:#018x}\n", m_elf_header->e_entry);
|
||||||
printf(" phoff .........: 0x%016" PRIx64 "\n", m_elf_header->e_phoff);
|
fmt::print(" phoff .........: {:#018x}\n", m_elf_header->e_phoff);
|
||||||
printf(" shoff .........: 0x%016" PRIx64 "\n", m_elf_header->e_shoff);
|
fmt::print(" shoff .........: {:#018x}\n", m_elf_header->e_shoff);
|
||||||
printf(" flags .........: 0x%08" PRIx32 "\n", m_elf_header->e_flags);
|
fmt::print(" flags .........: {:#010x}\n", m_elf_header->e_flags);
|
||||||
printf(" ehsize ........: 0x%04" PRIx16 "\n", m_elf_header->e_ehsize);
|
fmt::print(" ehsize ........: {:#06x}\n", m_elf_header->e_ehsize);
|
||||||
printf(" phentsize .....: 0x%04" PRIx16 "\n", m_elf_header->e_phentsize);
|
fmt::print(" phentsize .....: {:#06x}\n", m_elf_header->e_phentsize);
|
||||||
printf(" phnum .........: %" PRIu16 "\n", m_elf_header->e_phnum);
|
fmt::print(" phnum .........: {}\n", m_elf_header->e_phnum);
|
||||||
printf(" shentsize .....: 0x%04" PRIx16 "\n", m_elf_header->e_shentsize);
|
fmt::print(" shentsize .....: {:#06x}\n", m_elf_header->e_shentsize);
|
||||||
printf(" shnum .........: %" PRIu16 "\n", m_elf_header->e_shnum);
|
fmt::print(" shnum .........: {}\n", m_elf_header->e_shnum);
|
||||||
printf(" shstrndx ......: %" PRIu16 "\n", m_elf_header->e_shstrndx);
|
fmt::print(" shstrndx ......: {}\n", m_elf_header->e_shstrndx);
|
||||||
|
|
||||||
if (m_elf_header->e_phentsize > 0)
|
if (m_elf_header->e_phentsize > 0)
|
||||||
{
|
{
|
||||||
printf("Program headers:\n");
|
fmt::print("Program headers:\n");
|
||||||
for (u16 i = 0; i < m_elf_header->e_phnum; i++)
|
for (u16 i = 0; i < m_elf_header->e_phnum; i++)
|
||||||
{
|
{
|
||||||
printf("--- phdr [%d] ---\n", i);
|
fmt::print("--- phdr [{}] ---\n", i);
|
||||||
printf("p_type ....: 0x%08" PRIx32 "\n", (m_elf_phdr+i)->p_type);
|
fmt::print("p_type ....: {:#010x}\n", (m_elf_phdr+i)->p_type);
|
||||||
printf("p_flags ...: 0x%08" PRIx32 "\n", (m_elf_phdr + i)->p_flags);
|
fmt::print("p_flags ...: {:#010x}\n", (m_elf_phdr + i)->p_flags);
|
||||||
printf("p_offset ..: 0x%016" PRIx64 "\n", (m_elf_phdr + i)->p_offset);
|
fmt::print("p_offset ..: {:#018x}\n", (m_elf_phdr + i)->p_offset);
|
||||||
printf("p_vaddr ...: 0x%016" PRIx64 "\n", (m_elf_phdr + i)->p_vaddr);
|
fmt::print("p_vaddr ...: {:#018x}\n", (m_elf_phdr + i)->p_vaddr);
|
||||||
printf("p_paddr ...: 0x%016" PRIx64 "\n", (m_elf_phdr + i)->p_paddr);
|
fmt::print("p_paddr ...: {:#018x}\n", (m_elf_phdr + i)->p_paddr);
|
||||||
printf("p_filesz ..: 0x%016" PRIx64 "\n", (m_elf_phdr + i)->p_filesz);
|
fmt::print("p_filesz ..: {:#018x}\n", (m_elf_phdr + i)->p_filesz);
|
||||||
printf("p_memsz ...: 0x%016" PRIx64 "\n", (m_elf_phdr + i)->p_memsz);
|
fmt::print("p_memsz ...: {:#018x}\n", (m_elf_phdr + i)->p_memsz);
|
||||||
printf("p_align ...: 0x%016" PRIx64 "\n", (m_elf_phdr + i)->p_align);
|
fmt::print("p_align ...: {:#018x}\n", (m_elf_phdr + i)->p_align);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (m_elf_header->e_shentsize > 0)
|
if (m_elf_header->e_shentsize > 0)
|
||||||
{
|
{
|
||||||
printf("Section headers:\n");
|
fmt::print("Section headers:\n");
|
||||||
for (uint16_t i = 0; i < m_elf_header->e_shnum; i++)
|
for (uint16_t i = 0; i < m_elf_header->e_shnum; i++)
|
||||||
{
|
{
|
||||||
printf("--- shdr [%d] --\n", i);
|
fmt::print("--- shdr [%d] --\n", i);
|
||||||
printf("sh_name ........: %d\n", (m_elf_shdr + i)->sh_name);
|
fmt::print("sh_name ........: {}\n", (m_elf_shdr + i)->sh_name);
|
||||||
printf("sh_type ........: 0x%08" PRIx32 "\n", (m_elf_shdr + i)->sh_type);
|
fmt::print("sh_type ........: {:#010x}\n", (m_elf_shdr + i)->sh_type);
|
||||||
printf("sh_flags .......: 0x%016" PRIx64 "\n", (m_elf_shdr + i)->sh_flags);
|
fmt::print("sh_flags .......: {:#018x}\n", (m_elf_shdr + i)->sh_flags);
|
||||||
printf("sh_addr ........: 0x%016" PRIx64 "\n", (m_elf_shdr + i)->sh_addr);
|
fmt::print("sh_addr ........: {:#018x}\n", (m_elf_shdr + i)->sh_addr);
|
||||||
printf("sh_offset ......: 0x%016" PRIx64 "\n", (m_elf_shdr + i)->sh_offset);
|
fmt::print("sh_offset ......: {:#018x}\n", (m_elf_shdr + i)->sh_offset);
|
||||||
printf("sh_size ........: 0x%016" PRIx64 "\n", (m_elf_shdr + i)->sh_size);
|
fmt::print("sh_size ........: {:#018x}\n", (m_elf_shdr + i)->sh_size);
|
||||||
printf("sh_link ........: %" PRId32 "\n", (m_elf_shdr + i)->sh_link);
|
fmt::print("sh_link ........: {:#010x}\n", (m_elf_shdr + i)->sh_link);
|
||||||
printf("sh_info ........: 0x%08" PRIx32 "\n", (m_elf_shdr + i)->sh_info);
|
fmt::print("sh_info ........: {:#010x}\n", (m_elf_shdr + i)->sh_info);
|
||||||
printf("sh_addralign ...: 0x%016" PRIx64 "\n", (m_elf_shdr + i)->sh_addralign);
|
fmt::print("sh_addralign ...: {:#018x}\n", (m_elf_shdr + i)->sh_addralign);
|
||||||
printf("sh_entsize .....: 0x%016" PRIx64 "\n", (m_elf_shdr + i)->sh_entsize);
|
fmt::print("sh_entsize .....: {:#018x}\n", (m_elf_shdr + i)->sh_entsize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,14 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
<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>
|
|
||||||
<ProjectConfiguration Include="Debug|x64">
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
<Configuration>Debug</Configuration>
|
<Configuration>Debug</Configuration>
|
||||||
<Platform>x64</Platform>
|
<Platform>x64</Platform>
|
||||||
|
@ -26,19 +18,6 @@
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
@ -57,17 +36,13 @@
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="Shared">
|
<ImportGroup Label="Shared">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\vstudioprj\common.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\vstudioprj\common.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
@ -76,34 +51,6 @@
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<TargetName>shadps4</TargetName>
|
<TargetName>shadps4</TargetName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
@ -114,6 +61,7 @@
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>..\x64\Debug\fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
@ -130,6 +78,7 @@
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>..\x64\Release\fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
20
shadps4.sln
20
shadps4.sln
|
@ -4,27 +4,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
VisualStudioVersion = 17.5.33516.290
|
VisualStudioVersion = 17.5.33516.290
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emulator", "emulator\emulator.vcxproj", "{A9F02793-712D-4602-BF3F-14473D492952}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emulator", "emulator\emulator.vcxproj", "{A9F02793-712D-4602-BF3F-14473D492952}"
|
||||||
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{71772007-5110-418D-BE9C-FB102B6EAABF} = {71772007-5110-418D-BE9C-FB102B6EAABF}
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "vstudioprj\fmt\fmt.vcxproj", "{71772007-5110-418D-BE9C-FB102B6EAABF}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdparty", "3rdparty", "{23D42BBC-3031-4224-ACAA-C1540F05AFCC}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
Debug|x86 = Debug|x86
|
|
||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
Release|x86 = Release|x86
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Debug|x64.ActiveCfg = Debug|x64
|
{A9F02793-712D-4602-BF3F-14473D492952}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Debug|x64.Build.0 = Debug|x64
|
{A9F02793-712D-4602-BF3F-14473D492952}.Debug|x64.Build.0 = Debug|x64
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Debug|x86.ActiveCfg = Debug|Win32
|
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Debug|x86.Build.0 = Debug|Win32
|
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Release|x64.ActiveCfg = Release|x64
|
{A9F02793-712D-4602-BF3F-14473D492952}.Release|x64.ActiveCfg = Release|x64
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Release|x64.Build.0 = Release|x64
|
{A9F02793-712D-4602-BF3F-14473D492952}.Release|x64.Build.0 = Release|x64
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Release|x86.ActiveCfg = Release|Win32
|
{71772007-5110-418D-BE9C-FB102B6EAABF}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{A9F02793-712D-4602-BF3F-14473D492952}.Release|x86.Build.0 = Release|Win32
|
{71772007-5110-418D-BE9C-FB102B6EAABF}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{71772007-5110-418D-BE9C-FB102B6EAABF}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{71772007-5110-418D-BE9C-FB102B6EAABF}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
GlobalSection(NestedProjects) = preSolution
|
||||||
|
{71772007-5110-418D-BE9C-FB102B6EAABF} = {23D42BBC-3031-4224-ACAA-C1540F05AFCC}
|
||||||
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {5ED4FBB3-A0BC-4244-B8FE-93A2BF2C1C9A}
|
SolutionGuid = {5ED4FBB3-A0BC-4244-B8FE-93A2BF2C1C9A}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ImportGroup Label="PropertySheets" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<ClCompile>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)\third_party\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<LanguageStandard>stdcpplatest</LanguageStandard>
|
||||||
|
<PreprocessorDefinitions>_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<SDLCheck>false</SDLCheck>
|
||||||
|
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<AdditionalDependencies>crypt32.lib;normaliz.lib;wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup />
|
||||||
|
</Project>
|
|
@ -0,0 +1,103 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<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">
|
||||||
|
<VCProjectVersion>16.0</VCProjectVersion>
|
||||||
|
<ProjectGuid>{71772007-5110-418D-BE9C-FB102B6EAABF}</ProjectGuid>
|
||||||
|
<RootNamespace>fmt</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="Shared">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\common.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\common.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\third_party\fmt\src\format.cc" />
|
||||||
|
<ClCompile Include="..\..\third_party\fmt\src\os.cc" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\args.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\chrono.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\color.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\compile.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\core.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\format-inl.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\format.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\locale.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\os.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\ostream.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\printf.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\ranges.h" />
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\xchar.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
|
@ -0,0 +1,66 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\third_party\fmt\src\format.cc">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\third_party\fmt\src\os.cc">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\args.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\chrono.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\color.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\compile.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\core.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\format.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\format-inl.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\locale.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\os.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\ostream.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\printf.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\ranges.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\third_party\fmt\include\fmt\xchar.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
Loading…
Reference in New Issue