mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 22:09:19 -07:00
70f3a069f2
This breaks Linux stdout logging. This reverts commit7ac5b1f2f8, reversing changes made to9bc14012fc. Revert "Merge pull request #77 from lioncash/remove-console" This reverts commit9bc14012fc, reversing changes made tob18a33377d. 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
143 lines
5.7 KiB
XML
143 lines
5.7 KiB
XML
<?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">
|
|
<Configuration>Debug</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Debug|x64">
|
|
<Configuration>Debug</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|Win32">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|x64">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
</ItemGroup>
|
|
<PropertyGroup Label="Globals">
|
|
<ProjectGuid>{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}</ProjectGuid>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
<PropertyGroup Label="Configuration">
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<PlatformToolset>v120</PlatformToolset>
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
|
|
<UseDebugLibraries>false</UseDebugLibraries>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
<ImportGroup Label="ExtensionSettings">
|
|
</ImportGroup>
|
|
<ImportGroup Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
<Import Project="..\..\VSProps\Base.props" />
|
|
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
|
|
</ImportGroup>
|
|
<PropertyGroup Label="UserMacros" />
|
|
<ItemGroup>
|
|
<ClInclude Include="Atomic.h" />
|
|
<ClInclude Include="Atomic_GCC.h" />
|
|
<ClInclude Include="Atomic_Win32.h" />
|
|
<ClInclude Include="BreakPoints.h" />
|
|
<ClInclude Include="CDUtils.h" />
|
|
<ClInclude Include="ChunkFile.h" />
|
|
<ClInclude Include="ColorUtil.h" />
|
|
<ClInclude Include="Common.h" />
|
|
<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" />
|
|
<ClInclude Include="ExtendedTrace.h" />
|
|
<ClInclude Include="FifoQueue.h" />
|
|
<ClInclude Include="FileSearch.h" />
|
|
<ClInclude Include="FileUtil.h" />
|
|
<ClInclude Include="FixedSizeQueue.h" />
|
|
<ClInclude Include="FPURoundMode.h" />
|
|
<ClInclude Include="Hash.h" />
|
|
<ClInclude Include="IniFile.h" />
|
|
<ClInclude Include="LinearDiskCache.h" />
|
|
<ClInclude Include="Log.h" />
|
|
<ClInclude Include="LogManager.h" />
|
|
<ClInclude Include="MathUtil.h" />
|
|
<ClInclude Include="MemArena.h" />
|
|
<ClInclude Include="MemoryUtil.h" />
|
|
<ClInclude Include="MsgHandler.h" />
|
|
<ClInclude Include="NandPaths.h" />
|
|
<ClInclude Include="SDCardUtil.h" />
|
|
<ClInclude Include="SettingsHandler.h" />
|
|
<ClInclude Include="stdafx.h" />
|
|
<ClInclude Include="StdConditionVariable.h" />
|
|
<ClInclude Include="StdMutex.h" />
|
|
<ClInclude Include="StdThread.h" />
|
|
<ClInclude Include="StringUtil.h" />
|
|
<ClInclude Include="SymbolDB.h" />
|
|
<ClInclude Include="SysConf.h" />
|
|
<ClInclude Include="Thread.h" />
|
|
<ClInclude Include="Timer.h" />
|
|
<ClInclude Include="x64ABI.h" />
|
|
<ClInclude Include="x64Analyzer.h" />
|
|
<ClInclude Include="x64Emitter.h" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<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" />
|
|
<ClCompile Include="FileSearch.cpp" />
|
|
<ClCompile Include="FileUtil.cpp" />
|
|
<ClCompile Include="Hash.cpp" />
|
|
<ClCompile Include="IniFile.cpp" />
|
|
<ClCompile Include="LogManager.cpp" />
|
|
<ClCompile Include="MathUtil.cpp" />
|
|
<ClCompile Include="MemArena.cpp" />
|
|
<ClCompile Include="MemoryUtil.cpp" />
|
|
<ClCompile Include="Misc.cpp" />
|
|
<ClCompile Include="MsgHandler.cpp" />
|
|
<ClCompile Include="NandPaths.cpp" />
|
|
<ClCompile Include="SDCardUtil.cpp" />
|
|
<ClCompile Include="SettingsHandler.cpp" />
|
|
<ClCompile Include="stdafx.cpp">
|
|
<PrecompiledHeader>Create</PrecompiledHeader>
|
|
</ClCompile>
|
|
<ClCompile Include="StringUtil.cpp" />
|
|
<ClCompile Include="SymbolDB.cpp" />
|
|
<ClCompile Include="SysConf.cpp" />
|
|
<ClCompile Include="Thread.cpp" />
|
|
<ClCompile Include="Timer.cpp" />
|
|
<ClCompile Include="Version.cpp" />
|
|
<ClCompile Include="x64ABI.cpp" />
|
|
<ClCompile Include="x64Analyzer.cpp" />
|
|
<ClCompile Include="x64CPUDetect.cpp" />
|
|
<ClCompile Include="x64Emitter.cpp" />
|
|
<ClCompile Include="x64FPURoundMode.cpp" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Text Include="CMakeLists.txt" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\..\..\Externals\polarssl\visualc\PolarSSL.vcxproj">
|
|
<Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="SCMRevGen.vcxproj">
|
|
<Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
|
|
</ProjectReference>
|
|
</ItemGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
<ImportGroup Label="ExtensionTargets">
|
|
</ImportGroup>
|
|
</Project>
|