Prep for split libraries.

src/xenia/gpu/gl4/gl4_graphics_system.cc

@@ -43,7 +43,7 @@ void InitializeIfNeeded() {
 
 void CleanupOnShutdown() {}
 
-std::unique_ptr<GraphicsSystem> GL4GraphicsSystem::Create(Emulator* emulator) {
+std::unique_ptr<GraphicsSystem> Create(Emulator* emulator) {
   InitializeIfNeeded();
   return std::make_unique<GL4GraphicsSystem>(emulator);
 }

src/xenia/gpu/gl4/gl4_graphics_system.h

@@ -27,7 +27,6 @@ class GL4GraphicsSystem : public GraphicsSystem {
   GL4GraphicsSystem(Emulator* emulator);
   ~GL4GraphicsSystem() override;
 
-  static std::unique_ptr<GraphicsSystem> Create(Emulator* emulator);
   std::unique_ptr<ui::GraphicsContext> CreateContext(
       ui::Window* target_window) override;
 

src/xenia/gpu/graphics_system.cc

@@ -15,20 +15,21 @@
 #include "xenia/gpu/gpu_flags.h"
 #include "xenia/kernel/objects/xthread.h"
 
-// TODO(benvanik): based on platform/build support.
-#include "xenia/gpu/gl4/gl4_graphics_system.h"
-
 namespace xe {
 namespace gpu {
 
+namespace gl4 {
+std::unique_ptr<GraphicsSystem> Create(Emulator* emulator);
+}  // namespace gl4
+
 std::unique_ptr<GraphicsSystem> GraphicsSystem::Create(Emulator* emulator) {
   if (FLAGS_gpu.compare("gl4") == 0) {
-    return xe::gpu::gl4::GL4GraphicsSystem::Create(emulator);
+    return xe::gpu::gl4::Create(emulator);
   } else {
     // Create best available.
     std::unique_ptr<GraphicsSystem> best;
 
-    best = xe::gpu::gl4::GL4GraphicsSystem::Create(emulator);
+    best = xe::gpu::gl4::Create(emulator);
     if (best) {
       return best;
     }

src/xenia/gpu/xe-gpu-trace-viewer.vcxproj

@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\base\main_win.cc" />
-    <ClCompile Include="xe-gpu-trace-viewer.cc" />
+    <ClCompile Include="trace_viewer_main.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\base\main.h" />

src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters

@@ -15,12 +15,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="xe-gpu-trace-viewer.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
     <ClCompile Include="..\base\main_win.cc">
       <Filter>src\xenia\base</Filter>
     </ClCompile>
+    <ClCompile Include="trace_viewer_main.cc">
+      <Filter>src\xenia\gpu</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\base\main.h">