diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-03-02 11:51:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 11:51:06 +0100 |
| commit | 7982ba120ffb2ca04006d040af33080ad5300404 (patch) | |
| tree | 4e67e179feedc96863381c2a48a200aedd9d784d /Source/Core | |
| parent | 521a777ade79e1f8d7c49f521c7cc060ef64b7e3 (diff) | |
| parent | ee61bd6f2e4db8df8e92be6f92c02b808aa92234 (diff) | |
Merge pull request #4995 from lioncash/normalize
CMakeLists: Normalize whitespace
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/Common/CMakeLists.txt | 172 | ||||
| -rw-r--r-- | Source/Core/Core/CMakeLists.txt | 608 | ||||
| -rw-r--r-- | Source/Core/DiscIO/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/CMakeLists.txt | 104 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/CMakeLists.txt | 355 | ||||
| -rw-r--r-- | Source/Core/InputCommon/CMakeLists.txt | 70 | ||||
| -rw-r--r-- | Source/Core/UICommon/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Null/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/CMakeLists.txt | 40 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/CMakeLists.txt | 48 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/CMakeLists.txt | 112 |
13 files changed, 824 insertions, 793 deletions
diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt index efc04e1f43..8c1ad903e9 100644 --- a/Source/Core/CMakeLists.txt +++ b/Source/Core/CMakeLists.txt @@ -9,5 +9,5 @@ add_subdirectory(VideoCommon) add_subdirectory(VideoBackends) if(ENABLE_QT2) - add_subdirectory(DolphinQt2) + add_subdirectory(DolphinQt2) endif() diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index fbb5961e2e..c894a297c3 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -1,117 +1,123 @@ -set(SRCS Analytics.cpp - CDUtils.cpp - ColorUtil.cpp - Config/Config.cpp - Config/Layer.cpp - Config/Section.cpp - ENetUtil.cpp - FileSearch.cpp - FileUtil.cpp - GekkoDisassembler.cpp - Hash.cpp - IniFile.cpp - JitRegister.cpp - MathUtil.cpp - MemArena.cpp - MemoryUtil.cpp - Misc.cpp - MsgHandler.cpp - NandPaths.cpp - Network.cpp - PcapFile.cpp - PerformanceCounter.cpp - Profiler.cpp - SettingsHandler.cpp - SDCardUtil.cpp - StringUtil.cpp - SymbolDB.cpp - SysConf.cpp - Thread.cpp - Timer.cpp - TraversalClient.cpp - Version.cpp - x64ABI.cpp - x64Emitter.cpp - MD5.cpp - Crypto/AES.cpp - Crypto/bn.cpp - Crypto/ec.cpp - Logging/LogManager.cpp) +set(SRCS + Analytics.cpp + CDUtils.cpp + ColorUtil.cpp + Config/Config.cpp + Config/Layer.cpp + Config/Section.cpp + ENetUtil.cpp + FileSearch.cpp + FileUtil.cpp + GekkoDisassembler.cpp + Hash.cpp + IniFile.cpp + JitRegister.cpp + MathUtil.cpp + MemArena.cpp + MemoryUtil.cpp + Misc.cpp + MsgHandler.cpp + NandPaths.cpp + Network.cpp + PcapFile.cpp + PerformanceCounter.cpp + Profiler.cpp + SettingsHandler.cpp + SDCardUtil.cpp + StringUtil.cpp + SymbolDB.cpp + SysConf.cpp + Thread.cpp + Timer.cpp + TraversalClient.cpp + Version.cpp + x64ABI.cpp + x64Emitter.cpp + MD5.cpp + Crypto/AES.cpp + Crypto/bn.cpp + Crypto/ec.cpp + Logging/LogManager.cpp +) if(LIBUSB_FOUND) - set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) - set(SRCS ${SRCS} LibusbContext.cpp) + set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) + set(SRCS ${SRCS} LibusbContext.cpp) endif(LIBUSB_FOUND) if(ANDROID) - set(SRCS ${SRCS} - Logging/ConsoleListenerDroid.cpp) + set(SRCS ${SRCS} + Logging/ConsoleListenerDroid.cpp) elseif(WIN32) - set(SRCS ${SRCS} - Logging/ConsoleListenerWin.cpp) + set(SRCS ${SRCS} + Logging/ConsoleListenerWin.cpp) else() - set(SRCS ${SRCS} - Logging/ConsoleListenerNix.cpp) + set(SRCS ${SRCS} + Logging/ConsoleListenerNix.cpp) endif() list(APPEND LIBS enet ${CURL_LIBRARIES}) if(_M_ARM_64) - set(SRCS ${SRCS} - Arm64Emitter.cpp - ArmCPUDetect.cpp - GenericFPURoundMode.cpp) + set(SRCS ${SRCS} + Arm64Emitter.cpp + ArmCPUDetect.cpp + GenericFPURoundMode.cpp + ) else() - if(_M_X86) #X86 - set(SRCS ${SRCS} - x64FPURoundMode.cpp - x64CPUDetect.cpp) - else() # Generic - set(SRCS ${SRCS} - GenericFPURoundMode.cpp - GenericCPUDetect.cpp) - endif() + if(_M_X86) #X86 + set(SRCS ${SRCS} + x64FPURoundMode.cpp + x64CPUDetect.cpp + ) + else() # Generic + set(SRCS ${SRCS} + GenericFPURoundMode.cpp + GenericCPUDetect.cpp + ) + endif() endif() list(APPEND LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES}) # OpenGL Interface set(SRCS ${SRCS} - GL/GLUtil.cpp - GL/GLExtensions/GLExtensions.cpp - GL/GLInterface/GLInterface.cpp) + GL/GLUtil.cpp + GL/GLExtensions/GLExtensions.cpp + GL/GLInterface/GLInterface.cpp +) if(USE_EGL) - set(SRCS ${SRCS} GL/GLInterface/EGL.cpp) - if(ANDROID) - set(SRCS ${SRCS} GL/GLInterface/EGLAndroid.cpp) - elseif(USE_X11) - set(SRCS ${SRCS} GL/GLInterface/EGLX11.cpp) - endif() - set(LIBS ${LIBS} EGL) + set(SRCS ${SRCS} GL/GLInterface/EGL.cpp) + if(ANDROID) + set(SRCS ${SRCS} GL/GLInterface/EGLAndroid.cpp) + elseif(USE_X11) + set(SRCS ${SRCS} GL/GLInterface/EGLX11.cpp) + endif() + set(LIBS ${LIBS} EGL) endif() if(WIN32) - set(SRCS ${SRCS} GL/GLInterface/WGL.cpp) + set(SRCS ${SRCS} GL/GLInterface/WGL.cpp) elseif(APPLE) - set(SRCS ${SRCS} GL/GLInterface/AGL.mm) + set(SRCS ${SRCS} GL/GLInterface/AGL.mm) elseif(USE_X11) - if (NOT USE_EGL) - set(SRCS ${SRCS} GL/GLInterface/GLX.cpp) - # GLX has a hard dependency on libGL. - # Make sure to link to it if using GLX. - set(LIBS ${LIBS} ${OPENGL_LIBRARIES}) - endif() - set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp) - set(LIBS ${LIBS} ${XRANDR_LIBRARIES}) + if (NOT USE_EGL) + set(SRCS ${SRCS} GL/GLInterface/GLX.cpp) + # GLX has a hard dependency on libGL. + # Make sure to link to it if using GLX. + set(LIBS ${LIBS} ${OPENGL_LIBRARIES}) + endif() + set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp) + set(LIBS ${LIBS} ${XRANDR_LIBRARIES}) endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(LIBS ${LIBS} dl) + set(LIBS ${LIBS} dl) endif() add_dolphin_library(common "${SRCS}" "${LIBS}") if(UNIX) - # Posix networking code needs to be fixed for Windows - add_executable(traversal_server TraversalServer.cpp) + # Posix networking code needs to be fixed for Windows + add_executable(traversal_server TraversalServer.cpp) endif() diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 72019ec25c..fad4464f90 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -1,343 +1,347 @@ -set(SRCS ActionReplay.cpp - Analytics.cpp - ARDecrypt.cpp - BootManager.cpp - ConfigManager.cpp - Core.cpp - CoreTiming.cpp - DSPEmulator.cpp - ec_wii.cpp - GeckoCodeConfig.cpp - GeckoCode.cpp - HotkeyManager.cpp - MemTools.cpp - Movie.cpp - NetPlayClient.cpp - NetPlayServer.cpp - PatchEngine.cpp - State.cpp - WiiRoot.cpp - Boot/Boot_BS2Emu.cpp - Boot/Boot.cpp - Boot/Boot_DOL.cpp - Boot/Boot_ELF.cpp - Boot/Boot_WiiWAD.cpp - Boot/ElfReader.cpp - Debugger/Debugger_SymbolMap.cpp - Debugger/Dump.cpp - Debugger/PPCDebugInterface.cpp - DSP/DSPAssembler.cpp - DSP/DSPDisassembler.cpp - DSP/DSPAccelerator.cpp - DSP/DSPCaptureLogger.cpp - DSP/DSPHWInterface.cpp - DSP/DSPMemoryMap.cpp - DSP/DSPStacks.cpp - DSP/DSPAnalyzer.cpp - DSP/DSPCodeUtil.cpp - DSP/LabelMap.cpp - DSP/DSPCore.cpp - DSP/DSPTables.cpp - DSP/Interpreter/DSPIntArithmetic.cpp - DSP/Interpreter/DSPIntBranch.cpp - DSP/Interpreter/DSPIntCCUtil.cpp - DSP/Interpreter/DSPInterpreter.cpp - DSP/Interpreter/DSPIntExtOps.cpp - DSP/Interpreter/DSPIntLoadStore.cpp - DSP/Interpreter/DSPIntMisc.cpp - DSP/Interpreter/DSPIntMultiplier.cpp - DSP/Jit/DSPEmitter.cpp - DSP/Jit/DSPJitRegCache.cpp - DSP/Jit/DSPJitExtOps.cpp - DSP/Jit/DSPJitBranch.cpp - DSP/Jit/DSPJitCCUtil.cpp - DSP/Jit/DSPJitArithmetic.cpp - DSP/Jit/DSPJitLoadStore.cpp - DSP/Jit/DSPJitMultiplier.cpp - DSP/Jit/DSPJitUtil.cpp - DSP/Jit/DSPJitMisc.cpp - FifoPlayer/FifoAnalyzer.cpp - FifoPlayer/FifoDataFile.cpp - FifoPlayer/FifoPlaybackAnalyzer.cpp - FifoPlayer/FifoPlayer.cpp - FifoPlayer/FifoRecordAnalyzer.cpp - FifoPlayer/FifoRecorder.cpp - HLE/HLE.cpp - HLE/HLE_Misc.cpp - HLE/HLE_OS.cpp - HW/AudioInterface.cpp - HW/CPU.cpp - HW/DSP.cpp - HW/DSPHLE/UCodes/AX.cpp - HW/DSPHLE/UCodes/AXWii.cpp - HW/DSPHLE/UCodes/CARD.cpp - HW/DSPHLE/UCodes/GBA.cpp - HW/DSPHLE/UCodes/INIT.cpp - HW/DSPHLE/UCodes/ROM.cpp - HW/DSPHLE/UCodes/UCodes.cpp - HW/DSPHLE/UCodes/Zelda.cpp - HW/DSPHLE/MailHandler.cpp - HW/DSPHLE/DSPHLE.cpp - HW/DSPLLE/DSPDebugInterface.cpp - HW/DSPLLE/DSPHost.cpp - HW/DSPLLE/DSPSymbols.cpp - HW/DSPLLE/DSPLLEGlobals.cpp - HW/DSPLLE/DSPLLE.cpp - HW/DSPLLE/DSPLLETools.cpp - HW/DVDInterface.cpp - HW/DVDThread.cpp - HW/EXI/EXI_Channel.cpp - HW/EXI/EXI.cpp - HW/EXI/EXI_Device.cpp - HW/EXI/EXI_DeviceAD16.cpp - HW/EXI/EXI_DeviceAGP.cpp - HW/EXI/EXI_DeviceDummy.cpp - HW/EXI/EXI_DeviceEthernet.cpp - HW/EXI/EXI_DeviceGecko.cpp - HW/EXI/EXI_DeviceIPL.cpp - HW/EXI/EXI_DeviceMemoryCard.cpp - HW/EXI/EXI_DeviceMic.cpp - HW/GCKeyboard.cpp - HW/GCKeyboardEmu.cpp - HW/GCMemcard.cpp - HW/GCMemcardDirectory.cpp - HW/GCMemcardRaw.cpp - HW/GCPad.cpp - HW/GCPadEmu.cpp - HW/GPFifo.cpp - HW/HW.cpp - HW/Memmap.cpp - HW/MemoryInterface.cpp - HW/MMIO.cpp - HW/ProcessorInterface.cpp - HW/SI/SI.cpp - HW/SI/SI_Device.cpp - HW/SI/SI_DeviceDanceMat.cpp - HW/SI/SI_DeviceGBA.cpp - HW/SI/SI_DeviceGCAdapter.cpp - HW/SI/SI_DeviceGCController.cpp - HW/SI/SI_DeviceGCSteeringWheel.cpp - HW/SI/SI_DeviceKeyboard.cpp - HW/SI/SI_DeviceNull.cpp - HW/Sram.cpp - HW/StreamADPCM.cpp - HW/SystemTimers.cpp - HW/VideoInterface.cpp - HW/WII_IPC.cpp - HW/Wiimote.cpp - HW/WiimoteEmu/WiimoteEmu.cpp - HW/WiimoteEmu/Attachment/Classic.cpp - HW/WiimoteEmu/Attachment/Attachment.cpp - HW/WiimoteEmu/Attachment/Nunchuk.cpp - HW/WiimoteEmu/Attachment/Drums.cpp - HW/WiimoteEmu/Attachment/Guitar.cpp - HW/WiimoteEmu/Attachment/Turntable.cpp - HW/WiimoteEmu/EmuSubroutines.cpp - HW/WiimoteEmu/Encryption.cpp - HW/WiimoteEmu/Speaker.cpp - HW/WiimoteReal/WiimoteReal.cpp - HW/WiiSaveCrypted.cpp - IOS/Device.cpp - IOS/DeviceStub.cpp - IOS/IPC.cpp - IOS/MIOS.cpp - IOS/DI/DI.cpp - IOS/ES/ES.cpp - IOS/ES/Formats.cpp - IOS/FS/FileIO.cpp - IOS/FS/FS.cpp - IOS/Network/ICMPLin.cpp - IOS/Network/MACUtils.cpp - IOS/Network/Socket.cpp - IOS/Network/SSL.cpp - IOS/Network/IP/Top.cpp - IOS/Network/KD/NetKDRequest.cpp - IOS/Network/KD/NetKDTime.cpp - IOS/Network/KD/NWC24Config.cpp - IOS/Network/NCD/Config.cpp - IOS/Network/NCD/Manage.cpp - IOS/Network/WD/Command.cpp - IOS/SDIO/SDIOSlot0.cpp - IOS/STM/STM.cpp - IOS/USB/Common.cpp - IOS/USB/Host.cpp - IOS/USB/OH0/OH0.cpp - IOS/USB/OH0/OH0Device.cpp - IOS/USB/USB_HID/HIDv4.cpp - IOS/USB/USB_VEN/VEN.cpp - IOS/USB/USBV0.cpp - IOS/USB/USBV4.cpp - IOS/USB/USBV5.cpp - IOS/USB/USB_KBD.cpp - IOS/USB/Bluetooth/BTBase.cpp - IOS/USB/Bluetooth/BTEmu.cpp - IOS/USB/Bluetooth/BTStub.cpp - IOS/USB/Bluetooth/WiimoteDevice.cpp - IOS/USB/Bluetooth/WiimoteHIDAttr.cpp - IOS/WFS/WFSSRV.cpp - IOS/WFS/WFSI.cpp - PowerPC/BreakPoints.cpp - PowerPC/MMU.cpp - PowerPC/PowerPC.cpp - PowerPC/PPCAnalyst.cpp - PowerPC/PPCCache.cpp - PowerPC/PPCSymbolDB.cpp - PowerPC/PPCTables.cpp - PowerPC/Profiler.cpp - PowerPC/SignatureDB/CSVSignatureDB.cpp - PowerPC/SignatureDB/DSYSignatureDB.cpp - PowerPC/SignatureDB/SignatureDB.cpp - PowerPC/JitInterface.cpp - PowerPC/CachedInterpreter/CachedInterpreter.cpp - PowerPC/CachedInterpreter/InterpreterBlockCache.cpp - PowerPC/Interpreter/Interpreter_Branch.cpp - PowerPC/Interpreter/Interpreter.cpp - PowerPC/Interpreter/Interpreter_FloatingPoint.cpp - PowerPC/Interpreter/Interpreter_Integer.cpp - PowerPC/Interpreter/Interpreter_LoadStore.cpp - PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp - PowerPC/Interpreter/Interpreter_Paired.cpp - PowerPC/Interpreter/Interpreter_SystemRegisters.cpp - PowerPC/Interpreter/Interpreter_Tables.cpp - PowerPC/JitCommon/JitAsmCommon.cpp - PowerPC/JitCommon/JitBase.cpp - PowerPC/JitCommon/JitCache.cpp - PowerPC/JitILCommon/IR.cpp - PowerPC/JitILCommon/JitILBase_Branch.cpp - PowerPC/JitILCommon/JitILBase_LoadStore.cpp - PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp - PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp - PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp - PowerPC/JitILCommon/JitILBase_Paired.cpp - PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp - PowerPC/JitILCommon/JitILBase_Integer.cpp - ) +set(SRCS + ActionReplay.cpp + Analytics.cpp + ARDecrypt.cpp + BootManager.cpp + ConfigManager.cpp + Core.cpp + CoreTiming.cpp + DSPEmulator.cpp + ec_wii.cpp + GeckoCodeConfig.cpp + GeckoCode.cpp + HotkeyManager.cpp + MemTools.cpp + Movie.cpp + NetPlayClient.cpp + NetPlayServer.cpp + PatchEngine.cpp + State.cpp + WiiRoot.cpp + Boot/Boot_BS2Emu.cpp + Boot/Boot.cpp + Boot/Boot_DOL.cpp + Boot/Boot_ELF.cpp + Boot/Boot_WiiWAD.cpp + Boot/ElfReader.cpp + Debugger/Debugger_SymbolMap.cpp + Debugger/Dump.cpp + Debugger/PPCDebugInterface.cpp + DSP/DSPAssembler.cpp + DSP/DSPDisassembler.cpp + DSP/DSPAccelerator.cpp + DSP/DSPCaptureLogger.cpp + DSP/DSPHWInterface.cpp + DSP/DSPMemoryMap.cpp + DSP/DSPStacks.cpp + DSP/DSPAnalyzer.cpp + DSP/DSPCodeUtil.cpp + DSP/LabelMap.cpp + DSP/DSPCore.cpp + DSP/DSPTables.cpp + DSP/Interpreter/DSPIntArithmetic.cpp + DSP/Interpreter/DSPIntBranch.cpp + DSP/Interpreter/DSPIntCCUtil.cpp + DSP/Interpreter/DSPInterpreter.cpp + DSP/Interpreter/DSPIntExtOps.cpp + DSP/Interpreter/DSPIntLoadStore.cpp + DSP/Interpreter/DSPIntMisc.cpp + DSP/Interpreter/DSPIntMultiplier.cpp + DSP/Jit/DSPEmitter.cpp + DSP/Jit/DSPJitRegCache.cpp + DSP/Jit/DSPJitExtOps.cpp + DSP/Jit/DSPJitBranch.cpp + DSP/Jit/DSPJitCCUtil.cpp + DSP/Jit/DSPJitArithmetic.cpp + DSP/Jit/DSPJitLoadStore.cpp + DSP/Jit/DSPJitMultiplier.cpp + DSP/Jit/DSPJitUtil.cpp + DSP/Jit/DSPJitMisc.cpp + FifoPlayer/FifoAnalyzer.cpp + FifoPlayer/FifoDataFile.cpp + FifoPlayer/FifoPlaybackAnalyzer.cpp + FifoPlayer/FifoPlayer.cpp + FifoPlayer/FifoRecordAnalyzer.cpp + FifoPlayer/FifoRecorder.cpp + HLE/HLE.cpp + HLE/HLE_Misc.cpp + HLE/HLE_OS.cpp + HW/AudioInterface.cpp + HW/CPU.cpp + HW/DSP.cpp + HW/DSPHLE/UCodes/AX.cpp + HW/DSPHLE/UCodes/AXWii.cpp + HW/DSPHLE/UCodes/CARD.cpp + HW/DSPHLE/UCodes/GBA.cpp + HW/DSPHLE/UCodes/INIT.cpp + HW/DSPHLE/UCodes/ROM.cpp + HW/DSPHLE/UCodes/UCodes.cpp + HW/DSPHLE/UCodes/Zelda.cpp + HW/DSPHLE/MailHandler.cpp + HW/DSPHLE/DSPHLE.cpp + HW/DSPLLE/DSPDebugInterface.cpp + HW/DSPLLE/DSPHost.cpp + HW/DSPLLE/DSPSymbols.cpp + HW/DSPLLE/DSPLLEGlobals.cpp + HW/DSPLLE/DSPLLE.cpp + HW/DSPLLE/DSPLLETools.cpp + HW/DVDInterface.cpp + HW/DVDThread.cpp + HW/EXI/EXI_Channel.cpp + HW/EXI/EXI.cpp + HW/EXI/EXI_Device.cpp + HW/EXI/EXI_DeviceAD16.cpp + HW/EXI/EXI_DeviceAGP.cpp + HW/EXI/EXI_DeviceDummy.cpp + HW/EXI/EXI_DeviceEthernet.cpp + HW/EXI/EXI_DeviceGecko.cpp + HW/EXI/EXI_DeviceIPL.cpp + HW/EXI/EXI_DeviceMemoryCard.cpp + HW/EXI/EXI_DeviceMic.cpp + HW/GCKeyboard.cpp + HW/GCKeyboardEmu.cpp + HW/GCMemcard.cpp + HW/GCMemcardDirectory.cpp + HW/GCMemcardRaw.cpp + HW/GCPad.cpp + HW/GCPadEmu.cpp + HW/GPFifo.cpp + HW/HW.cpp + HW/Memmap.cpp + HW/MemoryInterface.cpp + HW/MMIO.cpp + HW/ProcessorInterface.cpp + HW/SI/SI.cpp + HW/SI/SI_Device.cpp + HW/SI/SI_DeviceDanceMat.cpp + HW/SI/SI_DeviceGBA.cpp + HW/SI/SI_DeviceGCAdapter.cpp + HW/SI/SI_DeviceGCController.cpp + HW/SI/SI_DeviceGCSteeringWheel.cpp + HW/SI/SI_DeviceKeyboard.cpp + HW/SI/SI_DeviceNull.cpp + HW/Sram.cpp + HW/StreamADPCM.cpp + HW/SystemTimers.cpp + HW/VideoInterface.cpp + HW/WII_IPC.cpp + HW/Wiimote.cpp + HW/WiimoteEmu/WiimoteEmu.cpp + HW/WiimoteEmu/Attachment/Classic.cpp + HW/WiimoteEmu/Attachment/Attachment.cpp + HW/WiimoteEmu/Attachment/Nunchuk.cpp + HW/WiimoteEmu/Attachment/Drums.cpp + HW/WiimoteEmu/Attachment/Guitar.cpp + HW/WiimoteEmu/Attachment/Turntable.cpp + HW/WiimoteEmu/EmuSubroutines.cpp + HW/WiimoteEmu/Encryption.cpp + HW/WiimoteEmu/Speaker.cpp + HW/WiimoteReal/WiimoteReal.cpp + HW/WiiSaveCrypted.cpp + IOS/Device.cpp + IOS/DeviceStub.cpp + IOS/IPC.cpp + IOS/MIOS.cpp + IOS/DI/DI.cpp + IOS/ES/ES.cpp + IOS/ES/Formats.cpp + IOS/FS/FileIO.cpp + IOS/FS/FS.cpp + IOS/Network/ICMPLin.cpp + IOS/Network/MACUtils.cpp + IOS/Network/Socket.cpp + IOS/Network/SSL.cpp + IOS/Network/IP/Top.cpp + IOS/Network/KD/NetKDRequest.cpp + IOS/Network/KD/NetKDTime.cpp + IOS/Network/KD/NWC24Config.cpp + IOS/Network/NCD/Config.cpp + IOS/Network/NCD/Manage.cpp + IOS/Network/WD/Command.cpp + IOS/SDIO/SDIOSlot0.cpp + IOS/STM/STM.cpp + IOS/USB/Common.cpp + IOS/USB/Host.cpp + IOS/USB/OH0/OH0.cpp + IOS/USB/OH0/OH0Device.cpp + IOS/USB/USB_HID/HIDv4.cpp + IOS/USB/USB_VEN/VEN.cpp + IOS/USB/USBV0.cpp + IOS/USB/USBV4.cpp + IOS/USB/USBV5.cpp + IOS/USB/USB_KBD.cpp + IOS/USB/Bluetooth/BTBase.cpp + IOS/USB/Bluetooth/BTEmu.cpp + IOS/USB/Bluetooth/BTStub.cpp + IOS/USB/Bluetooth/WiimoteDevice.cpp + IOS/USB/Bluetooth/WiimoteHIDAttr.cpp + IOS/WFS/WFSSRV.cpp + IOS/WFS/WFSI.cpp + PowerPC/BreakPoints.cpp + PowerPC/MMU.cpp + PowerPC/PowerPC.cpp + PowerPC/PPCAnalyst.cpp + PowerPC/PPCCache.cpp + PowerPC/PPCSymbolDB.cpp + PowerPC/PPCTables.cpp + PowerPC/Profiler.cpp + PowerPC/SignatureDB/CSVSignatureDB.cpp + PowerPC/SignatureDB/DSYSignatureDB.cpp + PowerPC/SignatureDB/SignatureDB.cpp + PowerPC/JitInterface.cpp + PowerPC/CachedInterpreter/CachedInterpreter.cpp + PowerPC/CachedInterpreter/InterpreterBlockCache.cpp + PowerPC/Interpreter/Interpreter_Branch.cpp + PowerPC/Interpreter/Interpreter.cpp + PowerPC/Interpreter/Interpreter_FloatingPoint.cpp + PowerPC/Interpreter/Interpreter_Integer.cpp + PowerPC/Interpreter/Interpreter_LoadStore.cpp + PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp + PowerPC/Interpreter/Interpreter_Paired.cpp + PowerPC/Interpreter/Interpreter_SystemRegisters.cpp + PowerPC/Interpreter/Interpreter_Tables.cpp + PowerPC/JitCommon/JitAsmCommon.cpp + PowerPC/JitCommon/JitBase.cpp + PowerPC/JitCommon/JitCache.cpp + PowerPC/JitILCommon/IR.cpp + PowerPC/JitILCommon/JitILBase_Branch.cpp + PowerPC/JitILCommon/JitILBase_LoadStore.cpp + PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp + PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp + PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp + PowerPC/JitILCommon/JitILBase_Paired.cpp + PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp + PowerPC/JitILCommon/JitILBase_Integer.cpp +) if(_M_X86) - set(SRCS ${SRCS} - PowerPC/Jit64IL/IR_X86.cpp - PowerPC/Jit64IL/JitIL.cpp - PowerPC/Jit64IL/JitIL_Tables.cpp - PowerPC/Jit64/FPURegCache.cpp - PowerPC/Jit64/GPRRegCache.cpp - PowerPC/Jit64/Jit64_Tables.cpp - PowerPC/Jit64/JitAsm.cpp - PowerPC/Jit64/Jit_Branch.cpp - PowerPC/Jit64/Jit.cpp - PowerPC/Jit64/Jit_FloatingPoint.cpp - PowerPC/Jit64/Jit_Integer.cpp - PowerPC/Jit64/Jit_LoadStore.cpp - PowerPC/Jit64/Jit_LoadStoreFloating.cpp - PowerPC/Jit64/Jit_LoadStorePaired.cpp - PowerPC/Jit64/Jit_Paired.cpp - PowerPC/Jit64/JitRegCache.cpp - PowerPC/Jit64/Jit_SystemRegisters.cpp - PowerPC/Jit64Common/BlockCache.cpp - PowerPC/Jit64Common/EmuCodeBlock.cpp - PowerPC/Jit64Common/FarCodeCache.cpp - PowerPC/Jit64Common/Jit64AsmCommon.cpp - PowerPC/Jit64Common/Jit64Base.cpp - PowerPC/Jit64Common/TrampolineCache.cpp) + set(SRCS ${SRCS} + PowerPC/Jit64IL/IR_X86.cpp + PowerPC/Jit64IL/JitIL.cpp + PowerPC/Jit64IL/JitIL_Tables.cpp + PowerPC/Jit64/FPURegCache.cpp + PowerPC/Jit64/GPRRegCache.cpp + PowerPC/Jit64/Jit64_Tables.cpp + PowerPC/Jit64/JitAsm.cpp + PowerPC/Jit64/Jit_Branch.cpp + PowerPC/Jit64/Jit.cpp + PowerPC/Jit64/Jit_FloatingPoint.cpp + PowerPC/Jit64/Jit_Integer.cpp + PowerPC/Jit64/Jit_LoadStore.cpp + PowerPC/Jit64/Jit_LoadStoreFloating.cpp + PowerPC/Jit64/Jit_LoadStorePaired.cpp + PowerPC/Jit64/Jit_Paired.cpp + PowerPC/Jit64/JitRegCache.cpp + PowerPC/Jit64/Jit_SystemRegisters.cpp + PowerPC/Jit64Common/BlockCache.cpp + PowerPC/Jit64Common/EmuCodeBlock.cpp + PowerPC/Jit64Common/FarCodeCache.cpp + PowerPC/Jit64Common/Jit64AsmCommon.cpp + PowerPC/Jit64Common/Jit64Base.cpp + PowerPC/Jit64Common/TrampolineCache.cpp + ) elseif(_M_ARM_64) - set(SRCS ${SRCS} - PowerPC/JitArm64/Jit.cpp - PowerPC/JitArm64/JitAsm.cpp - PowerPC/JitArm64/JitArm64Cache.cpp - PowerPC/JitArm64/JitArm64_RegCache.cpp - PowerPC/JitArm64/JitArm64_BackPatch.cpp - PowerPC/JitArm64/JitArm64_Branch.cpp - PowerPC/JitArm64/JitArm64_FloatingPoint.cpp - PowerPC/JitArm64/JitArm64_Integer.cpp - PowerPC/JitArm64/JitArm64_LoadStore.cpp - PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp - PowerPC/JitArm64/JitArm64_Paired.cpp - PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp - PowerPC/JitArm64/JitArm64_SystemRegisters.cpp - PowerPC/JitArm64/Jit_Util.cpp - PowerPC/JitArm64/JitArm64_Tables.cpp) + set(SRCS ${SRCS} + PowerPC/JitArm64/Jit.cpp + PowerPC/JitArm64/JitAsm.cpp + PowerPC/JitArm64/JitArm64Cache.cpp + PowerPC/JitArm64/JitArm64_RegCache.cpp + PowerPC/JitArm64/JitArm64_BackPatch.cpp + PowerPC/JitArm64/JitArm64_Branch.cpp + PowerPC/JitArm64/JitArm64_FloatingPoint.cpp + PowerPC/JitArm64/JitArm64_Integer.cpp + PowerPC/JitArm64/JitArm64_LoadStore.cpp + PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp + PowerPC/JitArm64/JitArm64_Paired.cpp + PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp + PowerPC/JitArm64/JitArm64_SystemRegisters.cpp + PowerPC/JitArm64/Jit_Util.cpp + PowerPC/JitArm64/JitArm64_Tables.cpp + ) endif() set(LIBS - audiocommon - bdisasm - common - discio - enet - inputcommon - ${LZO} - sfml-network - sfml-system - videonull - videoogl - videosoftware - z - ) + audiocommon + bdisasm + common + discio + enet + inputcommon + ${LZO} + sfml-network + sfml-system + videonull + videoogl + videosoftware + z +) if(LIBUSB_FOUND) - # Using shared LibUSB - set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) - set(SRCS ${SRCS} IOS/USB/LibusbDevice.cpp - IOS/USB/Bluetooth/BTReal.cpp) + # Using shared LibUSB + set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) + set(SRCS ${SRCS} + IOS/USB/LibusbDevice.cpp + IOS/USB/Bluetooth/BTReal.cpp + ) endif() if(NOT APPLE) - set(LIBS ${LIBS} videovulkan) + set(LIBS ${LIBS} videovulkan) endif() set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES}) if(WIN32) - set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp) - list(APPEND LIBS - videod3d - videod3d12 - setupapi.lib - iphlpapi.lib - ) + set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp) + list(APPEND LIBS + videod3d + videod3d12 + setupapi.lib + iphlpapi.lib + ) elseif(APPLE) - set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm) - set(LIBS ${LIBS} - ${IOB_LIBRARY}) + set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm) + set(LIBS ${LIBS} ${IOB_LIBRARY}) elseif(UNIX) - set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Unix.cpp) - if(ANDROID) - set(SRCS ${SRCS} HW/WiimoteReal/IOAndroid.cpp) - endif() + set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Unix.cpp) + if(ANDROID) + set(SRCS ${SRCS} HW/WiimoteReal/IOAndroid.cpp) + endif() endif() # 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") - find_package(BlueZ) - if(BLUEZ_FOUND) - message(STATUS "BlueZ found, enabling bluetooth support") - set(SRCS ${SRCS} HW/WiimoteReal/IOLinux.cpp) - set(LIBS ${LIBS} BlueZ::BlueZ) - add_definitions(-DHAVE_BLUEZ=1) - else() - message(STATUS "BlueZ NOT found, disabling bluetooth support") - endif() + find_package(BlueZ) + if(BLUEZ_FOUND) + message(STATUS "BlueZ found, enabling bluetooth support") + set(SRCS ${SRCS} HW/WiimoteReal/IOLinux.cpp) + set(LIBS ${LIBS} BlueZ::BlueZ) + add_definitions(-DHAVE_BLUEZ=1) + else() + message(STATUS "BlueZ NOT found, disabling bluetooth support") + endif() else() - message(STATUS "BlueZ explicitly disabled, disabling bluetooth support") + message(STATUS "BlueZ explicitly disabled, disabling bluetooth support") endif() if(HIDAPI_FOUND) - set(SRCS ${SRCS} HW/WiimoteReal/IOhidapi.cpp) + set(SRCS ${SRCS} HW/WiimoteReal/IOhidapi.cpp) endif() if(PORTAUDIO_FOUND) - set(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES}) + set(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES}) endif() if(OPROFILE_FOUND) - set(LIBS ${LIBS} ${OPROFILE_LIBRARIES}) + set(LIBS ${LIBS} ${OPROFILE_LIBRARIES}) endif() if(GDBSTUB) - set(SRCS ${SRCS} PowerPC/GDBStub.cpp) + set(SRCS ${SRCS} PowerPC/GDBStub.cpp) endif() if(UNIX) - set(SRCS ${SRCS} MemoryWatcher.cpp) + set(SRCS ${SRCS} MemoryWatcher.cpp) endif() add_dolphin_library(core "${SRCS}" "${LIBS}") diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt index e7c88c6af0..ae15f3bd6a 100644 --- a/Source/Core/DiscIO/CMakeLists.txt +++ b/Source/Core/DiscIO/CMakeLists.txt @@ -1,22 +1,24 @@ -set(SRCS Blob.cpp - CISOBlob.cpp - WbfsBlob.cpp - CompressedBlob.cpp - DiscScrubber.cpp - DriveBlob.cpp - Enums.cpp - FileBlob.cpp - FileMonitor.cpp - FileSystemGCWii.cpp - Filesystem.cpp - NANDContentLoader.cpp - TGCBlob.cpp - Volume.cpp - VolumeCreator.cpp - VolumeDirectory.cpp - VolumeGC.cpp - VolumeWad.cpp - VolumeWiiCrypted.cpp - WiiWad.cpp) +set(SRCS + Blob.cpp + CISOBlob.cpp + WbfsBlob.cpp + CompressedBlob.cpp + DiscScrubber.cpp + DriveBlob.cpp + Enums.cpp + FileBlob.cpp + FileMonitor.cpp + FileSystemGCWii.cpp + Filesystem.cpp + NANDContentLoader.cpp + TGCBlob.cpp + Volume.cpp + VolumeCreator.cpp + VolumeDirectory.cpp + VolumeGC.cpp + VolumeWad.cpp + VolumeWiiCrypted.cpp + WiiWad.cpp +) add_dolphin_library(discio "${SRCS}" "") diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt index ce59f8b243..fb1ee4b824 100644 --- a/Source/Core/DolphinQt2/CMakeLists.txt +++ b/Source/Core/DolphinQt2/CMakeLists.txt @@ -7,33 +7,33 @@ add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ set(CMAKE_AUTOMOC ON) set(SRCS - AboutDialog.cpp - Host.cpp - InDevelopmentWarning.cpp - Main.cpp - MainWindow.cpp - MenuBar.cpp - RenderWidget.cpp - Resources.cpp - Settings.cpp - ToolBar.cpp - Config/FilesystemWidget.cpp - Config/InfoWidget.cpp - Config/PathDialog.cpp - Config/PropertiesDialog.cpp - Config/SettingsWindow.cpp - GameList/GameFile.cpp - GameList/GameList.cpp - GameList/GameListModel.cpp - GameList/GameTracker.cpp - GameList/ListProxyModel.cpp - GameList/TableDelegate.cpp - ) + AboutDialog.cpp + Host.cpp + InDevelopmentWarning.cpp + Main.cpp + MainWindow.cpp + MenuBar.cpp + RenderWidget.cpp + Resources.cpp + Settings.cpp + ToolBar.cpp + Config/FilesystemWidget.cpp + Config/InfoWidget.cpp + Config/PathDialog.cpp + Config/PropertiesDialog.cpp + Config/SettingsWindow.cpp + GameList/GameFile.cpp + GameList/GameList.cpp + GameList/GameListModel.cpp + GameList/GameTracker.cpp + GameList/ListProxyModel.cpp + GameList/TableDelegate.cpp +) list(APPEND LIBS core uicommon) if(WIN32) - list(APPEND SRCS DolphinQt2.manifest) + list(APPEND SRCS DolphinQt2.manifest) endif() 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) 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) - set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHINQT2_BINARY}.app) + include(BundleUtilities) + set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHINQT2_BINARY}.app) - # Ask for an application bundle. - set_target_properties(${DOLPHINQT2_BINARY} PROPERTIES - MACOSX_BUNDLE true - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in - ) + # Ask for an application bundle. + set_target_properties(${DOLPHINQT2_BINARY} PROPERTIES + MACOSX_BUNDLE true + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in + ) - # Copy qt.conf into the bundle - 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) + # Copy qt.conf into the bundle + 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) - # Copy Qt plugins into the bundle - get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION) - target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}") - set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms) + # Copy Qt plugins into the bundle + get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION) + target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}") + set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms) - # Copy resources into the bundle - 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/*") - foreach(res ${resources}) - target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") - get_filename_component(resdir "${res}" DIRECTORY) - set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES - MACOSX_PACKAGE_LOCATION "Resources/${resdir}") - source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}") - endforeach() + # Copy resources into the bundle + 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/*") + foreach(res ${resources}) + target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") + get_filename_component(resdir "${res}" DIRECTORY) + set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES + MACOSX_PACKAGE_LOCATION "Resources/${resdir}") + source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}") + endforeach() - # Update library references to make the bundle portable - include(DolphinPostprocessBundle) - dolphin_postprocess_bundle(${DOLPHINQT2_BINARY}) + # Update library references to make the bundle portable + include(DolphinPostprocessBundle) + dolphin_postprocess_bundle(${DOLPHINQT2_BINARY}) else() - install(TARGETS ${DOLPHINQT2_BINARY} RUNTIME DESTINATION ${bindir}) + install(TARGETS ${DOLPHINQT2_BINARY} RUNTIME DESTINATION ${bindir}) endif() diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 47bd895aa8..bfdc71ef92 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -1,209 +1,210 @@ set(GUI_SRCS - AboutDolphin.cpp - ControllerConfigDiag.cpp - Cheats/ActionReplayCodesPanel.cpp - Cheats/ARCodeAddEdit.cpp - Cheats/CheatSearchTab.cpp - Cheats/CheatsWindow.cpp - Cheats/CreateCodeDialog.cpp - Cheats/GeckoCodeDiag.cpp - Config/AddUSBDeviceDiag.cpp - Config/AdvancedConfigPane.cpp - Config/AudioConfigPane.cpp - Config/ConfigMain.cpp - Config/GameCubeConfigPane.cpp - Config/GCAdapterConfigDiag.cpp - Config/GeneralConfigPane.cpp - Config/InterfaceConfigPane.cpp - Config/PathConfigPane.cpp - Config/WiiConfigPane.cpp - Debugger/BreakpointDlg.cpp - Debugger/BreakpointView.cpp - Debugger/BreakpointWindow.cpp - Debugger/CodeView.cpp - Debugger/CodeWindow.cpp - Debugger/CodeWindowFunctions.cpp - Debugger/DSPDebugWindow.cpp - Debugger/DSPRegisterView.cpp - Debugger/DebuggerPanel.cpp - Debugger/DebuggerUIUtil.cpp - Debugger/JitWindow.cpp - Debugger/MemoryCheckDlg.cpp - Debugger/MemoryView.cpp - Debugger/MemoryWindow.cpp - Debugger/RegisterView.cpp - Debugger/RegisterWindow.cpp - Debugger/WatchView.cpp - Debugger/WatchWindow.cpp - ISOProperties/FilesystemPanel.cpp - ISOProperties/InfoPanel.cpp - ISOProperties/ISOProperties.cpp - NetPlay/ChangeGameDialog.cpp - NetPlay/MD5Dialog.cpp - NetPlay/NetPlayLauncher.cpp - NetPlay/NetPlaySetupFrame.cpp - NetPlay/NetWindow.cpp - NetPlay/PadMapDialog.cpp - Input/InputConfigDiag.cpp - Input/InputConfigDiagBitmaps.cpp - Input/HotkeyInputConfigDiag.cpp - Input/GCPadInputConfigDiag.cpp - Input/MicButtonConfigDiag.cpp - Input/GCKeyboardInputConfigDiag.cpp - Input/WiimoteInputConfigDiag.cpp - Input/NunchukInputConfigDiag.cpp - Input/ClassicInputConfigDiag.cpp - Input/GuitarInputConfigDiag.cpp - Input/DrumsInputConfigDiag.cpp - Input/TurntableInputConfigDiag.cpp - DolphinSlider.cpp - FifoPlayerDlg.cpp - Frame.cpp - FrameAui.cpp - FrameTools.cpp - GameListCtrl.cpp - ISOFile.cpp - LogConfigWindow.cpp - LogWindow.cpp - Main.cpp - MainMenuBar.cpp - MainToolBar.cpp - MemcardManager.cpp - PatchAddEdit.cpp - PostProcessingConfigDiag.cpp - SoftwareVideoConfigDialog.cpp - TASInputDlg.cpp - VideoConfigDiag.cpp - WxEventUtils.cpp - WXInputBase.cpp - WxUtils.cpp) + AboutDolphin.cpp + ControllerConfigDiag.cpp + Cheats/ActionReplayCodesPanel.cpp + Cheats/ARCodeAddEdit.cpp + Cheats/CheatSearchTab.cpp + Cheats/CheatsWindow.cpp + Cheats/CreateCodeDialog.cpp + Cheats/GeckoCodeDiag.cpp + Config/AddUSBDeviceDiag.cpp + Config/AdvancedConfigPane.cpp + Config/AudioConfigPane.cpp + Config/ConfigMain.cpp + Config/GameCubeConfigPane.cpp + Config/GCAdapterConfigDiag.cpp + Config/GeneralConfigPane.cpp + Config/InterfaceConfigPane.cpp + Config/PathConfigPane.cpp + Config/WiiConfigPane.cpp + Debugger/BreakpointDlg.cpp + Debugger/BreakpointView.cpp + Debugger/BreakpointWindow.cpp + Debugger/CodeView.cpp + Debugger/CodeWindow.cpp + Debugger/CodeWindowFunctions.cpp + Debugger/DSPDebugWindow.cpp + Debugger/DSPRegisterView.cpp + Debugger/DebuggerPanel.cpp + Debugger/DebuggerUIUtil.cpp + Debugger/JitWindow.cpp + Debugger/MemoryCheckDlg.cpp + Debugger/MemoryView.cpp + Debugger/MemoryWindow.cpp + Debugger/RegisterView.cpp + Debugger/RegisterWindow.cpp + Debugger/WatchView.cpp + Debugger/WatchWindow.cpp + ISOProperties/FilesystemPanel.cpp + ISOProperties/InfoPanel.cpp + ISOProperties/ISOProperties.cpp + NetPlay/ChangeGameDialog.cpp + NetPlay/MD5Dialog.cpp + NetPlay/NetPlayLauncher.cpp + NetPlay/NetPlaySetupFrame.cpp + NetPlay/NetWindow.cpp + NetPlay/PadMapDialog.cpp + Input/InputConfigDiag.cpp + Input/InputConfigDiagBitmaps.cpp + Input/HotkeyInputConfigDiag.cpp + Input/GCPadInputConfigDiag.cpp + Input/MicButtonConfigDiag.cpp + Input/GCKeyboardInputConfigDiag.cpp + Input/WiimoteInputConfigDiag.cpp + Input/NunchukInputConfigDiag.cpp + Input/ClassicInputConfigDiag.cpp + Input/GuitarInputConfigDiag.cpp + Input/DrumsInputConfigDiag.cpp + Input/TurntableInputConfigDiag.cpp + DolphinSlider.cpp + FifoPlayerDlg.cpp + Frame.cpp + FrameAui.cpp + FrameTools.cpp + GameListCtrl.cpp + ISOFile.cpp + LogConfigWindow.cpp + LogWindow.cpp + Main.cpp + MainMenuBar.cpp + MainToolBar.cpp + MemcardManager.cpp + PatchAddEdit.cpp + PostProcessingConfigDiag.cpp + SoftwareVideoConfigDialog.cpp + TASInputDlg.cpp + VideoConfigDiag.cpp + WxEventUtils.cpp + WXInputBase.cpp + WxUtils.cpp +) set(NOGUI_SRCS MainNoGUI.cpp) if(USE_X11) - set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp) - set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp) + set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp) + set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp) endif() set(WXLIBS ${wxWidgets_LIBRARIES}) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(WXLIBS ${WXLIBS} dl) + set(WXLIBS ${WXLIBS} dl) endif() list(APPEND LIBS core uicommon cpp-optparse) if(APPLE) - if(wxWidgets_FOUND) - list(APPEND WXLIBS - ${APPSERV_LIBRARY} - ${COCOA_LIBRARY} - ) - endif() - # Add resource files to application bundle. - set(RESOURCES resources/Dolphin.icns) - list(APPEND SRCS ${RESOURCES}) - set_source_files_properties(${RESOURCES} PROPERTIES - MACOSX_PACKAGE_LOCATION Resources) + if(wxWidgets_FOUND) + list(APPEND WXLIBS + ${APPSERV_LIBRARY} + ${COCOA_LIBRARY} + ) + endif() + # Add resource files to application bundle. + set(RESOURCES resources/Dolphin.icns) + list(APPEND SRCS ${RESOURCES}) + set_source_files_properties(${RESOURCES} PROPERTIES + MACOSX_PACKAGE_LOCATION Resources) endif() if(WIN32) - list(APPEND SRCS - DolphinWX.manifest - DolphinWX.rc - ) + list(APPEND SRCS + DolphinWX.manifest + DolphinWX.rc + ) endif() if(APPLE) - set(DOLPHIN_EXE_BASE Dolphin) + set(DOLPHIN_EXE_BASE Dolphin) else() - set(DOLPHIN_EXE_BASE dolphin-emu) + set(DOLPHIN_EXE_BASE dolphin-emu) endif() set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}) if(wxWidgets_FOUND) - add_executable(${DOLPHIN_EXE} ${SRCS} ${GUI_SRCS}) - target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) - - # Handle localization - find_package(Gettext) - if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE) - set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot") - file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po) - - target_sources(${DOLPHIN_EXE} PRIVATE ${pot_file} ${LINGUAS}) - source_group("Localization" FILES ${LINGUAS}) - source_group("Localization\\\\Generated" FILES ${pot_file}) - - foreach(po ${LINGUAS}) - get_filename_component(lang ${po} NAME_WE) - set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang}) - set(mo ${mo_dir}/dolphin-emu.mo) - - target_sources(${DOLPHIN_EXE} PRIVATE ${mo}) - source_group("Localization\\\\Generated" FILES ${mo}) - - if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set_source_files_properties(${mo} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${lang}.lproj") - else() - install(FILES ${mo} DESTINATION share/locale/${lang}/LC_MESSAGES) - endif() - - add_custom_command(OUTPUT ${mo} - COMMAND mkdir -p ${mo_dir} - COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${po} ${pot_file} - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po} - DEPENDS ${po} - ) - endforeach() - endif() - - if(APPLE) - set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app) - - # Ask for an application bundle. - set_target_properties(${DOLPHIN_EXE} PROPERTIES - MACOSX_BUNDLE true - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in - ) - - # Copy resources in the bundle - 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/*") - foreach(res ${resources}) - target_sources(${DOLPHIN_EXE} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") - get_filename_component(resdir "${res}" DIRECTORY) - set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES - MACOSX_PACKAGE_LOCATION "Resources/${resdir}") - source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}") - endforeach() - - # Update library references to make the bundle portable - include(DolphinPostprocessBundle) - dolphin_postprocess_bundle(${DOLPHIN_EXE}) - - # Install bundle into systemwide /Applications directory. - install(TARGETS ${DOLPHIN_EXE} DESTINATION /Applications) - elseif(WIN32) - set_target_properties(${DOLPHIN_EXE} PROPERTIES - WIN32_EXECUTABLE ON - ) - add_custom_command(TARGET ${DOLPHIN_EXE} - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Data/Sys $<TARGET_FILE_DIR:${DOLPHIN_EXE}>/Sys - ) - else() - install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) - endif() - - set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE}) + add_executable(${DOLPHIN_EXE} ${SRCS} ${GUI_SRCS}) + target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) + + # Handle localization + find_package(Gettext) + if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE) + set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot") + file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po) + + target_sources(${DOLPHIN_EXE} PRIVATE ${pot_file} ${LINGUAS}) + source_group("Localization" FILES ${LINGUAS}) + source_group("Localization\\\\Generated" FILES ${pot_file}) + + foreach(po ${LINGUAS}) + get_filename_component(lang ${po} NAME_WE) + set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang}) + set(mo ${mo_dir}/dolphin-emu.mo) + + target_sources(${DOLPHIN_EXE} PRIVATE ${mo}) + source_group("Localization\\\\Generated" FILES ${mo}) + + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set_source_files_properties(${mo} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${lang}.lproj") + else() + install(FILES ${mo} DESTINATION share/locale/${lang}/LC_MESSAGES) + endif() + + add_custom_command(OUTPUT ${mo} + COMMAND mkdir -p ${mo_dir} + COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${po} ${pot_file} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po} + DEPENDS ${po} + ) + endforeach() + endif() + + if(APPLE) + set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app) + + # Ask for an application bundle. + set_target_properties(${DOLPHIN_EXE} PROPERTIES + MACOSX_BUNDLE true + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in + ) + + # Copy resources in the bundle + 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/*") + foreach(res ${resources}) + target_sources(${DOLPHIN_EXE} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") + get_filename_component(resdir "${res}" DIRECTORY) + set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES + MACOSX_PACKAGE_LOCATION "Resources/${resdir}") + source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}") + endforeach() + + # Update library references to make the bundle portable + include(DolphinPostprocessBundle) + dolphin_postprocess_bundle(${DOLPHIN_EXE}) + + # Install bundle into systemwide /Applications directory. + install(TARGETS ${DOLPHIN_EXE} DESTINATION /Applications) + elseif(WIN32) + set_target_properties(${DOLPHIN_EXE} PROPERTIES + WIN32_EXECUTABLE ON + ) + add_custom_command(TARGET ${DOLPHIN_EXE} + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Data/Sys $<TARGET_FILE_DIR:${DOLPHIN_EXE}>/Sys + ) + else() + install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) + endif() + + set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE}) endif() if(USE_X11 OR ENABLE_HEADLESS) - set(DOLPHIN_NOGUI_EXE ${DOLPHIN_EXE_BASE}-nogui) - add_executable(${DOLPHIN_NOGUI_EXE} ${SRCS} ${NOGUI_SRCS}) - target_link_libraries(${DOLPHIN_NOGUI_EXE} ${LIBS}) - set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_NOGUI_EXE}) - install(TARGETS ${DOLPHIN_NOGUI_EXE} RUNTIME DESTINATION ${bindir}) + set(DOLPHIN_NOGUI_EXE ${DOLPHIN_EXE_BASE}-nogui) + add_executable(${DOLPHIN_NOGUI_EXE} ${SRCS} ${NOGUI_SRCS}) + target_link_libraries(${DOLPHIN_NOGUI_EXE} ${LIBS}) + set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_NOGUI_EXE}) + install(TARGETS ${DOLPHIN_NOGUI_EXE} RUNTIME DESTINATION ${bindir}) endif() diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index b86c0500de..697845c494 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -1,54 +1,58 @@ set(SRCS InputConfig.cpp - ControllerEmu/ControllerEmu.cpp - ControllerEmu/Control/Control.cpp - ControllerEmu/Control/Input.cpp - ControllerEmu/Control/Output.cpp - ControllerEmu/ControlGroup/AnalogStick.cpp - ControllerEmu/ControlGroup/Buttons.cpp - ControllerEmu/ControlGroup/ControlGroup.cpp - ControllerEmu/ControlGroup/Cursor.cpp - ControllerEmu/ControlGroup/Extension.cpp - ControllerEmu/ControlGroup/Force.cpp - ControllerEmu/ControlGroup/MixedTriggers.cpp - ControllerEmu/ControlGroup/ModifySettingsButton.cpp - ControllerEmu/ControlGroup/Slider.cpp - ControllerEmu/ControlGroup/Tilt.cpp - ControllerEmu/ControlGroup/Triggers.cpp - ControllerInterface/ControllerInterface.cpp - ControllerInterface/Device.cpp - ControlReference/ControlReference.cpp - ControlReference/ExpressionParser.cpp + ControllerEmu/ControllerEmu.cpp + ControllerEmu/Control/Control.cpp + ControllerEmu/Control/Input.cpp + ControllerEmu/Control/Output.cpp + ControllerEmu/ControlGroup/AnalogStick.cpp + ControllerEmu/ControlGroup/Buttons.cpp + ControllerEmu/ControlGroup/ControlGroup.cpp + ControllerEmu/ControlGroup/Cursor.cpp + ControllerEmu/ControlGroup/Extension.cpp + ControllerEmu/ControlGroup/Force.cpp + ControllerEmu/ControlGroup/MixedTriggers.cpp + ControllerEmu/ControlGroup/ModifySettingsButton.cpp + ControllerEmu/ControlGroup/Slider.cpp + ControllerEmu/ControlGroup/Tilt.cpp + ControllerEmu/ControlGroup/Triggers.cpp + ControllerInterface/ControllerInterface.cpp + ControllerInterface/Device.cpp + ControlReference/ControlReference.cpp + ControlReference/ExpressionParser.cpp ) set(LIBS common) if(WIN32) set(SRCS ${SRCS} - ControllerInterface/DInput/DInput.cpp - ControllerInterface/DInput/DInputJoystick.cpp - ControllerInterface/DInput/DInputKeyboardMouse.cpp - ControllerInterface/DInput/XInputFilter.cpp - ControllerInterface/XInput/XInput.cpp - ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) + ControllerInterface/DInput/DInput.cpp + ControllerInterface/DInput/DInputJoystick.cpp + ControllerInterface/DInput/DInputKeyboardMouse.cpp + ControllerInterface/DInput/XInputFilter.cpp + ControllerInterface/XInput/XInput.cpp + ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp + ) elseif(APPLE) find_library(COREFOUNDATION_LIBRARY CoreFoundation) find_library(CARBON_LIBRARY Carbon) find_library(COCOA_LIBRARY Cocoa) set(SRCS ${SRCS} - ControllerInterface/OSX/OSX.mm - ControllerInterface/OSX/OSXKeyboard.mm - ControllerInterface/OSX/OSXJoystick.mm - ControllerInterface/Quartz/Quartz.mm - ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm - ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) + ControllerInterface/OSX/OSX.mm + ControllerInterface/OSX/OSXKeyboard.mm + ControllerInterface/OSX/OSXJoystick.mm + ControllerInterface/Quartz/Quartz.mm + ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm + ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp + ) set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY}) elseif(X11_FOUND) set(SRCS ${SRCS} - ControllerInterface/Xlib/XInput2.cpp) + ControllerInterface/Xlib/XInput2.cpp + ) set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES}) elseif(ANDROID) add_definitions(-DCIFACE_USE_ANDROID) set(SRCS ${SRCS} - ControllerInterface/Android/Android.cpp) + ControllerInterface/Android/Android.cpp + ) endif() if(ANDROID) diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt index 0f9a25e80a..e25ad9abf9 100644 --- a/Source/Core/UICommon/CMakeLists.txt +++ b/Source/Core/UICommon/CMakeLists.txt @@ -1,7 +1,9 @@ -set(SRCS CommandLineParse.cpp - Disassembler.cpp - UICommon.cpp - USBUtils.cpp) +set(SRCS + CommandLineParse.cpp + Disassembler.cpp + UICommon.cpp + USBUtils.cpp +) set(LIBS common cpp-optparse) if(LIBUSB_FOUND) diff --git a/Source/Core/VideoBackends/Null/CMakeLists.txt b/Source/Core/VideoBackends/Null/CMakeLists.txt index f186da0067..5182a86c4e 100644 --- a/Source/Core/VideoBackends/Null/CMakeLists.txt +++ b/Source/Core/VideoBackends/Null/CMakeLists.txt @@ -1,13 +1,13 @@ set(SRCS - NullBackend.cpp - Render.cpp - VertexManager.cpp - ShaderCache.cpp + NullBackend.cpp + Render.cpp + VertexManager.cpp + ShaderCache.cpp ) set(LIBS - videocommon - common + videocommon + common ) add_dolphin_library(videonull "${SRCS}" "${LIBS}") diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt index 2927253d30..486d6a017f 100644 --- a/Source/Core/VideoBackends/OGL/CMakeLists.txt +++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt @@ -1,27 +1,29 @@ set(SRCS - BoundingBox.cpp - FramebufferManager.cpp - main.cpp - NativeVertexFormat.cpp - PerfQuery.cpp - PostProcessing.cpp - ProgramShaderCache.cpp - RasterFont.cpp - Render.cpp - SamplerCache.cpp - StreamBuffer.cpp - TextureCache.cpp - TextureConverter.cpp - VertexManager.cpp) + BoundingBox.cpp + FramebufferManager.cpp + main.cpp + NativeVertexFormat.cpp + PerfQuery.cpp + PostProcessing.cpp + ProgramShaderCache.cpp + RasterFont.cpp + Render.cpp + SamplerCache.cpp + StreamBuffer.cpp + TextureCache.cpp + TextureConverter.cpp + VertexManager.cpp +) -set(LIBS ${LIBS} - videocommon - SOIL - common - ${X11_LIBRARIES}) +set(LIBS ${LIBS} + videocommon + SOIL + common + ${X11_LIBRARIES} +) if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD") - set(LIBS ${LIBS} usbhid) + set(LIBS ${LIBS} usbhid) endif() add_dolphin_library(videoogl "${SRCS}" "${LIBS}") diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt index 5706726770..d2b34188ad 100644 --- a/Source/Core/VideoBackends/Software/CMakeLists.txt +++ b/Source/Core/VideoBackends/Software/CMakeLists.txt @@ -1,21 +1,25 @@ -set(SRCS Clipper.cpp - DebugUtil.cpp - EfbCopy.cpp - EfbInterface.cpp - Rasterizer.cpp - SWOGLWindow.cpp - SWRenderer.cpp - SWVertexLoader.cpp - SWmain.cpp - SetupUnit.cpp - Tev.cpp - TextureEncoder.cpp - TextureSampler.cpp - TransformUnit.cpp) +set(SRCS + Clipper.cpp + DebugUtil.cpp + EfbCopy.cpp + EfbInterface.cpp + Rasterizer.cpp + SWOGLWindow.cpp + SWRenderer.cpp + SWVertexLoader.cpp + SWmain.cpp + SetupUnit.cpp + Tev.cpp + TextureEncoder.cpp + TextureSampler.cpp + TransformUnit.cpp +) -set(LIBS videocommon - SOIL - common - ${X11_LIBRARIES}) +set(LIBS + videocommon + SOIL + common + ${X11_LIBRARIES} +) add_dolphin_library(videosoftware "${SRCS}" "${LIBS}") diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt index 5df1876bfd..8d9f980dd9 100644 --- a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt +++ b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt @@ -1,31 +1,31 @@ set(SRCS - BoundingBox.cpp - CommandBufferManager.cpp - FramebufferManager.cpp - ObjectCache.cpp - PerfQuery.cpp - RasterFont.cpp - Renderer.cpp - ShaderCompiler.cpp - StateTracker.cpp - StagingBuffer.cpp - StagingTexture2D.cpp - StreamBuffer.cpp - SwapChain.cpp - Texture2D.cpp - TextureCache.cpp - TextureConverter.cpp - Util.cpp - VertexFormat.cpp - VertexManager.cpp - VulkanContext.cpp - VulkanLoader.cpp - main.cpp + BoundingBox.cpp + CommandBufferManager.cpp + FramebufferManager.cpp + ObjectCache.cpp + PerfQuery.cpp + RasterFont.cpp + Renderer.cpp + ShaderCompiler.cpp + StateTracker.cpp + StagingBuffer.cpp + StagingTexture2D.cpp + StreamBuffer.cpp + SwapChain.cpp + Texture2D.cpp + TextureCache.cpp + TextureConverter.cpp + Util.cpp + VertexFormat.cpp + VertexManager.cpp + VulkanContext.cpp + VulkanLoader.cpp + main.cpp ) set(LIBS - videocommon - common + videocommon + common ) # Only include the Vulkan headers when building the Vulkan backend diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index b7138ec6df..7651798e05 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -1,66 +1,72 @@ -set(SRCS AsyncRequests.cpp - BoundingBox.cpp - BPFunctions.cpp - BPMemory.cpp - BPStructs.cpp - CPMemory.cpp - CommandProcessor.cpp - Debugger.cpp - DriverDetails.cpp - Fifo.cpp - FPSCounter.cpp - FramebufferManagerBase.cpp - GeometryShaderGen.cpp - GeometryShaderManager.cpp - HiresTextures.cpp - ImageWrite.cpp - IndexGenerator.cpp - LightingShaderGen.cpp - MainBase.cpp - OnScreenDisplay.cpp - OpcodeDecoding.cpp - PerfQueryBase.cpp - PixelEngine.cpp - PixelShaderGen.cpp - PixelShaderManager.cpp - PostProcessing.cpp - RenderBase.cpp - RenderState.cpp - Statistics.cpp - TextureCacheBase.cpp - TextureConversionShader.cpp - TextureDecoder_Common.cpp - VertexLoader.cpp - VertexLoaderBase.cpp - VertexLoaderManager.cpp - VertexLoader_Color.cpp - VertexLoader_Normal.cpp - VertexLoader_Position.cpp - VertexLoader_TextCoord.cpp - VertexManagerBase.cpp - VertexShaderGen.cpp - VertexShaderManager.cpp - VideoBackendBase.cpp - VideoConfig.cpp - VideoState.cpp - XFMemory.cpp - XFStructs.cpp) -set(LIBS core png) +set(SRCS + AsyncRequests.cpp + BoundingBox.cpp + BPFunctions.cpp + BPMemory.cpp + BPStructs.cpp + CPMemory.cpp + CommandProcessor.cpp + Debugger.cpp + DriverDetails.cpp + Fifo.cpp + FPSCounter.cpp + FramebufferManagerBase.cpp + GeometryShaderGen.cpp + GeometryShaderManager.cpp + HiresTextures.cpp + ImageWrite.cpp + IndexGenerator.cpp + LightingShaderGen.cpp + MainBase.cpp + OnScreenDisplay.cpp + OpcodeDecoding.cpp + PerfQueryBase.cpp + PixelEngine.cpp + PixelShaderGen.cpp + PixelShaderManager.cpp + PostProcessing.cpp + RenderBase.cpp + RenderState.cpp + Statistics.cpp + TextureCacheBase.cpp + TextureConversionShader.cpp + TextureDecoder_Common.cpp + VertexLoader.cpp + VertexLoaderBase.cpp + VertexLoaderManager.cpp + VertexLoader_Color.cpp + VertexLoader_Normal.cpp + VertexLoader_Position.cpp + VertexLoader_TextCoord.cpp + VertexManagerBase.cpp + VertexShaderGen.cpp + VertexShaderManager.cpp + VideoBackendBase.cpp + VideoConfig.cpp + VideoState.cpp + XFMemory.cpp + XFStructs.cpp +) + +set(LIBS + core + png +) if(_M_X86) - set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp) + set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp) elseif(_M_ARM_64) - set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp) + set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp) else() - set(SRCS ${SRCS} TextureDecoder_Generic.cpp) + set(SRCS ${SRCS} TextureDecoder_Generic.cpp) endif() if(LIBAV_FOUND OR WIN32) - set(SRCS ${SRCS} AVIDump.cpp) + set(SRCS ${SRCS} AVIDump.cpp) endif() add_dolphin_library(videocommon "${SRCS}" "${LIBS}") if(LIBAV_FOUND) - target_link_libraries(videocommon PRIVATE ${LIBS} ${LIBAV_LIBRARIES}) + target_link_libraries(videocommon PRIVATE ${LIBS} ${LIBAV_LIBRARIES}) endif() |
