Skip to content

Commit

Permalink
Remove references to imgui test project in app.tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@chreden
chreden committed Mar 12, 2024
1 parent 854b7ad commit b219874
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
2 changes: 2 additions & 0 deletions external/imgui/imgui_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3879,6 +3879,8 @@ extern const char* ImGuiTestEngine_FindItemDebugLabel(ImGuiContext* ctx, ImGuiI
#else
#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB,_ID) ((void)0)
#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID,_LABEL,_FLAGS) ((void)g)
#define IMGUI_TRVIEW_TEST_ENGINE_ITEM_TEXT(_ID,_BUF) ((void)0)
#define IMGUI_TRVIEW_TEST_ENGINE_RENDERED_TEXT(_ID,_BUF) ((void)0)
#endif

//-----------------------------------------------------------------------------
Expand Down
11 changes: 4 additions & 7 deletions trview.app.tests/trview.app.tests.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@
<ProjectReference Include="..\external\googletest\googletest.vcxproj">
<Project>{eafd7489-57e3-4b6d-a704-f7c5ef640434}</Project>
</ProjectReference>
<ProjectReference Include="..\external\imgui_test_engine\imgui_test_engine.vcxproj">
<Project>{e6fac6ef-4b54-45c4-9e76-3b063b51d4b9}</Project>
</ProjectReference>
<ProjectReference Include="..\trlevel\trlevel.vcxproj">
<Project>{8ffb19fa-1c9d-4d9c-ab96-844bf695e79c}</Project>
</ProjectReference>
Expand Down Expand Up @@ -192,7 +189,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(ProjectDir);$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui\backends;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);IMGUI_APP_WIN32_DX11;IMGUI_ENABLE_TEST_ENGINE</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);IMGUI_APP_WIN32_DX11;</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
Expand All @@ -216,7 +213,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(ProjectDir);$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui\backends;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions);IMGUI_DEFINE_MATH_OPERATORS;IMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL;IMGUI_APP_WIN32_DX11;IMGUI_ENABLE_TEST_ENGINE</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions);IMGUI_DEFINE_MATH_OPERATORS;IMGUI_APP_WIN32_DX11;</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
Expand All @@ -238,7 +235,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(ProjectDir);$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui\backends;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);IMGUI_APP_WIN32_DX11;IMGUI_ENABLE_TEST_ENGINE</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);IMGUI_APP_WIN32_DX11</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
Expand All @@ -262,7 +259,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(ProjectDir);$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui\backends;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions);IMGUI_DEFINE_MATH_OPERATORS;IMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL;IMGUI_APP_WIN32_DX11;IMGUI_ENABLE_TEST_ENGINE</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions);IMGUI_DEFINE_MATH_OPERATORS;IMGUI_APP_WIN32_DX11</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
Expand Down
12 changes: 8 additions & 4 deletions trview.app.ui.tests/trview.app.ui.tests.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,13 @@
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);IMGUI_USER_CONFIG="trview_imconfig.h"</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<ConformanceMode>Default</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)external\shared;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui\backends;$(ProjectDir);$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LanguageStandard>stdcpplatest</LanguageStandard>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<BuildStlModules>false</BuildStlModules>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -95,12 +96,13 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);IMGUI_USER_CONFIG="trview_imconfig.h"</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<ConformanceMode>Default</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)external\shared;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui\backends;$(ProjectDir);$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<LanguageStandard>stdcpplatest</LanguageStandard>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<BuildStlModules>false</BuildStlModules>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -115,13 +117,14 @@
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);IMGUI_USER_CONFIG="trview_imconfig.h"</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<ConformanceMode>Default</ConformanceMode>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)external\shared;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui\backends;$(ProjectDir);$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LanguageStandard>stdcpplatest</LanguageStandard>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<BuildStlModules>false</BuildStlModules>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -136,12 +139,13 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);IMGUI_USER_CONFIG="trview_imconfig.h"</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<ConformanceMode>Default</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)external\shared;$(SolutionDir)external\imgui_test_engine;$(SolutionDir)external\imgui;$(SolutionDir)external\imgui\backends;$(ProjectDir);$(SolutionDir);$(SolutionDir)external\DirectXTK\Inc;$(SolutionDir)external\googletest\include;$(SolutionDir)external\googlemock\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<LanguageStandard>stdcpplatest</LanguageStandard>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<BuildStlModules>false</BuildStlModules>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down
20 changes: 10 additions & 10 deletions trview.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lua", "lua", "{D6B95B54-7EB
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trview.lua.imgui", "trview.lua.imgui\trview.lua.imgui.vcxproj", "{CDBC4705-E8E2-4C5C-A1A6-EA66FE4B699B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui_test_engine", "external\imgui_test_engine\imgui_test_engine.vcxproj", "{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trview.app.ui.tests", "trview.app.ui.tests\trview.app.ui.tests.vcxproj", "{6C2653FE-19D4-4696-924F-C313ECBC69B2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui_test_engine", "external\imgui_test_engine\imgui_test_engine.vcxproj", "{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -310,14 +310,6 @@ Global
{CDBC4705-E8E2-4C5C-A1A6-EA66FE4B699B}.Release|x64.Build.0 = Release|x64
{CDBC4705-E8E2-4C5C-A1A6-EA66FE4B699B}.Release|x86.ActiveCfg = Release|Win32
{CDBC4705-E8E2-4C5C-A1A6-EA66FE4B699B}.Release|x86.Build.0 = Release|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x64.ActiveCfg = Debug|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x64.Build.0 = Debug|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x86.ActiveCfg = Debug|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x86.Build.0 = Debug|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x64.ActiveCfg = Release|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x64.Build.0 = Release|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x86.ActiveCfg = Release|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x86.Build.0 = Release|Win32
{6C2653FE-19D4-4696-924F-C313ECBC69B2}.Debug|x64.ActiveCfg = Debug|x64
{6C2653FE-19D4-4696-924F-C313ECBC69B2}.Debug|x64.Build.0 = Debug|x64
{6C2653FE-19D4-4696-924F-C313ECBC69B2}.Debug|x86.ActiveCfg = Debug|Win32
Expand All @@ -326,6 +318,14 @@ Global
{6C2653FE-19D4-4696-924F-C313ECBC69B2}.Release|x64.Build.0 = Release|x64
{6C2653FE-19D4-4696-924F-C313ECBC69B2}.Release|x86.ActiveCfg = Release|Win32
{6C2653FE-19D4-4696-924F-C313ECBC69B2}.Release|x86.Build.0 = Release|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x64.ActiveCfg = Debug|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x64.Build.0 = Debug|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x86.ActiveCfg = Debug|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Debug|x86.Build.0 = Debug|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x64.ActiveCfg = Release|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x64.Build.0 = Release|x64
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x86.ActiveCfg = Release|Win32
{E6FAC6EF-4B54-45C4-9E76-3B063B51D4B9}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit b219874

Please sign in to comment.