CMakeLists: Normalize whitespace

Normalizes tabs to spaces to follow our codebase's indentation style.
This commit is contained in:
Lioncash 2017-03-01 07:43:43 -05:00
parent e375c96693
commit ee61bd6f2e
17 changed files with 1348 additions and 1317 deletions

File diff suppressed because it is too large Load Diff

View File

@ -20,18 +20,18 @@ add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-D__STDC_CONSTANT_MACROS) add_definitions(-D__STDC_CONSTANT_MACROS)
macro(add_dolphin_library lib srcs libs) macro(add_dolphin_library lib srcs libs)
add_library(${lib} STATIC ${srcs}) add_library(${lib} STATIC ${srcs})
target_link_libraries(${lib} PUBLIC ${libs}) target_link_libraries(${lib} PUBLIC ${libs})
endmacro() endmacro()
add_subdirectory(Core) add_subdirectory(Core)
if (ANDROID) if (ANDROID)
add_subdirectory(Android/jni) add_subdirectory(Android/jni)
endif() endif()
add_subdirectory(UnitTests) add_subdirectory(UnitTests)
if (DSPTOOL) if (DSPTOOL)
add_subdirectory(DSPTool) add_subdirectory(DSPTool)
endif() endif()
# TODO: Add DSPSpy. Preferably make it option() and cpack component # TODO: Add DSPSpy. Preferably make it option() and cpack component

View File

@ -9,5 +9,5 @@ add_subdirectory(VideoCommon)
add_subdirectory(VideoBackends) add_subdirectory(VideoBackends)
if(ENABLE_QT2) if(ENABLE_QT2)
add_subdirectory(DolphinQt2) add_subdirectory(DolphinQt2)
endif() endif()

View File

@ -1,117 +1,123 @@
set(SRCS Analytics.cpp set(SRCS
CDUtils.cpp Analytics.cpp
ColorUtil.cpp CDUtils.cpp
Config/Config.cpp ColorUtil.cpp
Config/Layer.cpp Config/Config.cpp
Config/Section.cpp Config/Layer.cpp
ENetUtil.cpp Config/Section.cpp
FileSearch.cpp ENetUtil.cpp
FileUtil.cpp FileSearch.cpp
GekkoDisassembler.cpp FileUtil.cpp
Hash.cpp GekkoDisassembler.cpp
IniFile.cpp Hash.cpp
JitRegister.cpp IniFile.cpp
MathUtil.cpp JitRegister.cpp
MemArena.cpp MathUtil.cpp
MemoryUtil.cpp MemArena.cpp
Misc.cpp MemoryUtil.cpp
MsgHandler.cpp Misc.cpp
NandPaths.cpp MsgHandler.cpp
Network.cpp NandPaths.cpp
PcapFile.cpp Network.cpp
PerformanceCounter.cpp PcapFile.cpp
Profiler.cpp PerformanceCounter.cpp
SettingsHandler.cpp Profiler.cpp
SDCardUtil.cpp SettingsHandler.cpp
StringUtil.cpp SDCardUtil.cpp
SymbolDB.cpp StringUtil.cpp
SysConf.cpp SymbolDB.cpp
Thread.cpp SysConf.cpp
Timer.cpp Thread.cpp
TraversalClient.cpp Timer.cpp
Version.cpp TraversalClient.cpp
x64ABI.cpp Version.cpp
x64Emitter.cpp x64ABI.cpp
MD5.cpp x64Emitter.cpp
Crypto/AES.cpp MD5.cpp
Crypto/bn.cpp Crypto/AES.cpp
Crypto/ec.cpp Crypto/bn.cpp
Logging/LogManager.cpp) Crypto/ec.cpp
Logging/LogManager.cpp
)
if(LIBUSB_FOUND) if(LIBUSB_FOUND)
set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
set(SRCS ${SRCS} LibusbContext.cpp) set(SRCS ${SRCS} LibusbContext.cpp)
endif(LIBUSB_FOUND) endif(LIBUSB_FOUND)
if(ANDROID) if(ANDROID)
set(SRCS ${SRCS} set(SRCS ${SRCS}
Logging/ConsoleListenerDroid.cpp) Logging/ConsoleListenerDroid.cpp)
elseif(WIN32) elseif(WIN32)
set(SRCS ${SRCS} set(SRCS ${SRCS}
Logging/ConsoleListenerWin.cpp) Logging/ConsoleListenerWin.cpp)
else() else()
set(SRCS ${SRCS} set(SRCS ${SRCS}
Logging/ConsoleListenerNix.cpp) Logging/ConsoleListenerNix.cpp)
endif() endif()
list(APPEND LIBS enet ${CURL_LIBRARIES}) list(APPEND LIBS enet ${CURL_LIBRARIES})
if(_M_ARM_64) if(_M_ARM_64)
set(SRCS ${SRCS} set(SRCS ${SRCS}
Arm64Emitter.cpp Arm64Emitter.cpp
ArmCPUDetect.cpp ArmCPUDetect.cpp
GenericFPURoundMode.cpp) GenericFPURoundMode.cpp
)
else() else()
if(_M_X86) #X86 if(_M_X86) #X86
set(SRCS ${SRCS} set(SRCS ${SRCS}
x64FPURoundMode.cpp x64FPURoundMode.cpp
x64CPUDetect.cpp) x64CPUDetect.cpp
else() # Generic )
set(SRCS ${SRCS} else() # Generic
GenericFPURoundMode.cpp set(SRCS ${SRCS}
GenericCPUDetect.cpp) GenericFPURoundMode.cpp
endif() GenericCPUDetect.cpp
)
endif()
endif() endif()
list(APPEND LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES}) list(APPEND LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES})
# OpenGL Interface # OpenGL Interface
set(SRCS ${SRCS} set(SRCS ${SRCS}
GL/GLUtil.cpp GL/GLUtil.cpp
GL/GLExtensions/GLExtensions.cpp GL/GLExtensions/GLExtensions.cpp
GL/GLInterface/GLInterface.cpp) GL/GLInterface/GLInterface.cpp
)
if(USE_EGL) if(USE_EGL)
set(SRCS ${SRCS} GL/GLInterface/EGL.cpp) set(SRCS ${SRCS} GL/GLInterface/EGL.cpp)
if(ANDROID) if(ANDROID)
set(SRCS ${SRCS} GL/GLInterface/EGLAndroid.cpp) set(SRCS ${SRCS} GL/GLInterface/EGLAndroid.cpp)
elseif(USE_X11) elseif(USE_X11)
set(SRCS ${SRCS} GL/GLInterface/EGLX11.cpp) set(SRCS ${SRCS} GL/GLInterface/EGLX11.cpp)
endif() endif()
set(LIBS ${LIBS} EGL) set(LIBS ${LIBS} EGL)
endif() endif()
if(WIN32) if(WIN32)
set(SRCS ${SRCS} GL/GLInterface/WGL.cpp) set(SRCS ${SRCS} GL/GLInterface/WGL.cpp)
elseif(APPLE) elseif(APPLE)
set(SRCS ${SRCS} GL/GLInterface/AGL.mm) set(SRCS ${SRCS} GL/GLInterface/AGL.mm)
elseif(USE_X11) elseif(USE_X11)
if (NOT USE_EGL) if (NOT USE_EGL)
set(SRCS ${SRCS} GL/GLInterface/GLX.cpp) set(SRCS ${SRCS} GL/GLInterface/GLX.cpp)
# GLX has a hard dependency on libGL. # GLX has a hard dependency on libGL.
# Make sure to link to it if using GLX. # Make sure to link to it if using GLX.
set(LIBS ${LIBS} ${OPENGL_LIBRARIES}) set(LIBS ${LIBS} ${OPENGL_LIBRARIES})
endif() endif()
set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp) set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp)
set(LIBS ${LIBS} ${XRANDR_LIBRARIES}) set(LIBS ${LIBS} ${XRANDR_LIBRARIES})
endif() endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(LIBS ${LIBS} dl) set(LIBS ${LIBS} dl)
endif() endif()
add_dolphin_library(common "${SRCS}" "${LIBS}") add_dolphin_library(common "${SRCS}" "${LIBS}")
if(UNIX) if(UNIX)
# Posix networking code needs to be fixed for Windows # Posix networking code needs to be fixed for Windows
add_executable(traversal_server TraversalServer.cpp) add_executable(traversal_server TraversalServer.cpp)
endif() endif()

View File

@ -1,343 +1,347 @@
set(SRCS ActionReplay.cpp set(SRCS
Analytics.cpp ActionReplay.cpp
ARDecrypt.cpp Analytics.cpp
BootManager.cpp ARDecrypt.cpp
ConfigManager.cpp BootManager.cpp
Core.cpp ConfigManager.cpp
CoreTiming.cpp Core.cpp
DSPEmulator.cpp CoreTiming.cpp
ec_wii.cpp DSPEmulator.cpp
GeckoCodeConfig.cpp ec_wii.cpp
GeckoCode.cpp GeckoCodeConfig.cpp
HotkeyManager.cpp GeckoCode.cpp
MemTools.cpp HotkeyManager.cpp
Movie.cpp MemTools.cpp
NetPlayClient.cpp Movie.cpp
NetPlayServer.cpp NetPlayClient.cpp
PatchEngine.cpp NetPlayServer.cpp
State.cpp PatchEngine.cpp
WiiRoot.cpp State.cpp
Boot/Boot_BS2Emu.cpp WiiRoot.cpp
Boot/Boot.cpp Boot/Boot_BS2Emu.cpp
Boot/Boot_DOL.cpp Boot/Boot.cpp
Boot/Boot_ELF.cpp Boot/Boot_DOL.cpp
Boot/Boot_WiiWAD.cpp Boot/Boot_ELF.cpp
Boot/ElfReader.cpp Boot/Boot_WiiWAD.cpp
Debugger/Debugger_SymbolMap.cpp Boot/ElfReader.cpp
Debugger/Dump.cpp Debugger/Debugger_SymbolMap.cpp
Debugger/PPCDebugInterface.cpp Debugger/Dump.cpp
DSP/DSPAssembler.cpp Debugger/PPCDebugInterface.cpp
DSP/DSPDisassembler.cpp DSP/DSPAssembler.cpp
DSP/DSPAccelerator.cpp DSP/DSPDisassembler.cpp
DSP/DSPCaptureLogger.cpp DSP/DSPAccelerator.cpp
DSP/DSPHWInterface.cpp DSP/DSPCaptureLogger.cpp
DSP/DSPMemoryMap.cpp DSP/DSPHWInterface.cpp
DSP/DSPStacks.cpp DSP/DSPMemoryMap.cpp
DSP/DSPAnalyzer.cpp DSP/DSPStacks.cpp
DSP/DSPCodeUtil.cpp DSP/DSPAnalyzer.cpp
DSP/LabelMap.cpp DSP/DSPCodeUtil.cpp
DSP/DSPCore.cpp DSP/LabelMap.cpp
DSP/DSPTables.cpp DSP/DSPCore.cpp
DSP/Interpreter/DSPIntArithmetic.cpp DSP/DSPTables.cpp
DSP/Interpreter/DSPIntBranch.cpp DSP/Interpreter/DSPIntArithmetic.cpp
DSP/Interpreter/DSPIntCCUtil.cpp DSP/Interpreter/DSPIntBranch.cpp
DSP/Interpreter/DSPInterpreter.cpp DSP/Interpreter/DSPIntCCUtil.cpp
DSP/Interpreter/DSPIntExtOps.cpp DSP/Interpreter/DSPInterpreter.cpp
DSP/Interpreter/DSPIntLoadStore.cpp DSP/Interpreter/DSPIntExtOps.cpp
DSP/Interpreter/DSPIntMisc.cpp DSP/Interpreter/DSPIntLoadStore.cpp
DSP/Interpreter/DSPIntMultiplier.cpp DSP/Interpreter/DSPIntMisc.cpp
DSP/Jit/DSPEmitter.cpp DSP/Interpreter/DSPIntMultiplier.cpp
DSP/Jit/DSPJitRegCache.cpp DSP/Jit/DSPEmitter.cpp
DSP/Jit/DSPJitExtOps.cpp DSP/Jit/DSPJitRegCache.cpp
DSP/Jit/DSPJitBranch.cpp DSP/Jit/DSPJitExtOps.cpp
DSP/Jit/DSPJitCCUtil.cpp DSP/Jit/DSPJitBranch.cpp
DSP/Jit/DSPJitArithmetic.cpp DSP/Jit/DSPJitCCUtil.cpp
DSP/Jit/DSPJitLoadStore.cpp DSP/Jit/DSPJitArithmetic.cpp
DSP/Jit/DSPJitMultiplier.cpp DSP/Jit/DSPJitLoadStore.cpp
DSP/Jit/DSPJitUtil.cpp DSP/Jit/DSPJitMultiplier.cpp
DSP/Jit/DSPJitMisc.cpp DSP/Jit/DSPJitUtil.cpp
FifoPlayer/FifoAnalyzer.cpp DSP/Jit/DSPJitMisc.cpp
FifoPlayer/FifoDataFile.cpp FifoPlayer/FifoAnalyzer.cpp
FifoPlayer/FifoPlaybackAnalyzer.cpp FifoPlayer/FifoDataFile.cpp
FifoPlayer/FifoPlayer.cpp FifoPlayer/FifoPlaybackAnalyzer.cpp
FifoPlayer/FifoRecordAnalyzer.cpp FifoPlayer/FifoPlayer.cpp
FifoPlayer/FifoRecorder.cpp FifoPlayer/FifoRecordAnalyzer.cpp
HLE/HLE.cpp FifoPlayer/FifoRecorder.cpp
HLE/HLE_Misc.cpp HLE/HLE.cpp
HLE/HLE_OS.cpp HLE/HLE_Misc.cpp
HW/AudioInterface.cpp HLE/HLE_OS.cpp
HW/CPU.cpp HW/AudioInterface.cpp
HW/DSP.cpp HW/CPU.cpp
HW/DSPHLE/UCodes/AX.cpp HW/DSP.cpp
HW/DSPHLE/UCodes/AXWii.cpp HW/DSPHLE/UCodes/AX.cpp
HW/DSPHLE/UCodes/CARD.cpp HW/DSPHLE/UCodes/AXWii.cpp
HW/DSPHLE/UCodes/GBA.cpp HW/DSPHLE/UCodes/CARD.cpp
HW/DSPHLE/UCodes/INIT.cpp HW/DSPHLE/UCodes/GBA.cpp
HW/DSPHLE/UCodes/ROM.cpp HW/DSPHLE/UCodes/INIT.cpp
HW/DSPHLE/UCodes/UCodes.cpp HW/DSPHLE/UCodes/ROM.cpp
HW/DSPHLE/UCodes/Zelda.cpp HW/DSPHLE/UCodes/UCodes.cpp
HW/DSPHLE/MailHandler.cpp HW/DSPHLE/UCodes/Zelda.cpp
HW/DSPHLE/DSPHLE.cpp HW/DSPHLE/MailHandler.cpp
HW/DSPLLE/DSPDebugInterface.cpp HW/DSPHLE/DSPHLE.cpp
HW/DSPLLE/DSPHost.cpp HW/DSPLLE/DSPDebugInterface.cpp
HW/DSPLLE/DSPSymbols.cpp HW/DSPLLE/DSPHost.cpp
HW/DSPLLE/DSPLLEGlobals.cpp HW/DSPLLE/DSPSymbols.cpp
HW/DSPLLE/DSPLLE.cpp HW/DSPLLE/DSPLLEGlobals.cpp
HW/DSPLLE/DSPLLETools.cpp HW/DSPLLE/DSPLLE.cpp
HW/DVDInterface.cpp HW/DSPLLE/DSPLLETools.cpp
HW/DVDThread.cpp HW/DVDInterface.cpp
HW/EXI/EXI_Channel.cpp HW/DVDThread.cpp
HW/EXI/EXI.cpp HW/EXI/EXI_Channel.cpp
HW/EXI/EXI_Device.cpp HW/EXI/EXI.cpp
HW/EXI/EXI_DeviceAD16.cpp HW/EXI/EXI_Device.cpp
HW/EXI/EXI_DeviceAGP.cpp HW/EXI/EXI_DeviceAD16.cpp
HW/EXI/EXI_DeviceDummy.cpp HW/EXI/EXI_DeviceAGP.cpp
HW/EXI/EXI_DeviceEthernet.cpp HW/EXI/EXI_DeviceDummy.cpp
HW/EXI/EXI_DeviceGecko.cpp HW/EXI/EXI_DeviceEthernet.cpp
HW/EXI/EXI_DeviceIPL.cpp HW/EXI/EXI_DeviceGecko.cpp
HW/EXI/EXI_DeviceMemoryCard.cpp HW/EXI/EXI_DeviceIPL.cpp
HW/EXI/EXI_DeviceMic.cpp HW/EXI/EXI_DeviceMemoryCard.cpp
HW/GCKeyboard.cpp HW/EXI/EXI_DeviceMic.cpp
HW/GCKeyboardEmu.cpp HW/GCKeyboard.cpp
HW/GCMemcard.cpp HW/GCKeyboardEmu.cpp
HW/GCMemcardDirectory.cpp HW/GCMemcard.cpp
HW/GCMemcardRaw.cpp HW/GCMemcardDirectory.cpp
HW/GCPad.cpp HW/GCMemcardRaw.cpp
HW/GCPadEmu.cpp HW/GCPad.cpp
HW/GPFifo.cpp HW/GCPadEmu.cpp
HW/HW.cpp HW/GPFifo.cpp
HW/Memmap.cpp HW/HW.cpp
HW/MemoryInterface.cpp HW/Memmap.cpp
HW/MMIO.cpp HW/MemoryInterface.cpp
HW/ProcessorInterface.cpp HW/MMIO.cpp
HW/SI/SI.cpp HW/ProcessorInterface.cpp
HW/SI/SI_Device.cpp HW/SI/SI.cpp
HW/SI/SI_DeviceDanceMat.cpp HW/SI/SI_Device.cpp
HW/SI/SI_DeviceGBA.cpp HW/SI/SI_DeviceDanceMat.cpp
HW/SI/SI_DeviceGCAdapter.cpp HW/SI/SI_DeviceGBA.cpp
HW/SI/SI_DeviceGCController.cpp HW/SI/SI_DeviceGCAdapter.cpp
HW/SI/SI_DeviceGCSteeringWheel.cpp HW/SI/SI_DeviceGCController.cpp
HW/SI/SI_DeviceKeyboard.cpp HW/SI/SI_DeviceGCSteeringWheel.cpp
HW/SI/SI_DeviceNull.cpp HW/SI/SI_DeviceKeyboard.cpp
HW/Sram.cpp HW/SI/SI_DeviceNull.cpp
HW/StreamADPCM.cpp HW/Sram.cpp
HW/SystemTimers.cpp HW/StreamADPCM.cpp
HW/VideoInterface.cpp HW/SystemTimers.cpp
HW/WII_IPC.cpp HW/VideoInterface.cpp
HW/Wiimote.cpp HW/WII_IPC.cpp
HW/WiimoteEmu/WiimoteEmu.cpp HW/Wiimote.cpp
HW/WiimoteEmu/Attachment/Classic.cpp HW/WiimoteEmu/WiimoteEmu.cpp
HW/WiimoteEmu/Attachment/Attachment.cpp HW/WiimoteEmu/Attachment/Classic.cpp
HW/WiimoteEmu/Attachment/Nunchuk.cpp HW/WiimoteEmu/Attachment/Attachment.cpp
HW/WiimoteEmu/Attachment/Drums.cpp HW/WiimoteEmu/Attachment/Nunchuk.cpp
HW/WiimoteEmu/Attachment/Guitar.cpp HW/WiimoteEmu/Attachment/Drums.cpp
HW/WiimoteEmu/Attachment/Turntable.cpp HW/WiimoteEmu/Attachment/Guitar.cpp
HW/WiimoteEmu/EmuSubroutines.cpp HW/WiimoteEmu/Attachment/Turntable.cpp
HW/WiimoteEmu/Encryption.cpp HW/WiimoteEmu/EmuSubroutines.cpp
HW/WiimoteEmu/Speaker.cpp HW/WiimoteEmu/Encryption.cpp
HW/WiimoteReal/WiimoteReal.cpp HW/WiimoteEmu/Speaker.cpp
HW/WiiSaveCrypted.cpp HW/WiimoteReal/WiimoteReal.cpp
IOS/Device.cpp HW/WiiSaveCrypted.cpp
IOS/DeviceStub.cpp IOS/Device.cpp
IOS/IPC.cpp IOS/DeviceStub.cpp
IOS/MIOS.cpp IOS/IPC.cpp
IOS/DI/DI.cpp IOS/MIOS.cpp
IOS/ES/ES.cpp IOS/DI/DI.cpp
IOS/ES/Formats.cpp IOS/ES/ES.cpp
IOS/FS/FileIO.cpp IOS/ES/Formats.cpp
IOS/FS/FS.cpp IOS/FS/FileIO.cpp
IOS/Network/ICMPLin.cpp IOS/FS/FS.cpp
IOS/Network/MACUtils.cpp IOS/Network/ICMPLin.cpp
IOS/Network/Socket.cpp IOS/Network/MACUtils.cpp
IOS/Network/SSL.cpp IOS/Network/Socket.cpp
IOS/Network/IP/Top.cpp IOS/Network/SSL.cpp
IOS/Network/KD/NetKDRequest.cpp IOS/Network/IP/Top.cpp
IOS/Network/KD/NetKDTime.cpp IOS/Network/KD/NetKDRequest.cpp
IOS/Network/KD/NWC24Config.cpp IOS/Network/KD/NetKDTime.cpp
IOS/Network/NCD/Config.cpp IOS/Network/KD/NWC24Config.cpp
IOS/Network/NCD/Manage.cpp IOS/Network/NCD/Config.cpp
IOS/Network/WD/Command.cpp IOS/Network/NCD/Manage.cpp
IOS/SDIO/SDIOSlot0.cpp IOS/Network/WD/Command.cpp
IOS/STM/STM.cpp IOS/SDIO/SDIOSlot0.cpp
IOS/USB/Common.cpp IOS/STM/STM.cpp
IOS/USB/Host.cpp IOS/USB/Common.cpp
IOS/USB/OH0/OH0.cpp IOS/USB/Host.cpp
IOS/USB/OH0/OH0Device.cpp IOS/USB/OH0/OH0.cpp
IOS/USB/USB_HID/HIDv4.cpp IOS/USB/OH0/OH0Device.cpp
IOS/USB/USB_VEN/VEN.cpp IOS/USB/USB_HID/HIDv4.cpp
IOS/USB/USBV0.cpp IOS/USB/USB_VEN/VEN.cpp
IOS/USB/USBV4.cpp IOS/USB/USBV0.cpp
IOS/USB/USBV5.cpp IOS/USB/USBV4.cpp
IOS/USB/USB_KBD.cpp IOS/USB/USBV5.cpp
IOS/USB/Bluetooth/BTBase.cpp IOS/USB/USB_KBD.cpp
IOS/USB/Bluetooth/BTEmu.cpp IOS/USB/Bluetooth/BTBase.cpp
IOS/USB/Bluetooth/BTStub.cpp IOS/USB/Bluetooth/BTEmu.cpp
IOS/USB/Bluetooth/WiimoteDevice.cpp IOS/USB/Bluetooth/BTStub.cpp
IOS/USB/Bluetooth/WiimoteHIDAttr.cpp IOS/USB/Bluetooth/WiimoteDevice.cpp
IOS/WFS/WFSSRV.cpp IOS/USB/Bluetooth/WiimoteHIDAttr.cpp
IOS/WFS/WFSI.cpp IOS/WFS/WFSSRV.cpp
PowerPC/BreakPoints.cpp IOS/WFS/WFSI.cpp
PowerPC/MMU.cpp PowerPC/BreakPoints.cpp
PowerPC/PowerPC.cpp PowerPC/MMU.cpp
PowerPC/PPCAnalyst.cpp PowerPC/PowerPC.cpp
PowerPC/PPCCache.cpp PowerPC/PPCAnalyst.cpp
PowerPC/PPCSymbolDB.cpp PowerPC/PPCCache.cpp
PowerPC/PPCTables.cpp PowerPC/PPCSymbolDB.cpp
PowerPC/Profiler.cpp PowerPC/PPCTables.cpp
PowerPC/SignatureDB/CSVSignatureDB.cpp PowerPC/Profiler.cpp
PowerPC/SignatureDB/DSYSignatureDB.cpp PowerPC/SignatureDB/CSVSignatureDB.cpp
PowerPC/SignatureDB/SignatureDB.cpp PowerPC/SignatureDB/DSYSignatureDB.cpp
PowerPC/JitInterface.cpp PowerPC/SignatureDB/SignatureDB.cpp
PowerPC/CachedInterpreter/CachedInterpreter.cpp PowerPC/JitInterface.cpp
PowerPC/CachedInterpreter/InterpreterBlockCache.cpp PowerPC/CachedInterpreter/CachedInterpreter.cpp
PowerPC/Interpreter/Interpreter_Branch.cpp PowerPC/CachedInterpreter/InterpreterBlockCache.cpp
PowerPC/Interpreter/Interpreter.cpp PowerPC/Interpreter/Interpreter_Branch.cpp
PowerPC/Interpreter/Interpreter_FloatingPoint.cpp PowerPC/Interpreter/Interpreter.cpp
PowerPC/Interpreter/Interpreter_Integer.cpp PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
PowerPC/Interpreter/Interpreter_LoadStore.cpp PowerPC/Interpreter/Interpreter_Integer.cpp
PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp PowerPC/Interpreter/Interpreter_LoadStore.cpp
PowerPC/Interpreter/Interpreter_Paired.cpp PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
PowerPC/Interpreter/Interpreter_SystemRegisters.cpp PowerPC/Interpreter/Interpreter_Paired.cpp
PowerPC/Interpreter/Interpreter_Tables.cpp PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
PowerPC/JitCommon/JitAsmCommon.cpp PowerPC/Interpreter/Interpreter_Tables.cpp
PowerPC/JitCommon/JitBase.cpp PowerPC/JitCommon/JitAsmCommon.cpp
PowerPC/JitCommon/JitCache.cpp PowerPC/JitCommon/JitBase.cpp
PowerPC/JitILCommon/IR.cpp PowerPC/JitCommon/JitCache.cpp
PowerPC/JitILCommon/JitILBase_Branch.cpp PowerPC/JitILCommon/IR.cpp
PowerPC/JitILCommon/JitILBase_LoadStore.cpp PowerPC/JitILCommon/JitILBase_Branch.cpp
PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp PowerPC/JitILCommon/JitILBase_LoadStore.cpp
PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp
PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp
PowerPC/JitILCommon/JitILBase_Paired.cpp PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp
PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp PowerPC/JitILCommon/JitILBase_Paired.cpp
PowerPC/JitILCommon/JitILBase_Integer.cpp PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp
) PowerPC/JitILCommon/JitILBase_Integer.cpp
)
if(_M_X86) if(_M_X86)
set(SRCS ${SRCS} set(SRCS ${SRCS}
PowerPC/Jit64IL/IR_X86.cpp PowerPC/Jit64IL/IR_X86.cpp
PowerPC/Jit64IL/JitIL.cpp PowerPC/Jit64IL/JitIL.cpp
PowerPC/Jit64IL/JitIL_Tables.cpp PowerPC/Jit64IL/JitIL_Tables.cpp
PowerPC/Jit64/FPURegCache.cpp PowerPC/Jit64/FPURegCache.cpp
PowerPC/Jit64/GPRRegCache.cpp PowerPC/Jit64/GPRRegCache.cpp
PowerPC/Jit64/Jit64_Tables.cpp PowerPC/Jit64/Jit64_Tables.cpp
PowerPC/Jit64/JitAsm.cpp PowerPC/Jit64/JitAsm.cpp
PowerPC/Jit64/Jit_Branch.cpp PowerPC/Jit64/Jit_Branch.cpp
PowerPC/Jit64/Jit.cpp PowerPC/Jit64/Jit.cpp
PowerPC/Jit64/Jit_FloatingPoint.cpp PowerPC/Jit64/Jit_FloatingPoint.cpp
PowerPC/Jit64/Jit_Integer.cpp PowerPC/Jit64/Jit_Integer.cpp
PowerPC/Jit64/Jit_LoadStore.cpp PowerPC/Jit64/Jit_LoadStore.cpp
PowerPC/Jit64/Jit_LoadStoreFloating.cpp PowerPC/Jit64/Jit_LoadStoreFloating.cpp
PowerPC/Jit64/Jit_LoadStorePaired.cpp PowerPC/Jit64/Jit_LoadStorePaired.cpp
PowerPC/Jit64/Jit_Paired.cpp PowerPC/Jit64/Jit_Paired.cpp
PowerPC/Jit64/JitRegCache.cpp PowerPC/Jit64/JitRegCache.cpp
PowerPC/Jit64/Jit_SystemRegisters.cpp PowerPC/Jit64/Jit_SystemRegisters.cpp
PowerPC/Jit64Common/BlockCache.cpp PowerPC/Jit64Common/BlockCache.cpp
PowerPC/Jit64Common/EmuCodeBlock.cpp PowerPC/Jit64Common/EmuCodeBlock.cpp
PowerPC/Jit64Common/FarCodeCache.cpp PowerPC/Jit64Common/FarCodeCache.cpp
PowerPC/Jit64Common/Jit64AsmCommon.cpp PowerPC/Jit64Common/Jit64AsmCommon.cpp
PowerPC/Jit64Common/Jit64Base.cpp PowerPC/Jit64Common/Jit64Base.cpp
PowerPC/Jit64Common/TrampolineCache.cpp) PowerPC/Jit64Common/TrampolineCache.cpp
)
elseif(_M_ARM_64) elseif(_M_ARM_64)
set(SRCS ${SRCS} set(SRCS ${SRCS}
PowerPC/JitArm64/Jit.cpp PowerPC/JitArm64/Jit.cpp
PowerPC/JitArm64/JitAsm.cpp PowerPC/JitArm64/JitAsm.cpp
PowerPC/JitArm64/JitArm64Cache.cpp PowerPC/JitArm64/JitArm64Cache.cpp
PowerPC/JitArm64/JitArm64_RegCache.cpp PowerPC/JitArm64/JitArm64_RegCache.cpp
PowerPC/JitArm64/JitArm64_BackPatch.cpp PowerPC/JitArm64/JitArm64_BackPatch.cpp
PowerPC/JitArm64/JitArm64_Branch.cpp PowerPC/JitArm64/JitArm64_Branch.cpp
PowerPC/JitArm64/JitArm64_FloatingPoint.cpp PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
PowerPC/JitArm64/JitArm64_Integer.cpp PowerPC/JitArm64/JitArm64_Integer.cpp
PowerPC/JitArm64/JitArm64_LoadStore.cpp PowerPC/JitArm64/JitArm64_LoadStore.cpp
PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp
PowerPC/JitArm64/JitArm64_Paired.cpp PowerPC/JitArm64/JitArm64_Paired.cpp
PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
PowerPC/JitArm64/JitArm64_SystemRegisters.cpp PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
PowerPC/JitArm64/Jit_Util.cpp PowerPC/JitArm64/Jit_Util.cpp
PowerPC/JitArm64/JitArm64_Tables.cpp) PowerPC/JitArm64/JitArm64_Tables.cpp
)
endif() endif()
set(LIBS set(LIBS
audiocommon audiocommon
bdisasm bdisasm
common common
discio discio
enet enet
inputcommon inputcommon
${LZO} ${LZO}
sfml-network sfml-network
sfml-system sfml-system
videonull videonull
videoogl videoogl
videosoftware videosoftware
z z
) )
if(LIBUSB_FOUND) if(LIBUSB_FOUND)
# Using shared LibUSB # Using shared LibUSB
set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
set(SRCS ${SRCS} IOS/USB/LibusbDevice.cpp set(SRCS ${SRCS}
IOS/USB/Bluetooth/BTReal.cpp) IOS/USB/LibusbDevice.cpp
IOS/USB/Bluetooth/BTReal.cpp
)
endif() endif()
if(NOT APPLE) if(NOT APPLE)
set(LIBS ${LIBS} videovulkan) set(LIBS ${LIBS} videovulkan)
endif() endif()
set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES}) set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES})
if(WIN32) if(WIN32)
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp) set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
list(APPEND LIBS list(APPEND LIBS
videod3d videod3d
videod3d12 videod3d12
setupapi.lib setupapi.lib
iphlpapi.lib iphlpapi.lib
) )
elseif(APPLE) elseif(APPLE)
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm) set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm)
set(LIBS ${LIBS} set(LIBS ${LIBS} ${IOB_LIBRARY})
${IOB_LIBRARY})
elseif(UNIX) elseif(UNIX)
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Unix.cpp) set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Unix.cpp)
if(ANDROID) if(ANDROID)
set(SRCS ${SRCS} HW/WiimoteReal/IOAndroid.cpp) set(SRCS ${SRCS} HW/WiimoteReal/IOAndroid.cpp)
endif() endif()
endif() endif()
# Bluez doesn't support all the communication modes on FreeBSD, so only using it on Linux # Bluez doesn't support all the communication modes on FreeBSD, so only using it on Linux
if(ENABLE_BLUEZ AND CMAKE_SYSTEM_NAME MATCHES "Linux") if(ENABLE_BLUEZ AND CMAKE_SYSTEM_NAME MATCHES "Linux")
find_package(BlueZ) find_package(BlueZ)
if(BLUEZ_FOUND) if(BLUEZ_FOUND)
message(STATUS "BlueZ found, enabling bluetooth support") message(STATUS "BlueZ found, enabling bluetooth support")
set(SRCS ${SRCS} HW/WiimoteReal/IOLinux.cpp) set(SRCS ${SRCS} HW/WiimoteReal/IOLinux.cpp)
set(LIBS ${LIBS} BlueZ::BlueZ) set(LIBS ${LIBS} BlueZ::BlueZ)
add_definitions(-DHAVE_BLUEZ=1) add_definitions(-DHAVE_BLUEZ=1)
else() else()
message(STATUS "BlueZ NOT found, disabling bluetooth support") message(STATUS "BlueZ NOT found, disabling bluetooth support")
endif() endif()
else() else()
message(STATUS "BlueZ explicitly disabled, disabling bluetooth support") message(STATUS "BlueZ explicitly disabled, disabling bluetooth support")
endif() endif()
if(HIDAPI_FOUND) if(HIDAPI_FOUND)
set(SRCS ${SRCS} HW/WiimoteReal/IOhidapi.cpp) set(SRCS ${SRCS} HW/WiimoteReal/IOhidapi.cpp)
endif() endif()
if(PORTAUDIO_FOUND) if(PORTAUDIO_FOUND)
set(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES}) set(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES})
endif() endif()
if(OPROFILE_FOUND) if(OPROFILE_FOUND)
set(LIBS ${LIBS} ${OPROFILE_LIBRARIES}) set(LIBS ${LIBS} ${OPROFILE_LIBRARIES})
endif() endif()
if(GDBSTUB) if(GDBSTUB)
set(SRCS ${SRCS} PowerPC/GDBStub.cpp) set(SRCS ${SRCS} PowerPC/GDBStub.cpp)
endif() endif()
if(UNIX) if(UNIX)
set(SRCS ${SRCS} MemoryWatcher.cpp) set(SRCS ${SRCS} MemoryWatcher.cpp)
endif() endif()
add_dolphin_library(core "${SRCS}" "${LIBS}") add_dolphin_library(core "${SRCS}" "${LIBS}")

View File

@ -1,22 +1,24 @@
set(SRCS Blob.cpp set(SRCS
CISOBlob.cpp Blob.cpp
WbfsBlob.cpp CISOBlob.cpp
CompressedBlob.cpp WbfsBlob.cpp
DiscScrubber.cpp CompressedBlob.cpp
DriveBlob.cpp DiscScrubber.cpp
Enums.cpp DriveBlob.cpp
FileBlob.cpp Enums.cpp
FileMonitor.cpp FileBlob.cpp
FileSystemGCWii.cpp FileMonitor.cpp
Filesystem.cpp FileSystemGCWii.cpp
NANDContentLoader.cpp Filesystem.cpp
TGCBlob.cpp NANDContentLoader.cpp
Volume.cpp TGCBlob.cpp
VolumeCreator.cpp Volume.cpp
VolumeDirectory.cpp VolumeCreator.cpp
VolumeGC.cpp VolumeDirectory.cpp
VolumeWad.cpp VolumeGC.cpp
VolumeWiiCrypted.cpp VolumeWad.cpp
WiiWad.cpp) VolumeWiiCrypted.cpp
WiiWad.cpp
)
add_dolphin_library(discio "${SRCS}" "") add_dolphin_library(discio "${SRCS}" "")

View File

@ -7,33 +7,33 @@ add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(SRCS set(SRCS
AboutDialog.cpp AboutDialog.cpp
Host.cpp Host.cpp
InDevelopmentWarning.cpp InDevelopmentWarning.cpp
Main.cpp Main.cpp
MainWindow.cpp MainWindow.cpp
MenuBar.cpp MenuBar.cpp
RenderWidget.cpp RenderWidget.cpp
Resources.cpp Resources.cpp
Settings.cpp Settings.cpp
ToolBar.cpp ToolBar.cpp
Config/FilesystemWidget.cpp Config/FilesystemWidget.cpp
Config/InfoWidget.cpp Config/InfoWidget.cpp
Config/PathDialog.cpp Config/PathDialog.cpp
Config/PropertiesDialog.cpp Config/PropertiesDialog.cpp
Config/SettingsWindow.cpp Config/SettingsWindow.cpp
GameList/GameFile.cpp GameList/GameFile.cpp
GameList/GameList.cpp GameList/GameList.cpp
GameList/GameListModel.cpp GameList/GameListModel.cpp
GameList/GameTracker.cpp GameList/GameTracker.cpp
GameList/ListProxyModel.cpp GameList/ListProxyModel.cpp
GameList/TableDelegate.cpp GameList/TableDelegate.cpp
) )
list(APPEND LIBS core uicommon) list(APPEND LIBS core uicommon)
if(WIN32) if(WIN32)
list(APPEND SRCS DolphinQt2.manifest) list(APPEND SRCS DolphinQt2.manifest)
endif() endif()
set(DOLPHINQT2_BINARY dolphin-emu-qt2) set(DOLPHINQT2_BINARY dolphin-emu-qt2)
@ -42,40 +42,40 @@ add_executable(${DOLPHINQT2_BINARY} ${SRCS} ${UI_HEADERS})
target_link_libraries(${DOLPHINQT2_BINARY} ${LIBS} Qt5::Widgets) target_link_libraries(${DOLPHINQT2_BINARY} ${LIBS} Qt5::Widgets)
if(APPLE) if(APPLE)
# Note: This is copied from DolphinQt, based on the DolphinWX version. # Note: This is copied from DolphinQt, based on the DolphinWX version.
include(BundleUtilities) include(BundleUtilities)
set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHINQT2_BINARY}.app) set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHINQT2_BINARY}.app)
# Ask for an application bundle. # Ask for an application bundle.
set_target_properties(${DOLPHINQT2_BINARY} PROPERTIES set_target_properties(${DOLPHINQT2_BINARY} PROPERTIES
MACOSX_BUNDLE true MACOSX_BUNDLE true
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
) )
# Copy qt.conf into the bundle # Copy qt.conf into the bundle
target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf") target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf")
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
# Copy Qt plugins into the bundle # Copy Qt plugins into the bundle
get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION) get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION)
target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}") target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}")
set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms) set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms)
# Copy resources into the bundle # Copy resources into the bundle
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys") set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys")
file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*") file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*")
foreach(res ${resources}) foreach(res ${resources})
target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}")
get_filename_component(resdir "${res}" DIRECTORY) get_filename_component(resdir "${res}" DIRECTORY)
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources/${resdir}") MACOSX_PACKAGE_LOCATION "Resources/${resdir}")
source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}") source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}")
endforeach() endforeach()
# Update library references to make the bundle portable # Update library references to make the bundle portable
include(DolphinPostprocessBundle) include(DolphinPostprocessBundle)
dolphin_postprocess_bundle(${DOLPHINQT2_BINARY}) dolphin_postprocess_bundle(${DOLPHINQT2_BINARY})
else() else()
install(TARGETS ${DOLPHINQT2_BINARY} RUNTIME DESTINATION ${bindir}) install(TARGETS ${DOLPHINQT2_BINARY} RUNTIME DESTINATION ${bindir})
endif() endif()

View File

@ -1,209 +1,210 @@
set(GUI_SRCS set(GUI_SRCS
AboutDolphin.cpp AboutDolphin.cpp
ControllerConfigDiag.cpp ControllerConfigDiag.cpp
Cheats/ActionReplayCodesPanel.cpp Cheats/ActionReplayCodesPanel.cpp
Cheats/ARCodeAddEdit.cpp Cheats/ARCodeAddEdit.cpp
Cheats/CheatSearchTab.cpp Cheats/CheatSearchTab.cpp
Cheats/CheatsWindow.cpp Cheats/CheatsWindow.cpp
Cheats/CreateCodeDialog.cpp Cheats/CreateCodeDialog.cpp
Cheats/GeckoCodeDiag.cpp Cheats/GeckoCodeDiag.cpp
Config/AddUSBDeviceDiag.cpp Config/AddUSBDeviceDiag.cpp
Config/AdvancedConfigPane.cpp Config/AdvancedConfigPane.cpp
Config/AudioConfigPane.cpp Config/AudioConfigPane.cpp
Config/ConfigMain.cpp Config/ConfigMain.cpp
Config/GameCubeConfigPane.cpp Config/GameCubeConfigPane.cpp
Config/GCAdapterConfigDiag.cpp Config/GCAdapterConfigDiag.cpp
Config/GeneralConfigPane.cpp Config/GeneralConfigPane.cpp
Config/InterfaceConfigPane.cpp Config/InterfaceConfigPane.cpp
Config/PathConfigPane.cpp Config/PathConfigPane.cpp
Config/WiiConfigPane.cpp Config/WiiConfigPane.cpp
Debugger/BreakpointDlg.cpp Debugger/BreakpointDlg.cpp
Debugger/BreakpointView.cpp Debugger/BreakpointView.cpp
Debugger/BreakpointWindow.cpp Debugger/BreakpointWindow.cpp
Debugger/CodeView.cpp Debugger/CodeView.cpp
Debugger/CodeWindow.cpp Debugger/CodeWindow.cpp
Debugger/CodeWindowFunctions.cpp Debugger/CodeWindowFunctions.cpp
Debugger/DSPDebugWindow.cpp Debugger/DSPDebugWindow.cpp
Debugger/DSPRegisterView.cpp Debugger/DSPRegisterView.cpp
Debugger/DebuggerPanel.cpp Debugger/DebuggerPanel.cpp
Debugger/DebuggerUIUtil.cpp Debugger/DebuggerUIUtil.cpp
Debugger/JitWindow.cpp Debugger/JitWindow.cpp
Debugger/MemoryCheckDlg.cpp Debugger/MemoryCheckDlg.cpp
Debugger/MemoryView.cpp Debugger/MemoryView.cpp
Debugger/MemoryWindow.cpp Debugger/MemoryWindow.cpp
Debugger/RegisterView.cpp Debugger/RegisterView.cpp
Debugger/RegisterWindow.cpp Debugger/RegisterWindow.cpp
Debugger/WatchView.cpp Debugger/WatchView.cpp
Debugger/WatchWindow.cpp Debugger/WatchWindow.cpp
ISOProperties/FilesystemPanel.cpp ISOProperties/FilesystemPanel.cpp
ISOProperties/InfoPanel.cpp ISOProperties/InfoPanel.cpp
ISOProperties/ISOProperties.cpp ISOProperties/ISOProperties.cpp
NetPlay/ChangeGameDialog.cpp NetPlay/ChangeGameDialog.cpp
NetPlay/MD5Dialog.cpp NetPlay/MD5Dialog.cpp
NetPlay/NetPlayLauncher.cpp NetPlay/NetPlayLauncher.cpp
NetPlay/NetPlaySetupFrame.cpp NetPlay/NetPlaySetupFrame.cpp
NetPlay/NetWindow.cpp NetPlay/NetWindow.cpp
NetPlay/PadMapDialog.cpp NetPlay/PadMapDialog.cpp
Input/InputConfigDiag.cpp Input/InputConfigDiag.cpp
Input/InputConfigDiagBitmaps.cpp Input/InputConfigDiagBitmaps.cpp
Input/HotkeyInputConfigDiag.cpp Input/HotkeyInputConfigDiag.cpp
Input/GCPadInputConfigDiag.cpp Input/GCPadInputConfigDiag.cpp
Input/MicButtonConfigDiag.cpp Input/MicButtonConfigDiag.cpp
Input/GCKeyboardInputConfigDiag.cpp Input/GCKeyboardInputConfigDiag.cpp
Input/WiimoteInputConfigDiag.cpp Input/WiimoteInputConfigDiag.cpp
Input/NunchukInputConfigDiag.cpp Input/NunchukInputConfigDiag.cpp
Input/ClassicInputConfigDiag.cpp Input/ClassicInputConfigDiag.cpp
Input/GuitarInputConfigDiag.cpp Input/GuitarInputConfigDiag.cpp
Input/DrumsInputConfigDiag.cpp Input/DrumsInputConfigDiag.cpp
Input/TurntableInputConfigDiag.cpp Input/TurntableInputConfigDiag.cpp
DolphinSlider.cpp DolphinSlider.cpp
FifoPlayerDlg.cpp FifoPlayerDlg.cpp
Frame.cpp Frame.cpp
FrameAui.cpp FrameAui.cpp
FrameTools.cpp FrameTools.cpp
GameListCtrl.cpp GameListCtrl.cpp
ISOFile.cpp ISOFile.cpp
LogConfigWindow.cpp LogConfigWindow.cpp
LogWindow.cpp LogWindow.cpp
Main.cpp Main.cpp
MainMenuBar.cpp MainMenuBar.cpp
MainToolBar.cpp MainToolBar.cpp
MemcardManager.cpp MemcardManager.cpp
PatchAddEdit.cpp PatchAddEdit.cpp
PostProcessingConfigDiag.cpp PostProcessingConfigDiag.cpp
SoftwareVideoConfigDialog.cpp SoftwareVideoConfigDialog.cpp
TASInputDlg.cpp TASInputDlg.cpp
VideoConfigDiag.cpp VideoConfigDiag.cpp
WxEventUtils.cpp WxEventUtils.cpp
WXInputBase.cpp WXInputBase.cpp
WxUtils.cpp) WxUtils.cpp
)
set(NOGUI_SRCS MainNoGUI.cpp) set(NOGUI_SRCS MainNoGUI.cpp)
if(USE_X11) if(USE_X11)
set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp) set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp)
set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp) set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp)
endif() endif()
set(WXLIBS ${wxWidgets_LIBRARIES}) set(WXLIBS ${wxWidgets_LIBRARIES})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(WXLIBS ${WXLIBS} dl) set(WXLIBS ${WXLIBS} dl)
endif() endif()
list(APPEND LIBS core uicommon cpp-optparse) list(APPEND LIBS core uicommon cpp-optparse)
if(APPLE) if(APPLE)
if(wxWidgets_FOUND) if(wxWidgets_FOUND)
list(APPEND WXLIBS list(APPEND WXLIBS
${APPSERV_LIBRARY} ${APPSERV_LIBRARY}
${COCOA_LIBRARY} ${COCOA_LIBRARY}
) )
endif() endif()
# Add resource files to application bundle. # Add resource files to application bundle.
set(RESOURCES resources/Dolphin.icns) set(RESOURCES resources/Dolphin.icns)
list(APPEND SRCS ${RESOURCES}) list(APPEND SRCS ${RESOURCES})
set_source_files_properties(${RESOURCES} PROPERTIES set_source_files_properties(${RESOURCES} PROPERTIES
MACOSX_PACKAGE_LOCATION Resources) MACOSX_PACKAGE_LOCATION Resources)
endif() endif()
if(WIN32) if(WIN32)
list(APPEND SRCS list(APPEND SRCS
DolphinWX.manifest DolphinWX.manifest
DolphinWX.rc DolphinWX.rc
) )
endif() endif()
if(APPLE) if(APPLE)
set(DOLPHIN_EXE_BASE Dolphin) set(DOLPHIN_EXE_BASE Dolphin)
else() else()
set(DOLPHIN_EXE_BASE dolphin-emu) set(DOLPHIN_EXE_BASE dolphin-emu)
endif() endif()
set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}) set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE})
if(wxWidgets_FOUND) if(wxWidgets_FOUND)
add_executable(${DOLPHIN_EXE} ${SRCS} ${GUI_SRCS}) add_executable(${DOLPHIN_EXE} ${SRCS} ${GUI_SRCS})
target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
# Handle localization # Handle localization
find_package(Gettext) find_package(Gettext)
if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE) if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot") set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot")
file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po) file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
target_sources(${DOLPHIN_EXE} PRIVATE ${pot_file} ${LINGUAS}) target_sources(${DOLPHIN_EXE} PRIVATE ${pot_file} ${LINGUAS})
source_group("Localization" FILES ${LINGUAS}) source_group("Localization" FILES ${LINGUAS})
source_group("Localization\\\\Generated" FILES ${pot_file}) source_group("Localization\\\\Generated" FILES ${pot_file})
foreach(po ${LINGUAS}) foreach(po ${LINGUAS})
get_filename_component(lang ${po} NAME_WE) get_filename_component(lang ${po} NAME_WE)
set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang}) set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang})
set(mo ${mo_dir}/dolphin-emu.mo) set(mo ${mo_dir}/dolphin-emu.mo)
target_sources(${DOLPHIN_EXE} PRIVATE ${mo}) target_sources(${DOLPHIN_EXE} PRIVATE ${mo})
source_group("Localization\\\\Generated" FILES ${mo}) source_group("Localization\\\\Generated" FILES ${mo})
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set_source_files_properties(${mo} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${lang}.lproj") set_source_files_properties(${mo} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${lang}.lproj")
else() else()
install(FILES ${mo} DESTINATION share/locale/${lang}/LC_MESSAGES) install(FILES ${mo} DESTINATION share/locale/${lang}/LC_MESSAGES)
endif() endif()
add_custom_command(OUTPUT ${mo} add_custom_command(OUTPUT ${mo}
COMMAND mkdir -p ${mo_dir} COMMAND mkdir -p ${mo_dir}
COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${po} ${pot_file} COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${po} ${pot_file}
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po} COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po}
DEPENDS ${po} DEPENDS ${po}
) )
endforeach() endforeach()
endif() endif()
if(APPLE) if(APPLE)
set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app) set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app)
# Ask for an application bundle. # Ask for an application bundle.
set_target_properties(${DOLPHIN_EXE} PROPERTIES set_target_properties(${DOLPHIN_EXE} PROPERTIES
MACOSX_BUNDLE true MACOSX_BUNDLE true
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
) )
# Copy resources in the bundle # Copy resources in the bundle
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys") set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys")
file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*") file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*")
foreach(res ${resources}) foreach(res ${resources})
target_sources(${DOLPHIN_EXE} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") target_sources(${DOLPHIN_EXE} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}")
get_filename_component(resdir "${res}" DIRECTORY) get_filename_component(resdir "${res}" DIRECTORY)
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources/${resdir}") MACOSX_PACKAGE_LOCATION "Resources/${resdir}")
source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}") source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}")
endforeach() endforeach()
# Update library references to make the bundle portable # Update library references to make the bundle portable
include(DolphinPostprocessBundle) include(DolphinPostprocessBundle)
dolphin_postprocess_bundle(${DOLPHIN_EXE}) dolphin_postprocess_bundle(${DOLPHIN_EXE})
# Install bundle into systemwide /Applications directory. # Install bundle into systemwide /Applications directory.
install(TARGETS ${DOLPHIN_EXE} DESTINATION /Applications) install(TARGETS ${DOLPHIN_EXE} DESTINATION /Applications)
elseif(WIN32) elseif(WIN32)
set_target_properties(${DOLPHIN_EXE} PROPERTIES set_target_properties(${DOLPHIN_EXE} PROPERTIES
WIN32_EXECUTABLE ON WIN32_EXECUTABLE ON
) )
add_custom_command(TARGET ${DOLPHIN_EXE} add_custom_command(TARGET ${DOLPHIN_EXE}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Data/Sys $<TARGET_FILE_DIR:${DOLPHIN_EXE}>/Sys COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Data/Sys $<TARGET_FILE_DIR:${DOLPHIN_EXE}>/Sys
) )
else() else()
install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir})
endif() endif()
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE}) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})
endif() endif()
if(USE_X11 OR ENABLE_HEADLESS) if(USE_X11 OR ENABLE_HEADLESS)
set(DOLPHIN_NOGUI_EXE ${DOLPHIN_EXE_BASE}-nogui) set(DOLPHIN_NOGUI_EXE ${DOLPHIN_EXE_BASE}-nogui)
add_executable(${DOLPHIN_NOGUI_EXE} ${SRCS} ${NOGUI_SRCS}) add_executable(${DOLPHIN_NOGUI_EXE} ${SRCS} ${NOGUI_SRCS})
target_link_libraries(${DOLPHIN_NOGUI_EXE} ${LIBS}) target_link_libraries(${DOLPHIN_NOGUI_EXE} ${LIBS})
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_NOGUI_EXE}) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_NOGUI_EXE})
install(TARGETS ${DOLPHIN_NOGUI_EXE} RUNTIME DESTINATION ${bindir}) install(TARGETS ${DOLPHIN_NOGUI_EXE} RUNTIME DESTINATION ${bindir})
endif() endif()

View File

@ -1,54 +1,58 @@
set(SRCS InputConfig.cpp set(SRCS InputConfig.cpp
ControllerEmu/ControllerEmu.cpp ControllerEmu/ControllerEmu.cpp
ControllerEmu/Control/Control.cpp ControllerEmu/Control/Control.cpp
ControllerEmu/Control/Input.cpp ControllerEmu/Control/Input.cpp
ControllerEmu/Control/Output.cpp ControllerEmu/Control/Output.cpp
ControllerEmu/ControlGroup/AnalogStick.cpp ControllerEmu/ControlGroup/AnalogStick.cpp
ControllerEmu/ControlGroup/Buttons.cpp ControllerEmu/ControlGroup/Buttons.cpp
ControllerEmu/ControlGroup/ControlGroup.cpp ControllerEmu/ControlGroup/ControlGroup.cpp
ControllerEmu/ControlGroup/Cursor.cpp ControllerEmu/ControlGroup/Cursor.cpp
ControllerEmu/ControlGroup/Extension.cpp ControllerEmu/ControlGroup/Extension.cpp
ControllerEmu/ControlGroup/Force.cpp ControllerEmu/ControlGroup/Force.cpp
ControllerEmu/ControlGroup/MixedTriggers.cpp ControllerEmu/ControlGroup/MixedTriggers.cpp
ControllerEmu/ControlGroup/ModifySettingsButton.cpp ControllerEmu/ControlGroup/ModifySettingsButton.cpp
ControllerEmu/ControlGroup/Slider.cpp ControllerEmu/ControlGroup/Slider.cpp
ControllerEmu/ControlGroup/Tilt.cpp ControllerEmu/ControlGroup/Tilt.cpp
ControllerEmu/ControlGroup/Triggers.cpp ControllerEmu/ControlGroup/Triggers.cpp
ControllerInterface/ControllerInterface.cpp ControllerInterface/ControllerInterface.cpp
ControllerInterface/Device.cpp ControllerInterface/Device.cpp
ControlReference/ControlReference.cpp ControlReference/ControlReference.cpp
ControlReference/ExpressionParser.cpp ControlReference/ExpressionParser.cpp
) )
set(LIBS common) set(LIBS common)
if(WIN32) if(WIN32)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/DInput/DInput.cpp ControllerInterface/DInput/DInput.cpp
ControllerInterface/DInput/DInputJoystick.cpp ControllerInterface/DInput/DInputJoystick.cpp
ControllerInterface/DInput/DInputKeyboardMouse.cpp ControllerInterface/DInput/DInputKeyboardMouse.cpp
ControllerInterface/DInput/XInputFilter.cpp ControllerInterface/DInput/XInputFilter.cpp
ControllerInterface/XInput/XInput.cpp ControllerInterface/XInput/XInput.cpp
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
)
elseif(APPLE) elseif(APPLE)
find_library(COREFOUNDATION_LIBRARY CoreFoundation) find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(CARBON_LIBRARY Carbon) find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/OSX/OSX.mm ControllerInterface/OSX/OSX.mm
ControllerInterface/OSX/OSXKeyboard.mm ControllerInterface/OSX/OSXKeyboard.mm
ControllerInterface/OSX/OSXJoystick.mm ControllerInterface/OSX/OSXJoystick.mm
ControllerInterface/Quartz/Quartz.mm ControllerInterface/Quartz/Quartz.mm
ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
)
set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY}) set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY})
elseif(X11_FOUND) elseif(X11_FOUND)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/Xlib/XInput2.cpp) ControllerInterface/Xlib/XInput2.cpp
)
set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES}) set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES})
elseif(ANDROID) elseif(ANDROID)
add_definitions(-DCIFACE_USE_ANDROID) add_definitions(-DCIFACE_USE_ANDROID)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/Android/Android.cpp) ControllerInterface/Android/Android.cpp
)
endif() endif()
if(ANDROID) if(ANDROID)

View File

@ -1,7 +1,9 @@
set(SRCS CommandLineParse.cpp set(SRCS
Disassembler.cpp CommandLineParse.cpp
UICommon.cpp Disassembler.cpp
USBUtils.cpp) UICommon.cpp
USBUtils.cpp
)
set(LIBS common cpp-optparse) set(LIBS common cpp-optparse)
if(LIBUSB_FOUND) if(LIBUSB_FOUND)

View File

@ -1,13 +1,13 @@
set(SRCS set(SRCS
NullBackend.cpp NullBackend.cpp
Render.cpp Render.cpp
VertexManager.cpp VertexManager.cpp
ShaderCache.cpp ShaderCache.cpp
) )
set(LIBS set(LIBS
videocommon videocommon
common common
) )
add_dolphin_library(videonull "${SRCS}" "${LIBS}") add_dolphin_library(videonull "${SRCS}" "${LIBS}")

View File

@ -1,27 +1,29 @@
set(SRCS set(SRCS
BoundingBox.cpp BoundingBox.cpp
FramebufferManager.cpp FramebufferManager.cpp
main.cpp main.cpp
NativeVertexFormat.cpp NativeVertexFormat.cpp
PerfQuery.cpp PerfQuery.cpp
PostProcessing.cpp PostProcessing.cpp
ProgramShaderCache.cpp ProgramShaderCache.cpp
RasterFont.cpp RasterFont.cpp
Render.cpp Render.cpp
SamplerCache.cpp SamplerCache.cpp
StreamBuffer.cpp StreamBuffer.cpp
TextureCache.cpp TextureCache.cpp
TextureConverter.cpp TextureConverter.cpp
VertexManager.cpp) VertexManager.cpp
)
set(LIBS ${LIBS} set(LIBS ${LIBS}
videocommon videocommon
SOIL SOIL
common common
${X11_LIBRARIES}) ${X11_LIBRARIES}
)
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD") if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD")
set(LIBS ${LIBS} usbhid) set(LIBS ${LIBS} usbhid)
endif() endif()
add_dolphin_library(videoogl "${SRCS}" "${LIBS}") add_dolphin_library(videoogl "${SRCS}" "${LIBS}")

View File

@ -1,21 +1,25 @@
set(SRCS Clipper.cpp set(SRCS
DebugUtil.cpp Clipper.cpp
EfbCopy.cpp DebugUtil.cpp
EfbInterface.cpp EfbCopy.cpp
Rasterizer.cpp EfbInterface.cpp
SWOGLWindow.cpp Rasterizer.cpp
SWRenderer.cpp SWOGLWindow.cpp
SWVertexLoader.cpp SWRenderer.cpp
SWmain.cpp SWVertexLoader.cpp
SetupUnit.cpp SWmain.cpp
Tev.cpp SetupUnit.cpp
TextureEncoder.cpp Tev.cpp
TextureSampler.cpp TextureEncoder.cpp
TransformUnit.cpp) TextureSampler.cpp
TransformUnit.cpp
)
set(LIBS videocommon set(LIBS
SOIL videocommon
common SOIL
${X11_LIBRARIES}) common
${X11_LIBRARIES}
)
add_dolphin_library(videosoftware "${SRCS}" "${LIBS}") add_dolphin_library(videosoftware "${SRCS}" "${LIBS}")

View File

@ -1,31 +1,31 @@
set(SRCS set(SRCS
BoundingBox.cpp BoundingBox.cpp
CommandBufferManager.cpp CommandBufferManager.cpp
FramebufferManager.cpp FramebufferManager.cpp
ObjectCache.cpp ObjectCache.cpp
PerfQuery.cpp PerfQuery.cpp
RasterFont.cpp RasterFont.cpp
Renderer.cpp Renderer.cpp
ShaderCompiler.cpp ShaderCompiler.cpp
StateTracker.cpp StateTracker.cpp
StagingBuffer.cpp StagingBuffer.cpp
StagingTexture2D.cpp StagingTexture2D.cpp
StreamBuffer.cpp StreamBuffer.cpp
SwapChain.cpp SwapChain.cpp
Texture2D.cpp Texture2D.cpp
TextureCache.cpp TextureCache.cpp
TextureConverter.cpp TextureConverter.cpp
Util.cpp Util.cpp
VertexFormat.cpp VertexFormat.cpp
VertexManager.cpp VertexManager.cpp
VulkanContext.cpp VulkanContext.cpp
VulkanLoader.cpp VulkanLoader.cpp
main.cpp main.cpp
) )
set(LIBS set(LIBS
videocommon videocommon
common common
) )
# Only include the Vulkan headers when building the Vulkan backend # Only include the Vulkan headers when building the Vulkan backend

View File

@ -1,66 +1,72 @@
set(SRCS AsyncRequests.cpp set(SRCS
BoundingBox.cpp AsyncRequests.cpp
BPFunctions.cpp BoundingBox.cpp
BPMemory.cpp BPFunctions.cpp
BPStructs.cpp BPMemory.cpp
CPMemory.cpp BPStructs.cpp
CommandProcessor.cpp CPMemory.cpp
Debugger.cpp CommandProcessor.cpp
DriverDetails.cpp Debugger.cpp
Fifo.cpp DriverDetails.cpp
FPSCounter.cpp Fifo.cpp
FramebufferManagerBase.cpp FPSCounter.cpp
GeometryShaderGen.cpp FramebufferManagerBase.cpp
GeometryShaderManager.cpp GeometryShaderGen.cpp
HiresTextures.cpp GeometryShaderManager.cpp
ImageWrite.cpp HiresTextures.cpp
IndexGenerator.cpp ImageWrite.cpp
LightingShaderGen.cpp IndexGenerator.cpp
MainBase.cpp LightingShaderGen.cpp
OnScreenDisplay.cpp MainBase.cpp
OpcodeDecoding.cpp OnScreenDisplay.cpp
PerfQueryBase.cpp OpcodeDecoding.cpp
PixelEngine.cpp PerfQueryBase.cpp
PixelShaderGen.cpp PixelEngine.cpp
PixelShaderManager.cpp PixelShaderGen.cpp
PostProcessing.cpp PixelShaderManager.cpp
RenderBase.cpp PostProcessing.cpp
RenderState.cpp RenderBase.cpp
Statistics.cpp RenderState.cpp
TextureCacheBase.cpp Statistics.cpp
TextureConversionShader.cpp TextureCacheBase.cpp
TextureDecoder_Common.cpp TextureConversionShader.cpp
VertexLoader.cpp TextureDecoder_Common.cpp
VertexLoaderBase.cpp VertexLoader.cpp
VertexLoaderManager.cpp VertexLoaderBase.cpp
VertexLoader_Color.cpp VertexLoaderManager.cpp
VertexLoader_Normal.cpp VertexLoader_Color.cpp
VertexLoader_Position.cpp VertexLoader_Normal.cpp
VertexLoader_TextCoord.cpp VertexLoader_Position.cpp
VertexManagerBase.cpp VertexLoader_TextCoord.cpp
VertexShaderGen.cpp VertexManagerBase.cpp
VertexShaderManager.cpp VertexShaderGen.cpp
VideoBackendBase.cpp VertexShaderManager.cpp
VideoConfig.cpp VideoBackendBase.cpp
VideoState.cpp VideoConfig.cpp
XFMemory.cpp VideoState.cpp
XFStructs.cpp) XFMemory.cpp
set(LIBS core png) XFStructs.cpp
)
set(LIBS
core
png
)
if(_M_X86) if(_M_X86)
set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp) set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp)
elseif(_M_ARM_64) elseif(_M_ARM_64)
set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp) set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp)
else() else()
set(SRCS ${SRCS} TextureDecoder_Generic.cpp) set(SRCS ${SRCS} TextureDecoder_Generic.cpp)
endif() endif()
if(LIBAV_FOUND OR WIN32) if(LIBAV_FOUND OR WIN32)
set(SRCS ${SRCS} AVIDump.cpp) set(SRCS ${SRCS} AVIDump.cpp)
endif() endif()
add_dolphin_library(videocommon "${SRCS}" "${LIBS}") add_dolphin_library(videocommon "${SRCS}" "${LIBS}")
if(LIBAV_FOUND) if(LIBAV_FOUND)
target_link_libraries(videocommon PRIVATE ${LIBS} ${LIBAV_LIBRARIES}) target_link_libraries(videocommon PRIVATE ${LIBS} ${LIBAV_LIBRARIES})
endif() endif()

View File

@ -1,5 +1,5 @@
add_executable(dsptool DSPTool.cpp) add_executable(dsptool DSPTool.cpp)
target_link_libraries(dsptool core) target_link_libraries(dsptool core)
if(NOT APPLE) if(NOT APPLE)
install(TARGETS dsptool RUNTIME DESTINATION ${bindir}) install(TARGETS dsptool RUNTIME DESTINATION ${bindir})
endif() endif()

View File

@ -1,25 +1,25 @@
set(LIBS core gtest_main) set(LIBS core gtest_main)
if(APPLE) if(APPLE)
list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY}) list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY})
endif() endif()
if(ANDROID) if(ANDROID)
set(LIBS ${LIBS} android log) set(LIBS ${LIBS} android log)
endif() endif()
file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests) file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
macro(add_dolphin_test target srcs) macro(add_dolphin_test target srcs)
# Since this is a Core dependency, it can't be linked as a library and has # Since this is a Core dependency, it can't be linked as a library and has
# to be linked as an object file. Otherwise CMake inserts the library after # to be linked as an object file. Otherwise CMake inserts the library after
# core, but before other core dependencies like videocommon which also use # core, but before other core dependencies like videocommon which also use
# Host_ functions. # Host_ functions.
set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp) set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp)
add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2}) add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2})
set_target_properties(Test_${target} PROPERTIES set_target_properties(Test_${target} PROPERTIES
OUTPUT_NAME Tests/${target} OUTPUT_NAME Tests/${target}
FOLDER Tests FOLDER Tests
) )
target_link_libraries(Test_${target} ${LIBS}) target_link_libraries(Test_${target} ${LIBS})
add_dependencies(unittests Test_${target}) add_dependencies(unittests Test_${target})
add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target}) add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target})
endmacro() endmacro()
add_subdirectory(TestUtils) add_subdirectory(TestUtils)