mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +01:00
70f3a069f2
This breaks Linux stdout logging. This reverts commit 7ac5b1f2f805b2bc553492606cf71b6609fa0ae7, reversing changes made to 9bc14012fccf92f38b7d270ec82f7dac522986c5. Revert "Merge pull request #77 from lioncash/remove-console" This reverts commit 9bc14012fccf92f38b7d270ec82f7dac522986c5, reversing changes made to b18a33377d7229a66226a524186d24c57f1d56aa. 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
53 lines
946 B
CMake
53 lines
946 B
CMake
set(SRCS BreakPoints.cpp
|
|
CDUtils.cpp
|
|
ColorUtil.cpp
|
|
ConsoleListener.cpp
|
|
FileSearch.cpp
|
|
FileUtil.cpp
|
|
Hash.cpp
|
|
IniFile.cpp
|
|
LogManager.cpp
|
|
MathUtil.cpp
|
|
MemArena.cpp
|
|
MemoryUtil.cpp
|
|
Misc.cpp
|
|
MsgHandler.cpp
|
|
NandPaths.cpp
|
|
SettingsHandler.cpp
|
|
SDCardUtil.cpp
|
|
StringUtil.cpp
|
|
SymbolDB.cpp
|
|
SysConf.cpp
|
|
Thread.cpp
|
|
Timer.cpp
|
|
Version.cpp
|
|
x64ABI.cpp
|
|
x64Analyzer.cpp
|
|
x64Emitter.cpp
|
|
Crypto/bn.cpp
|
|
Crypto/ec.cpp)
|
|
|
|
if(_M_ARM) #ARM
|
|
set(SRCS ${SRCS}
|
|
ArmCPUDetect.cpp
|
|
ArmEmitter.cpp)
|
|
else()
|
|
if(NOT _M_GENERIC) #X86
|
|
set(SRCS ${SRCS}
|
|
x64FPURoundMode.cpp
|
|
)
|
|
endif()
|
|
set(SRCS ${SRCS} x64CPUDetect.cpp)
|
|
endif()
|
|
if(_M_GENERIC) #Generic
|
|
set(SRCS ${SRCS}
|
|
GenericFPURoundMode.cpp)
|
|
endif()
|
|
if(WIN32)
|
|
set(SRCS ${SRCS} ExtendedTrace.cpp)
|
|
endif(WIN32)
|
|
|
|
enable_precompiled_headers(stdafx.h stdafx.cpp SRCS)
|
|
|
|
add_dolphin_library(common "${SRCS}" "${CMAKE_THREAD_LIBS_INIT}")
|