From 5231e2e7216b217766c9dde1253c948222bae90a Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Tue, 30 Jun 2015 19:34:48 -0700
Subject: [PATCH] Linking in libxenia-base.

---
 docs/building.md         |   7 ++-
 libxenia.vcxproj         |  41 ++-------------
 libxenia.vcxproj.filters | 108 ---------------------------------------
 3 files changed, 6 insertions(+), 150 deletions(-)

diff --git a/docs/building.md b/docs/building.md
index dba4ebaaa..8742377ea 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -25,11 +25,10 @@ and set the 'Command' to `$(SolutionDir)$(TargetPath)` and the
 'Working Directory' to `$(SolutionDir)..\..`. You can specify flags and
 the file to run in the 'Command Arguments' field (or use `--flagfile=flags.txt`).
 
-## Running
+To redirect output, use the following command flags:
+`--flagfile=$(SolutionDir)scratch\flags.txt 2>&1 1>$(SolutionDir)scratch\stdout.txt`
 
-Use the wrapper shell scripts under `bin/` to run tools. They will ensure the
-tools are built (but not that they are up to date) before running and allow
-switching between the debug and release variants with `--debug`.
+## Running
 
 To make life easier you can use `--flagfile=myflags.txt` to specify all
 arguments, including using `--target=my.xex` to pick an executable.
diff --git a/libxenia.vcxproj b/libxenia.vcxproj
index 6d298fd02..b8a2b7761 100644
--- a/libxenia.vcxproj
+++ b/libxenia.vcxproj
@@ -25,20 +25,6 @@
     <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_audio_system.cc" />
     <ClCompile Include="src\xenia\apu\xma_context.cc" />
     <ClCompile Include="src\xenia\apu\xma_decoder.cc" />
-    <ClCompile Include="src\xenia\base\arena.cc" />
-    <ClCompile Include="src\xenia\base\clock.cc" />
-    <ClCompile Include="src\xenia\base\debugging_win.cc" />
-    <ClCompile Include="src\xenia\base\filesystem.cc" />
-    <ClCompile Include="src\xenia\base\filesystem_win.cc" />
-    <ClCompile Include="src\xenia\base\logging.cc" />
-    <ClCompile Include="src\xenia\base\mapped_memory_win.cc" />
-    <ClCompile Include="src\xenia\base\math.cc" />
-    <ClCompile Include="src\xenia\base\memory_generic.cc" />
-    <ClCompile Include="src\xenia\base\platform_win.cc" />
-    <ClCompile Include="src\xenia\base\ring_buffer.cc" />
-    <ClCompile Include="src\xenia\base\string.cc" />
-    <ClCompile Include="src\xenia\base\string_buffer.cc" />
-    <ClCompile Include="src\xenia\base\threading_win.cc" />
     <ClCompile Include="src\xenia\cpu\backend\assembler.cc" />
     <ClCompile Include="src\xenia\cpu\backend\backend.cc" />
     <ClCompile Include="src\xenia\cpu\backend\x64\x64_assembler.cc" />
@@ -274,27 +260,6 @@
     <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_audio_system.h" />
     <ClInclude Include="src\xenia\apu\xma_context.h" />
     <ClInclude Include="src\xenia\apu\xma_decoder.h" />
-    <ClInclude Include="src\xenia\base\arena.h" />
-    <ClInclude Include="src\xenia\base\assert.h" />
-    <ClInclude Include="src\xenia\base\atomic.h" />
-    <ClInclude Include="src\xenia\base\byte_order.h" />
-    <ClInclude Include="src\xenia\base\clock.h" />
-    <ClInclude Include="src\xenia\base\debugging.h" />
-    <ClInclude Include="src\xenia\base\delegate.h" />
-    <ClInclude Include="src\xenia\base\filesystem.h" />
-    <ClInclude Include="src\xenia\base\logging.h" />
-    <ClInclude Include="src\xenia\base\mapped_memory.h" />
-    <ClInclude Include="src\xenia\base\math.h" />
-    <ClInclude Include="src\xenia\base\memory.h" />
-    <ClInclude Include="src\xenia\base\mutex.h" />
-    <ClInclude Include="src\xenia\base\platform.h" />
-    <ClInclude Include="src\xenia\base\reset_scope.h" />
-    <ClInclude Include="src\xenia\base\ring_buffer.h" />
-    <ClInclude Include="src\xenia\base\string.h" />
-    <ClInclude Include="src\xenia\base\string_buffer.h" />
-    <ClInclude Include="src\xenia\base\threading.h" />
-    <ClInclude Include="src\xenia\base\type_pool.h" />
-    <ClInclude Include="src\xenia\base\vec128.h" />
     <ClInclude Include="src\xenia\cpu\backend\assembler.h" />
     <ClInclude Include="src\xenia\cpu\backend\backend.h" />
     <ClInclude Include="src\xenia\cpu\backend\code_cache.h" />
@@ -591,7 +556,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <Lib>
-      <AdditionalDependencies>libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
+      <AdditionalDependencies>libxenia-base.lib;libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-xma-bin\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
@@ -608,7 +573,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <Lib>
-      <AdditionalDependencies>libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
+      <AdditionalDependencies>libxenia-base.lib;libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -627,7 +592,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <Lib>
-      <AdditionalDependencies>libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
+      <AdditionalDependencies>libxenia-base.lib;libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/libxenia.vcxproj.filters b/libxenia.vcxproj.filters
index fda5a8f54..5c46cbe7e 100644
--- a/libxenia.vcxproj.filters
+++ b/libxenia.vcxproj.filters
@@ -14,9 +14,6 @@
     <Filter Include="src\xenia\apu">
       <UniqueIdentifier>{b996d1c8-9a7a-4bf0-8c55-786c15a9a615}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\xenia\base">
-      <UniqueIdentifier>{c3b64a9c-babd-4ed7-a495-b720522b9572}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\xenia\cpu">
       <UniqueIdentifier>{ea01c27b-70c2-4527-b8c5-e3cc5cfc92e1}</UniqueIdentifier>
     </Filter>
@@ -187,33 +184,6 @@
     <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_audio_system.cc">
       <Filter>src\xenia\apu\xaudio2</Filter>
     </ClCompile>
-    <ClCompile Include="src\xenia\base\arena.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\debugging_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\logging.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\mapped_memory_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\math.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\memory_generic.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\string.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\string_buffer.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\threading_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
     <ClCompile Include="src\xenia\cpu\debug_info.cc">
       <Filter>src\xenia\cpu</Filter>
     </ClCompile>
@@ -640,15 +610,9 @@
     <ClCompile Include="src\xenia\cpu\backend\x64\x64_code_cache.cc">
       <Filter>src\xenia\cpu\backend\x64</Filter>
     </ClCompile>
-    <ClCompile Include="src\xenia\base\clock.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
     <ClCompile Include="src\xenia\kernel\util\shim_utils.cc">
       <Filter>src\xenia\kernel\util</Filter>
     </ClCompile>
-    <ClCompile Include="src\xenia\base\ring_buffer.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
     <ClCompile Include="src\xenia\kernel\xam_nui.cc">
       <Filter>src\xenia\kernel</Filter>
     </ClCompile>
@@ -703,9 +667,6 @@
     <ClCompile Include="src\xenia\apu\xma_context.cc">
       <Filter>src\xenia\apu</Filter>
     </ClCompile>
-    <ClCompile Include="src\xenia\base\platform_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
     <ClCompile Include="src\xenia\ui\win32\win32_file_picker.cc">
       <Filter>src\xenia\ui\win32</Filter>
     </ClCompile>
@@ -730,12 +691,6 @@
     <ClCompile Include="src\xenia\apu\nop\nop_apu_flags.cc">
       <Filter>src\xenia\apu\nop</Filter>
     </ClCompile>
-    <ClCompile Include="src\xenia\base\filesystem.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\filesystem_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
     <ClCompile Include="src\xenia\vfs\device.cc">
       <Filter>src\xenia\vfs</Filter>
     </ClCompile>
@@ -801,57 +756,6 @@
     <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_audio_driver.h">
       <Filter>src\xenia\apu\xaudio2</Filter>
     </ClInclude>
-    <ClInclude Include="src\xenia\base\arena.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\assert.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\atomic.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\byte_order.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\debugging.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\delegate.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\logging.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\mapped_memory.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\math.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\memory.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\platform.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\reset_scope.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\string.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\string_buffer.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\threading.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\type_pool.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\vec128.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
     <ClInclude Include="src\xenia\cpu\debug_info.h">
       <Filter>src\xenia\cpu</Filter>
     </ClInclude>
@@ -1320,15 +1224,6 @@
     <ClInclude Include="src\xenia\debug\proto\threads_generated.h">
       <Filter>src\xenia\debug\proto</Filter>
     </ClInclude>
-    <ClInclude Include="src\xenia\base\mutex.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\clock.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\ring_buffer.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
     <ClInclude Include="third_party\capstone\include\capstone.h">
       <Filter>third_party\capstone\include</Filter>
     </ClInclude>
@@ -1431,9 +1326,6 @@
     <ClInclude Include="src\xenia\hid\input.h">
       <Filter>src\xenia\hid</Filter>
     </ClInclude>
-    <ClInclude Include="src\xenia\base\filesystem.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
     <ClInclude Include="src\xenia\vfs\device.h">
       <Filter>src\xenia\vfs</Filter>
     </ClInclude>