mirror of https://github.com/PCSX2/pcsx2.git
Bring back color to stdio on Linux.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2208 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
c942e3aaca
commit
2d46db3d04
|
@ -1,125 +1,124 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_project_file>
|
||||
<FileVersion major="1" minor="6" />
|
||||
<Project>
|
||||
<Option title="x86emitter" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug">
|
||||
<Option output="../../../deps/debug/libx86emitter.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="./.objs/debug/" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-g" />
|
||||
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
|
||||
<Add option="-DPCSX2_DEVBUILD" />
|
||||
<Add option="-DPCSX2_DEBUG" />
|
||||
</Compiler>
|
||||
</Target>
|
||||
<Target title="Release">
|
||||
<Option output="../../../deps/release/libx86emitter.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="./.objs/release/" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-O2" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
|
||||
<Add option="-DNDEBUG" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Devel">
|
||||
<Option output="../../../deps/devel/libx86emitter.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="./.objs/devel" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-O2" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
|
||||
<Add option="-DPCSX2_DEVBUILD" />
|
||||
<Add option="-DPCSX2_DEVEL" />
|
||||
<Add option="-DNDEBUG" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
</Build>
|
||||
<Compiler>
|
||||
<Add option="-march=i486" />
|
||||
<Add option="-Wno-format" />
|
||||
<Add option="-Wno-unused-parameter" />
|
||||
<Add option="-Wno-unused-value" />
|
||||
<Add option="-Wunused-variable" />
|
||||
<Add option="-fno-guess-branch-probability" />
|
||||
<Add option="-fno-dse" />
|
||||
<Add option="-fno-tree-dse" />
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-pipe -msse -msse2" />
|
||||
<Add option="-m32" />
|
||||
<Add directory="../../include/x86emitter" />
|
||||
<Add directory="../../include" />
|
||||
</Compiler>
|
||||
<Unit filename="../../include/x86emitter/implement/dwshift.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/group1.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/group2.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/group3.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/incdec.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/jmpcall.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/movs.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_arithmetic.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_comparisons.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_moremovs.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_shufflepack.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_templated_helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/test.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/xchg.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/xmm/moremovs.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/xmm/shufflepack.h" />
|
||||
<Unit filename="../../include/x86emitter/inlines.inl" />
|
||||
<Unit filename="../../include/x86emitter/instructions.h" />
|
||||
<Unit filename="../../include/x86emitter/internal.h" />
|
||||
<Unit filename="../../include/x86emitter/legacy_instructions.h" />
|
||||
<Unit filename="../../include/x86emitter/legacy_internal.h" />
|
||||
<Unit filename="../../include/x86emitter/legacy_types.h" />
|
||||
<Unit filename="../../include/x86emitter/macros.h" />
|
||||
<Unit filename="../../include/x86emitter/sse_helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/tools.h" />
|
||||
<Unit filename="../../include/x86emitter/x86emitter.h" />
|
||||
<Unit filename="../../include/x86emitter/x86types.h" />
|
||||
<Unit filename="../../src/x86emitter/3dnow.cpp" />
|
||||
<Unit filename="../../src/x86emitter/PrecompiledHeader.h" />
|
||||
<Unit filename="../../src/x86emitter/LnxCpuDetect.cpp" />
|
||||
<Unit filename="../../src/x86emitter/cpudetect.cpp" />
|
||||
<Unit filename="../../src/x86emitter/cpudetect_internal.cpp" />
|
||||
<Unit filename="../../src/x86emitter/fpu.cpp" />
|
||||
<Unit filename="../../src/x86emitter/groups.cpp" />
|
||||
<Unit filename="../../src/x86emitter/jmp.cpp" />
|
||||
<Unit filename="../../src/x86emitter/legacy.cpp" />
|
||||
<Unit filename="../../src/x86emitter/legacy_sse.cpp" />
|
||||
<Unit filename="../../src/x86emitter/movs.cpp" />
|
||||
<Unit filename="../../src/x86emitter/simd.cpp" />
|
||||
<Unit filename="../../src/x86emitter/tools.cpp" />
|
||||
<Unit filename="../../src/x86emitter/x86emitter.cpp" />
|
||||
<Extensions>
|
||||
<envvars />
|
||||
<code_completion />
|
||||
<debugger />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_project_file>
|
||||
<FileVersion major="1" minor="6" />
|
||||
<Project>
|
||||
<Option title="x86emitter" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug">
|
||||
<Option output="../../../deps/debug/libx86emitter.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="./.objs/debug/" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-g" />
|
||||
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
|
||||
<Add option="-DPCSX2_DEVBUILD" />
|
||||
<Add option="-DPCSX2_DEBUG" />
|
||||
</Compiler>
|
||||
</Target>
|
||||
<Target title="Release">
|
||||
<Option output="../../../deps/release/libx86emitter.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="./.objs/release/" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-O2" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
|
||||
<Add option="-DNDEBUG" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Devel">
|
||||
<Option output="../../../deps/devel/libx86emitter.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="./.objs/devel" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-O2" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
|
||||
<Add option="-DPCSX2_DEVBUILD" />
|
||||
<Add option="-DPCSX2_DEVEL" />
|
||||
<Add option="-DNDEBUG" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
</Build>
|
||||
<Compiler>
|
||||
<Add option="-march=i486" />
|
||||
<Add option="-Wno-format" />
|
||||
<Add option="-Wno-unused-parameter" />
|
||||
<Add option="-Wno-unused-value" />
|
||||
<Add option="-Wunused-variable" />
|
||||
<Add option="-fno-guess-branch-probability" />
|
||||
<Add option="-fno-dse" />
|
||||
<Add option="-fno-tree-dse" />
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-pipe -msse -msse2" />
|
||||
<Add option="-m32" />
|
||||
<Add directory="../../include/x86emitter" />
|
||||
<Add directory="../../include" />
|
||||
</Compiler>
|
||||
<Unit filename="../../include/x86emitter/implement/dwshift.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/group1.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/group2.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/group3.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/incdec.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/jmpcall.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/movs.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_arithmetic.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_comparisons.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_moremovs.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_shufflepack.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/simd_templated_helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/test.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/xchg.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/xmm/moremovs.h" />
|
||||
<Unit filename="../../include/x86emitter/implement/xmm/shufflepack.h" />
|
||||
<Unit filename="../../include/x86emitter/inlines.inl" />
|
||||
<Unit filename="../../include/x86emitter/instructions.h" />
|
||||
<Unit filename="../../include/x86emitter/internal.h" />
|
||||
<Unit filename="../../include/x86emitter/legacy_instructions.h" />
|
||||
<Unit filename="../../include/x86emitter/legacy_internal.h" />
|
||||
<Unit filename="../../include/x86emitter/legacy_types.h" />
|
||||
<Unit filename="../../include/x86emitter/macros.h" />
|
||||
<Unit filename="../../include/x86emitter/sse_helpers.h" />
|
||||
<Unit filename="../../include/x86emitter/tools.h" />
|
||||
<Unit filename="../../include/x86emitter/x86emitter.h" />
|
||||
<Unit filename="../../include/x86emitter/x86types.h" />
|
||||
<Unit filename="../../src/x86emitter/3dnow.cpp" />
|
||||
<Unit filename="../../src/x86emitter/LnxCpuDetect.cpp" />
|
||||
<Unit filename="../../src/x86emitter/PrecompiledHeader.h" />
|
||||
<Unit filename="../../src/x86emitter/cpudetect.cpp" />
|
||||
<Unit filename="../../src/x86emitter/fpu.cpp" />
|
||||
<Unit filename="../../src/x86emitter/groups.cpp" />
|
||||
<Unit filename="../../src/x86emitter/jmp.cpp" />
|
||||
<Unit filename="../../src/x86emitter/legacy.cpp" />
|
||||
<Unit filename="../../src/x86emitter/legacy_sse.cpp" />
|
||||
<Unit filename="../../src/x86emitter/movs.cpp" />
|
||||
<Unit filename="../../src/x86emitter/simd.cpp" />
|
||||
<Unit filename="../../src/x86emitter/tools.cpp" />
|
||||
<Unit filename="../../src/x86emitter/x86emitter.cpp" />
|
||||
<Extensions>
|
||||
<envvars />
|
||||
<code_completion />
|
||||
<debugger />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
|
|
|
@ -682,7 +682,7 @@ static void __concall ConsoleToFile_SetTitle( const wxString& title )
|
|||
|
||||
static void __concall ConsoleToFile_DoSetColor( ConsoleColors color )
|
||||
{
|
||||
ConsoleWriter_Stdio.SetColor(color);
|
||||
ConsoleWriter_Stdio.DoSetColor(color);
|
||||
}
|
||||
|
||||
extern const IConsoleWriter ConsoleWriter_File;
|
||||
|
@ -711,7 +711,7 @@ static void __concall ConsoleToWindow_SetTitle( const wxString& title )
|
|||
template< const IConsoleWriter& secondary >
|
||||
static void __concall ConsoleToWindow_DoSetColor( ConsoleColors color )
|
||||
{
|
||||
secondary.SetColor(color);
|
||||
secondary.DoSetColor(color);
|
||||
}
|
||||
|
||||
template< const IConsoleWriter& secondary >
|
||||
|
|
Loading…
Reference in New Issue