Skip to content

Commit

Permalink
Revert "Merge pull request #83 from lioncash/remove-console"
Browse files Browse the repository at this point in the history
This breaks Linux stdout logging.

This reverts commit 7ac5b1f, reversing
changes made to 9bc1401.

Revert "Merge pull request #77 from lioncash/remove-console"

This reverts commit 9bc1401, reversing
changes made to b18a333.

Conflicts:
	Source/Core/Common/LogManager.cpp
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/DolphinWX/FrameAui.cpp
	Source/Core/DolphinWX/LogConfigWindow.cpp
	Source/Core/DolphinWX/LogWindow.cpp
  • Loading branch information
delroth committed Feb 23, 2014
1 parent 60a5d89 commit 70f3a06
Show file tree
Hide file tree
Showing 24 changed files with 834 additions and 17 deletions.
1 change: 1 addition & 0 deletions Source/Core/Common/CMakeLists.txt
@@ -1,6 +1,7 @@
set(SRCS BreakPoints.cpp
CDUtils.cpp
ColorUtil.cpp
ConsoleListener.cpp
FileSearch.cpp
FileUtil.cpp
Hash.cpp
Expand Down
6 changes: 4 additions & 2 deletions Source/Core/Common/Common.vcxproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
Expand Down Expand Up @@ -54,6 +54,7 @@
<ClInclude Include="CommonFuncs.h" />
<ClInclude Include="CommonPaths.h" />
<ClInclude Include="CommonTypes.h" />
<ClInclude Include="ConsoleListener.h" />
<ClInclude Include="CPUDetect.h" />
<ClInclude Include="Crypto\tools.h" />
<ClInclude Include="DebugInterface.h" />
Expand Down Expand Up @@ -92,6 +93,7 @@
<ClCompile Include="BreakPoints.cpp" />
<ClCompile Include="CDUtils.cpp" />
<ClCompile Include="ColorUtil.cpp" />
<ClCompile Include="ConsoleListener.cpp" />
<ClCompile Include="Crypto\bn.cpp" />
<ClCompile Include="Crypto\ec.cpp" />
<ClCompile Include="ExtendedTrace.cpp" />
Expand Down Expand Up @@ -137,4 +139,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
10 changes: 8 additions & 2 deletions Source/Core/Common/Common.vcxproj.filters
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Crypto">
Expand Down Expand Up @@ -52,6 +52,9 @@
<ClInclude Include="Crypto\tools.h">
<Filter>Crypto</Filter>
</ClInclude>
<ClInclude Include="ConsoleListener.h">
<Filter>Logging</Filter>
</ClInclude>
<ClInclude Include="Log.h">
<Filter>Logging</Filter>
</ClInclude>
Expand Down Expand Up @@ -94,6 +97,9 @@
<ClCompile Include="Crypto\ec.cpp">
<Filter>Crypto</Filter>
</ClCompile>
<ClCompile Include="ConsoleListener.cpp">
<Filter>Logging</Filter>
</ClCompile>
<ClCompile Include="LogManager.cpp">
<Filter>Logging</Filter>
</ClCompile>
Expand All @@ -102,4 +108,4 @@
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
</Project>
</Project>

0 comments on commit 70f3a06

Please sign in to comment.