diff --git a/build/Xenia.Cpp.x64.Debug.props b/build/Xenia.Cpp.x64.Debug.props
index 2c2712ee0..30c2e2af1 100644
--- a/build/Xenia.Cpp.x64.Debug.props
+++ b/build/Xenia.Cpp.x64.Debug.props
@@ -11,6 +11,9 @@
false
+
+ Debug
+
\ No newline at end of file
diff --git a/src/xenia/gpu/trace_viewer_main.cc b/src/xenia/gpu/xe-gpu-trace-viewer.cc
similarity index 99%
rename from src/xenia/gpu/trace_viewer_main.cc
rename to src/xenia/gpu/xe-gpu-trace-viewer.cc
index 32cce0d28..39e94666d 100644
--- a/src/xenia/gpu/trace_viewer_main.cc
+++ b/src/xenia/gpu/xe-gpu-trace-viewer.cc
@@ -2560,5 +2560,5 @@ void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_count) {
} // namespace gpu
} // namespace xe
-DEFINE_ENTRY_POINT(L"gpu_trace_viewer", L"gpu_trace_viewer some.trace",
+DEFINE_ENTRY_POINT(L"xe-gpu-trace-viewer", L"xe-gpu-trace-viewer some.trace",
xe::gpu::trace_viewer_main);
diff --git a/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj
new file mode 100644
index 000000000..de8e12dcd
--- /dev/null
+++ b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj
@@ -0,0 +1,89 @@
+
+
+
+
+ Checked
+ x64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}
+ Win32Proj
+ xegputraceviewer
+
+
+
+ Application
+ true
+ v140
+ Unicode
+
+
+ Application
+ false
+ v140
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ _WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ libgflags.lib;libglew.lib;libimgui.lib;libxenia.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+
+
+ _WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ libgflags.lib;libglew.lib;libimgui.lib;libxenia.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters
new file mode 100644
index 000000000..de0e061d5
--- /dev/null
+++ b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters
@@ -0,0 +1,30 @@
+
+
+
+
+ {e3dfb6f1-ec4a-4b58-9a57-0d6eeadd01af}
+
+
+ {be07fbff-bc38-4314-9ba0-821ae4e46026}
+
+
+ {13989fe7-adab-418c-be97-298171bea0ec}
+
+
+ {06641461-811b-44ff-be49-f013a39eb662}
+
+
+
+
+ src\xenia\gpu
+
+
+ src\xenia\base
+
+
+
+
+ src\xenia\base
+
+
+
\ No newline at end of file
diff --git a/xenia.sln b/xenia.sln
index 1f3d9afd9..dca18ed28 100644
--- a/xenia.sln
+++ b/xenia.sln
@@ -51,6 +51,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xenia.Debug.UI", "src\Xenia
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "third_party\dockpanelsuite\WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xe-gpu-trace-viewer", "src\xenia\gpu\xe-gpu-trace-viewer.vcxproj", "{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AE4AF147-715A-4C24-8BFA-136332DED28F} = {AE4AF147-715A-4C24-8BFA-136332DED28F}
+ {CE3A80D4-12DB-4164-A050-67E5796A019B} = {CE3A80D4-12DB-4164-A050-67E5796A019B}
+ {0CE149F6-41C3-4224-9E57-C02E8C7CD312} = {0CE149F6-41C3-4224-9E57-C02E8C7CD312}
+ {838020F9-94AA-4314-996D-69B923C45D39} = {838020F9-94AA-4314-996D-69B923C45D39}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Checked|x64 = Checked|x64
@@ -124,6 +132,12 @@ Global
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.Build.0 = Debug|x64
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.ActiveCfg = Release|x64
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.Build.0 = Release|x64
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Checked|x64.ActiveCfg = Debug|x64
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Checked|x64.Build.0 = Debug|x64
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Debug|x64.ActiveCfg = Debug|x64
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Debug|x64.Build.0 = Debug|x64
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Release|x64.ActiveCfg = Release|x64
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -138,5 +152,6 @@ Global
{58348C66-1B0D-497C-B51A-28E99DF1EF74} = {345BD157-B21D-4989-9CE4-FA3C90FFC095}
{75A94CEB-442C-45B6-AEEC-A5F16D4543F3} = {345BD157-B21D-4989-9CE4-FA3C90FFC095}
{C75532C4-765B-418E-B09B-46D36B2ABDB1} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272}
+ {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC} = {FD0BCA5D-908D-4091-AC05-47C2A640BA72}
EndGlobalSection
EndGlobal
diff --git a/xenia.vcxproj b/xenia.vcxproj
index 431e079fa..aee6c5409 100644
--- a/xenia.vcxproj
+++ b/xenia.vcxproj
@@ -61,26 +61,18 @@
-
- true
-
-
- true
-
-
- false
-
+
+
+
- Level3
- Disabled
_WINDOWS;%(PreprocessorDefinitions)
+ Level3
Windows
- true
libgflags.lib;libglew.lib;libxenia.lib;%(AdditionalDependencies)
@@ -88,29 +80,25 @@
- Level3
- Disabled
_WINDOWS;%(PreprocessorDefinitions)
+ Level3
Windows
- true
libgflags.lib;libglew.lib;libxenia.lib;%(AdditionalDependencies)
- Level3
- MaxSpeed
true
true
_WINDOWS;%(PreprocessorDefinitions)
+ Level3
Windows
- true
true
true
libgflags.lib;libglew.lib;libxenia.lib;%(AdditionalDependencies)