mirror of
https://github.com/grumpycoders/pcsx-redux.git
synced 2026-10-12 02:15:13 +00:00
Adding nanovg / nanosvg.
This commit is contained in:
Nicolas Pixel Noble
@@ -79,3 +79,9 @@
|
||||
[submodule "third_party/multipart-parser-c"]
|
||||
path = third_party/multipart-parser-c
|
||||
url = https://github.com/iafonov/multipart-parser-c
|
||||
[submodule "third_party/nanovg"]
|
||||
path = third_party/nanovg
|
||||
url = https://github.com/grumpycoders/nanovg
|
||||
[submodule "third_party/nanosvg"]
|
||||
path = third_party/nanosvg
|
||||
url = https://github.com/grumpycoders/nanosvg
|
||||
|
||||
@@ -47,6 +47,8 @@ find a link to the vendored version itself.
|
||||
- [md4c](https://github.com/mity/md4c)
|
||||
- [miniaudio](https://github.com/mackron/miniaudio)
|
||||
- [multipart-parser-c](https://github.com/iafonov/multipart-parser-c)
|
||||
- [nanosvg](https://github.com/memononen/nanosvg) ([vendored](https://github.com/grumpycoders/nanosvg))
|
||||
- [nanovg](https://github.com/memononen/nanovg) ([vendored](https://github.com/grumpycoders/nanovg))
|
||||
- [noto](https://fonts.google.com/noto) ([vendored](https://github.com/grumpycoders/pcsx-redux/tree/main/third_party/noto))
|
||||
- [pprint.lua](https://github.com/jagt/pprint.lua) ([vendored](https://github.com/grumpycoders/pcsx-redux/tree/main/third_party/pprint.lua))
|
||||
- [stb](https://github.com/nothings/stb)
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
// And only then we can load the rest
|
||||
#define GLFW_INCLUDE_NONE
|
||||
#define NANOVG_GLES3_IMPLEMENTATION
|
||||
#include <GL/gl3w.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <assert.h>
|
||||
@@ -67,6 +68,9 @@
|
||||
#include "lua/glffi.h"
|
||||
#include "lua/luawrapper.h"
|
||||
#include "magic_enum/include/magic_enum.hpp"
|
||||
#include "nanovg/src/nanovg.h"
|
||||
#include "nanovg/src/nanovg_gl.h"
|
||||
#include "nanovg/src/nanovg_gl_utils.h"
|
||||
#include "spu/interface.h"
|
||||
#include "support/uvfile.h"
|
||||
#include "support/zfile.h"
|
||||
@@ -401,6 +405,11 @@ void PCSX::GUI::init() {
|
||||
throw std::runtime_error("Unable to initialize OpenGL layer. Check OpenGL drivers.");
|
||||
}
|
||||
|
||||
m_nvgContext = nvgCreateGLES3(NVG_ANTIALIAS | NVG_STENCIL_STROKES | NVG_DEBUG);
|
||||
if (!m_nvgContext) {
|
||||
throw std::runtime_error("Unable to initialize NanoVG. Check OpenGL drivers.");
|
||||
}
|
||||
|
||||
// Setup ImGui binding
|
||||
IMGUI_CHECKVERSION();
|
||||
ImGui::CreateContext();
|
||||
|
||||
@@ -61,6 +61,7 @@
|
||||
#endif
|
||||
|
||||
struct GLFWwindow;
|
||||
struct NVGcontext;
|
||||
|
||||
namespace PCSX {
|
||||
|
||||
@@ -262,6 +263,7 @@ class GUI final {
|
||||
int &m_glfwSizeX = settings.get<WindowSizeX>().value;
|
||||
int &m_glfwSizeY = settings.get<WindowSizeY>().value;
|
||||
GLuint m_VRAMTexture = 0;
|
||||
NVGcontext *m_nvgContext = nullptr;
|
||||
|
||||
unsigned int m_offscreenFrameBuffer = 0;
|
||||
unsigned int m_offscreenTextures[2] = {0, 0};
|
||||
|
||||
+1
Submodule third_party/nanosvg added at f0a3e1034d
+1
Submodule third_party/nanovg added at 653f16e270
@@ -450,6 +450,9 @@
|
||||
<ProjectReference Include="..\multipart-parser\multipart-parser.vcxproj">
|
||||
<Project>{de9d9c53-5caa-4542-8c27-72d84334f9e3}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\nanovg\nanovg.vcxproj">
|
||||
<Project>{b68e9c60-8362-4a32-ac2e-4f0c2673f3e1}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\soft\soft.vcxproj">
|
||||
<Project>{660a9963-15e0-4b91-a5cf-bed493e862ec}</Project>
|
||||
</ProjectReference>
|
||||
|
||||
@@ -0,0 +1,275 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="ReleaseWithClangCL|Win32">
|
||||
<Configuration>ReleaseWithClangCL</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="ReleaseWithClangCL|x64">
|
||||
<Configuration>ReleaseWithClangCL</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="ReleaseWithTracy|Win32">
|
||||
<Configuration>ReleaseWithTracy</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="ReleaseWithTracy|x64">
|
||||
<Configuration>ReleaseWithTracy</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</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">
|
||||
<VCProjectVersion>16.0</VCProjectVersion>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectGuid>{b68e9c60-8362-4a32-ac2e-4f0c2673f3e1}</ProjectGuid>
|
||||
<RootNamespace>nanovg</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.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>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithTracy|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithClangCL|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<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>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithTracy|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithClangCL|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|Win32'">
|
||||
<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|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\common.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithTracy|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\common.props" />
|
||||
<Import Project="..\tracy.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithClangCL|Win32'" Label="PropertySheets">
|
||||
<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)'=='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>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithTracy|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\common.props" />
|
||||
<Import Project="..\tracy.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithClangCL|x64'" Label="PropertySheets">
|
||||
<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" />
|
||||
<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)'=='ReleaseWithTracy|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)'=='ReleaseWithClangCL|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'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>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)'=='ReleaseWithTracy|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>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)'=='ReleaseWithClangCL|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\third_party\nanosvg\src\nanosvg.h" />
|
||||
<ClInclude Include="..\..\third_party\nanosvg\src\nanosvgrast.h" />
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\fontstash.h" />
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\nanovg.h" />
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\nanovg_gl.h" />
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\nanovg_gl_utils.h" />
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\stb_image.h" />
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\stb_truetype.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\third_party\nanovg\src\nanovg.c" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,48 @@
|
||||
<?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++;cppm;ixx;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>
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\fontstash.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\nanovg.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\nanovg_gl.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\nanovg_gl_utils.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\stb_image.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\third_party\nanovg\src\stb_truetype.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\third_party\nanosvg\src\nanosvg.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\third_party\nanosvg\src\nanosvgrast.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\third_party\nanovg\src\nanovg.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
||||
..\src\.clang-format = ..\src\.clang-format
|
||||
..\src\.editorconfig = ..\src\.editorconfig
|
||||
..\AUTHORS = ..\AUTHORS
|
||||
..\LICENSES.md = ..\LICENSES.md
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GPU", "GPU", "{60F01E36-B838-4AA0-8057-8324E0E39526}"
|
||||
@@ -86,6 +87,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multipart-parser", "multipa
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImFileDialog", "ImFileDialog\ImFileDialog.vcxproj", "{2BF92257-03C6-43FE-85E8-918166A07A26}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nanovg", "nanovg\nanovg.vcxproj", "{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
@@ -759,6 +762,26 @@ Global
|
||||
{2BF92257-03C6-43FE-85E8-918166A07A26}.ReleaseWithTracy|x64.Build.0 = ReleaseWithTracy|x64
|
||||
{2BF92257-03C6-43FE-85E8-918166A07A26}.ReleaseWithTracy|x86.ActiveCfg = ReleaseWithTracy|Win32
|
||||
{2BF92257-03C6-43FE-85E8-918166A07A26}.ReleaseWithTracy|x86.Build.0 = ReleaseWithTracy|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Debug|x64.Build.0 = Debug|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Debug|x86.Build.0 = Debug|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Release|x64.ActiveCfg = Release|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Release|x64.Build.0 = Release|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Release|x86.ActiveCfg = Release|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.Release|x86.Build.0 = Release|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseCLI|x64.ActiveCfg = ReleaseWithClangCL|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseCLI|x64.Build.0 = ReleaseWithClangCL|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseCLI|x86.ActiveCfg = ReleaseWithClangCL|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseCLI|x86.Build.0 = ReleaseWithClangCL|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithClangCL|x64.ActiveCfg = ReleaseWithClangCL|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithClangCL|x64.Build.0 = ReleaseWithClangCL|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithClangCL|x86.ActiveCfg = ReleaseWithClangCL|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithClangCL|x86.Build.0 = ReleaseWithClangCL|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithTracy|x64.ActiveCfg = ReleaseWithTracy|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithTracy|x64.Build.0 = ReleaseWithTracy|x64
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithTracy|x86.ActiveCfg = ReleaseWithTracy|Win32
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1}.ReleaseWithTracy|x86.Build.0 = ReleaseWithTracy|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -798,9 +821,10 @@ Global
|
||||
{9BA68B05-13A3-4D61-82A3-F6BC4F87C48E} = {64A05F50-3203-42CC-B632-09D6EE6EA856}
|
||||
{DE9D9C53-5CAA-4542-8C27-72D84334F9E3} = {64A05F50-3203-42CC-B632-09D6EE6EA856}
|
||||
{2BF92257-03C6-43FE-85E8-918166A07A26} = {64A05F50-3203-42CC-B632-09D6EE6EA856}
|
||||
{B68E9C60-8362-4A32-AC2E-4F0C2673F3E1} = {64A05F50-3203-42CC-B632-09D6EE6EA856}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {AC54A867-F976-4B3D-A6EF-F57EB764DCD4}
|
||||
SolutionGuid = {284E91C1-764E-441A-854D-CFD3623A6501}
|
||||
SolutionGuid = {AC54A867-F976-4B3D-A6EF-F57EB764DCD4}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -347,6 +347,9 @@
|
||||
<ProjectReference Include="..\..\multipart-parser\multipart-parser.vcxproj">
|
||||
<Project>{de9d9c53-5caa-4542-8c27-72d84334f9e3}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\nanovg\nanovg.vcxproj">
|
||||
<Project>{b68e9c60-8362-4a32-ac2e-4f0c2673f3e1}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\soft\soft.vcxproj">
|
||||
<Project>{660a9963-15e0-4b91-a5cf-bed493e862ec}</Project>
|
||||
</ProjectReference>
|
||||
|
||||
Reference in New Issue
Block a user