cmake: Add various missing file in CMakeLists.txt

Add some windows code path. It would reduce the burden to port Cmake to windows.
(sill miss 3rdparty/some plugins/...)
This commit is contained in:
Gregory Hainaut 2017-02-16 19:50:33 +01:00
parent f86ea9f19b
commit da1bb43618
7 changed files with 311 additions and 135 deletions

View File

@ -39,6 +39,7 @@ set(UtilitiesSources
pxStreams.cpp
pxTranslate.cpp
pxWindowTextWriter.cpp
RwMutex.cpp
StringHelpers.cpp
ThreadingDialogs.cpp
ThreadTools.cpp
@ -68,6 +69,7 @@ set(UtilitiesHeaders
../../include/Utilities/pxStaticText.h
../../include/Utilities/pxStreams.h
../../include/Utilities/RedtapeWindows.h
../../include/Utilities/RwMutex.h
../../include/Utilities/SafeArray.h
../../include/Utilities/ScopedAlloc.h
../../include/Utilities/ScopedPtrMT.h
@ -79,6 +81,7 @@ set(UtilitiesHeaders
../../include/Utilities/wxBaseTools.h
../../include/Utilities/wxGuiTools.h
PrecompiledHeader.h
ThreadingInternal.h
)
if(APPLE)
@ -87,6 +90,13 @@ if(APPLE)
Darwin/DarwinMisc.cpp
Darwin/DarwinSemaphore.cpp
)
elseif(Windows)
LIST(APPEND UtilitiesSources
x86/MemcpyFast.cpp
Windows/WinThreads.cpp
Windows/WinHostSys.cpp
Windows/WinMisc.cpp
)
else()
LIST(APPEND UtilitiesSources
Linux/LnxThreads.cpp

View File

@ -22,7 +22,6 @@ set(x86emitterSources
jmp.cpp
legacy.cpp
legacy_sse.cpp
LnxCpuDetect.cpp
movs.cpp
PrecompiledHeader.cpp
simd.cpp
@ -55,7 +54,15 @@ set(x86emitterHeaders
../../include/x86emitter/tools.h
../../include/x86emitter/x86emitter.h
../../include/x86emitter/x86types.h
PrecompiledHeader.h)
PrecompiledHeader.h
cpudetect_internal.h
)
if(Windows)
LIST(APPEND x86emitterSources WinCpuDetect.cpp)
else()
LIST(APPEND x86emitterSources LnxCpuDetect.cpp)
endif()
set(x86emitterFinalSources
${x86emitterSources}

View File

@ -114,6 +114,7 @@ set(pcsx2Sources
# Main pcsx2 header
set(pcsx2Headers
AsyncFileReader.h
Cache.h
cheatscpp.h
Common.h
@ -132,7 +133,7 @@ set(pcsx2Headers
IopBios.h
IopCommon.h
IopCounters.h
IopDma.h
IopDma.h
IopGte.h
IopHw.h
IopMem.h
@ -191,14 +192,20 @@ set(pcsx2CDVDHeaders
CDVD/CDVD.h
CDVD/CDVD_internal.h
CDVD/CDVDisoReader.h
CDVD/zlib_indexed.h
CDVD/ChunksCache.h
CDVD/CompressedFileReader.h
CDVD/CompressedFileReaderUtils.h
CDVD/CsoFileReader.h
CDVD/GzippedFileReader.h
CDVD/IsoFileFormats.h
CDVD/IsoFS/IsoDirectory.h
CDVD/IsoFS/IsoFileDescriptor.h
CDVD/IsoFS/IsoFile.h
CDVD/IsoFS/IsoFSCDVD.h
CDVD/IsoFS/IsoFS.h
CDVD/IsoFS/SectorSource.h)
CDVD/IsoFS/SectorSource.h
CDVD/zlib_indexed.h
)
# DebugTools sources
set(pcsx2DebugToolsSources
@ -229,7 +236,7 @@ set(pcsx2DebugToolsHeaders
DebugTools/Breakpoints.h
DebugTools/SymbolMap.h
DebugTools/Debug.h
DebugTools/DisASm.h
DebugTools/DisASM.h
DebugTools/DisVUmicro.h
DebugTools/DisVUops.h
DebugTools/BiosDebugData.h)
@ -248,7 +255,6 @@ set(pcsx2GuiSources
gui/AppRes.cpp
gui/ConsoleLogger.cpp
gui/CpuUsageProvider.cpp
gui/CpuUsageProviderLnx.cpp
gui/Dialogs/AboutBoxDialog.cpp
gui/Dialogs/AppConfigDialog.cpp
gui/Dialogs/AssertionDialog.cpp
@ -308,28 +314,31 @@ set(pcsx2GuiSources
# gui headers
set(pcsx2GuiHeaders
gui/App.h
gui/ApplyState.h
gui/AppAccelerators.h
gui/AppCommon.h
gui/AppConfig.h
gui/AppCorePlugins.h
gui/AppCoreThread.h
gui/AppEventListeners.h
gui/AppForwardDefs.h
gui/AppGameDatabase.h
gui/App.h
gui/ApplyState.h
gui/AppSaveStates.h
gui/ConsoleLogger.h
gui/CpuUsageProvider.h
gui/Debugger/BreakpointWindow.h
gui/Debugger/CtrlDisassemblyView.h
gui/Debugger/CtrlMemView.h
gui/Debugger/CtrlRegisterList.h
gui/Debugger/DebugEvents.h
gui/Debugger/DebuggerLists.h
gui/Debugger/DisassemblyDialog.h
gui/Dialogs/BaseConfigurationDialog.inl
gui/Dialogs/ConfigurationDialog.h
gui/Dialogs/LogOptionsDialog.h
gui/Dialogs/ModalPopups.h
gui/Debugger/BreakpointWindow.h
gui/Debugger/CtrlDisassemblyView.h
gui/Debugger/CtrlRegisterList.h
gui/Debugger/CtrlMemView.h
gui/Debugger/DebuggerLists.h
gui/Debugger/DisassemblyDialog.h
gui/Debugger/DebugEvents.h
gui/GSFrame.h
gui/i18n.h
gui/IsoDropTarget.h
gui/MainFrame.h
@ -339,6 +348,7 @@ set(pcsx2GuiHeaders
gui/Panels/ConfigurationPanels.h
gui/Panels/LogOptionsPanels.h
gui/Panels/MemoryCardPanels.h
gui/pxEventThread.h
gui/RecentIsoList.h
)
@ -377,25 +387,31 @@ set(pcsx2IPUSources
# IPU headers
set(pcsx2IPUHeaders
IPU/IPU.h
IPU/IPU_Fifo.h
IPU/IPUdma.h
IPU/yuv2rgb.h)
IPU/IPU_Fifo.h
IPU/IPU.h
IPU/mpeg2lib/Mpeg.h
IPU/mpeg2lib/Vlc.h
IPU/yuv2rgb.h
)
# Linux sources
set(pcsx2LinuxSources
gui/CpuUsageProviderLnx.cpp
Linux/LnxConsolePipe.cpp
Linux/LnxKeyCodes.cpp
Linux/LnxFlatFileReader.cpp
Linux/LnxFlatFileReader.cpp
)
set(pcsx2OSXSources
gui/CpuUsageProviderLnx.cpp
# Linux/LnxConsolePipe.cpp
# Linux/LnxKeyCodes.cpp
Darwin/DarwinFlatFileReader.cpp
)
set(pcsx2FreeBSDSources
gui/CpuUsageProviderLnx.cpp
Linux/LnxConsolePipe.cpp
Linux/LnxKeyCodes.cpp
Darwin/DarwinFlatFileReader.cpp
@ -472,14 +488,20 @@ set(pcsx2ZipToolsHeaders
# Windows sources
set(pcsx2WindowsSources
gui/CpuUsageProviderMSW.cpp
windows/cheats/browser.cpp
windows/cheats/cheats.cpp
windows/DwmSetup.cpp
windows/FlatFileReaderWindows.cpp
windows/ini.cpp
windows/Optimus.cpp
windows/PatchBrowser.cpp
windows/VCprojects/IopSif.cpp
windows/WinCompressNTFS.cpp
windows/WinConsolePipe.cpp
windows/WinSysExec.cpp)
windows/WinKeyCodes.cpp
windows/WinSysExec.cpp
)
# Windows headers
set(pcsx2WindowsHeaders
@ -543,9 +565,6 @@ set(pcsx2x86Headers
x86/iR5900Move.h
x86/iR5900MultDiv.h
x86/iR5900Shift.h
x86/microVU.h
x86/microVU_IR.h
x86/microVU_Misc.h
x86/microVU_Alloc.inl
x86/microVU_Analyze.inl
x86/microVU_Branch.inl
@ -554,15 +573,24 @@ set(pcsx2x86Headers
x86/microVU.cpp
x86/microVU_Execute.inl
x86/microVU_Flags.inl
x86/microVU.h
x86/microVU_IR.h
x86/microVU_Log.inl
x86/microVU_Lower.inl
x86/microVU_Macro.inl
x86/microVU_Misc.h
x86/microVU_Misc.inl
x86/microVU_Profiler.h
x86/microVU_Tables.inl
x86/microVU_Upper.inl
x86/newVif.h
x86/newVif_HashBucket.h
x86/newVif_UnpackSSE.h
x86/R5900_Profiler.h
x86/sVU_Compare.h
x86/sVU_Debug.h
x86/sVU_Micro.h
x86/sVU_zerorec.h
)
# collect .S files

View File

@ -78,7 +78,6 @@ set(GSdxSources
GSDump.cpp
GSFunctionMap.cpp
GSHwHack.cpp
GSLinuxDialog.cpp
GSLocalMemory.cpp
GSLzma.cpp
GSPerfMon.cpp
@ -113,18 +112,80 @@ set(GSdxSources
GSVector.cpp
GSVertexTrace.cpp
GSWnd.cpp
GSWndOGL.cpp
GSWndEGL.cpp
GSdx.cpp
GSdxResources.cpp
stdafx.cpp
)
set(GSdxHeaders
PSX/GPU.h
PSX/GPUDrawScanline.h
PSX/GPUDrawScanlineCodeGenerator.h
config.h
GLLoader.h
GLState.h
GSAlignedClass.h
GSBlock.h
GSCaptureDlg.h
GSCapture.h
GSClut.h
GSCodeBuffer.h
GSCrc.h
GSDevice.h
GSDeviceNull.h
GSDeviceOGL.h
GSDeviceSW.h
GSDialog.h
GSDirtyRect.h
GSDrawingContext.h
GSDrawingEnvironment.h
GSDrawScanlineCodeGenerator.h
GSDrawScanline.h
GSDump.h
GSdx.h
GSdxResources.h
GSFunctionMap.h
GS.h
GSLocalMemory.h
GSLzma.h
GSOsdManager.h
GSPerfMon.h
GSPng.h
GSRasterizer.h
GSRendererCL.h
GSRendererCS.h
GSRenderer.h
GSRendererHW.h
GSRendererNull.h
GSRendererOGL.h
GSRendererSW.h
GSScanlineEnvironment.h
GSSetting.h
GSSettingsDlg.h
GSSetupPrimCodeGenerator.h
GSShaderOGL.h
GSState.h
GSTables.h
GSTextureCache.h
GSTextureCacheOGL.h
GSTextureCacheSW.h
GSTexture.h
GSTextureNull.h
GSTextureOGL.h
GSTextureSW.h
GSThread_CXX11.h
GSThread.h
GSUniformBufferOGL.h
GSUtil.h
GSVector.h
GSVertexArrayOGL.h
GSVertex.h
GSVertexHW.h
GSVertexList.h
GSVertexSW.h
GSVertexTrace.h
GSWnd.h
PSX/GPUDrawingEnvironment.h
PSX/GPUDrawScanlineCodeGenerator.h
PSX/GPUDrawScanline.h
PSX/GPU.h
PSX/GPULocalMemory.h
PSX/GPURenderer.h
PSX/GPURendererSW.h
@ -132,55 +193,6 @@ set(GSdxHeaders
PSX/GPUSetupPrimCodeGenerator.h
PSX/GPUState.h
PSX/GPUVertex.h
GS.h
GSAlignedClass.h
GSBlock.h
GSCapture.h
GSClut.h
GSCodeBuffer.h
GSCrc.h
GSDevice.h
GSDeviceOGL.h
GSDeviceNull.h
GSDirtyRect.h
GSDrawScanline.h
GSDrawScanlineCodeGenerator.h
GSDrawingContext.h
GSDrawingEnvironment.h
GSDump.h
GSFunctionMap.h
GSLocalMemory.h
GSPerfMon.h
GSRasterizer.h
GSRenderer.h
GSRendererNull.h
GSRendererSW.h
GSRendererHW.h
GSRendererOGL.h
GSScanlineEnvironment.h
GSSetting.h
GSSetupPrimCodeGenerator.h
GSState.h
GSTables.h
GSTexture.h
GSTextureCache.h
GSTextureCacheSW.h
GSTextureCacheOGL.h
GSTextureNull.h
GSThread.h
GSThread_CXX11.h
GSUtil.h
GSVector.h
GSVertex.h
GSVertexHW.h
GSVertexList.h
GSVertexSW.h
GSVertexTrace.h
GSWnd.h
GSWndOGL.h
GSWndEGL.h
GSdx.h
GSdxResources.h
res/glsl_source.h
stdafx.h
xbyak/xbyak.h
@ -188,6 +200,63 @@ set(GSdxHeaders
xbyak/xbyak_util.h
)
if(Windows)
LIST(APPEND GSdxSources
GSCaptureDlg.cpp
GSDevice11.cpp
GSDevice9.cpp
GSDeviceDX.cpp
GSDialog.cpp
GSRendererCS.cpp
GSRendererDX11.cpp
GSRendererDX9.cpp
GSRendererDX.cpp
GSSettingsDlg.cpp
GSTexture11.cpp
GSTexture9.cpp
GSTextureCache11.cpp
GSTextureCache9.cpp
GSTextureFX11.cpp
GSTextureFX9.cpp
GSTextureFX.cpp
GSVertexList.cpp
GSVertexSW.cpp
GSWndDX.cpp
GSWndWGL.cpp
PSX/GPUSettingsDlg.cpp
)
LIST(APPEND GSdxHeaders
GSDevice11.h
GSDevice9.h
GSDeviceDX.h
GSRendererDX11.h
GSRendererDX9.h
GSRendererDX.h
GSTexture11.h
GSTexture9.h
GSTextureCache11.h
GSTextureCache9.h
GSWndDX.h
GSWndWGL.h
PSX/GPUSettingsDlg.h
resource.h
targetver.h
)
else()
LIST(APPEND GSdxSources
GSLinuxDialog.cpp
GSWndOGL.cpp
GSWndEGL.cpp
)
LIST(APPEND GSdxHeaders
GSWndEGL.h
GSWndOGL.h
)
endif()
set(GSdxFinalSources
${GSdxSources}
${GSdxHeaders}

View File

@ -13,50 +13,87 @@ set(lilypadFinalFlags "")
# lilypad sources
set(lilypadSources
DeviceEnumerator.cpp
InputManager.cpp
KeyboardQueue.cpp
LilyPad.cpp
Linux/Config.cpp
Linux/ConfigHelper.cpp
Linux/JoyEvdev.cpp
Linux/KeyboardMouse.cpp
Linux/KeyboardQueue.cpp
)
DeviceEnumerator.cpp
InputManager.cpp
KeyboardQueue.cpp
LilyPad.cpp
)
# lilypad headers
# lilypad headers (I will let people split it between windows/linux, not sure it is useful)
set(lilypadHeaders
)
Config.h
DeviceEnumerator.h
Diagnostics.h
DirectInput.h
DualShock3.h
Global.h
HidDevice.h
InputManager.h
KeyboardQueue.h
Linux/bitmaskros.h
Linux/ConfigHelper.h
Linux/JoyEvdev.h
Linux/KeyboardMouse.h
RawInput.h
resource.h
Tooltips.h
usb.h
VKey.h
WindowsKeyboard.h
WindowsMessaging.h
WindowsMouse.h
WndProcEater.h
XInputEnum.h
)
# lilypad Linux sources
set(lilypadLinuxSources
)
if(Windows)
LIST(APPEND lilypadSources
Diagnostics.cpp
DirectInput.cpp
DualShock3.cpp
Global.cpp
HidDevice.cpp
RawInput.cpp
Tooltips.cpp
VKey.cpp
WindowsKeyboard.cpp
WindowsMessaging.cpp
WindowsMouse.cpp
WndProcEater.cpp
XInputEnum.cpp
)
# lilypad Linux headers
set(lilypadLinuxHeaders
)
else()
LIST(APPEND lilypadSources
Linux/Config.cpp
Linux/ConfigHelper.cpp
Linux/JoyEvdev.cpp
Linux/KeyboardMouse.cpp
Linux/KeyboardQueue.cpp
)
endif()
if (SDL2_API)
set(lilypadFinalLibs
${SDL2_LIBRARIES}
)
set(lilypadFinalLibs
${SDL2_LIBRARIES}
)
else()
set(lilypadFinalLibs
${SDL_LIBRARY}
)
set(lilypadFinalLibs
${SDL_LIBRARY}
)
endif()
set(lilypadFinalLibs
#${lilypadFinalLibs}
#${GTK2_LIBRARIES}
#${X11_LIBRARIES}
)
#${lilypadFinalLibs}
#${GTK2_LIBRARIES}
#${X11_LIBRARIES}
)
set(lilypadFinalSources
${lilypadSources}
${lilypadHeaders}
${lilypadLinuxSources}
${lilypadLinuxHeaders}
)
${lilypadSources}
${lilypadHeaders}
${lilypadLinuxSources}
${lilypadLinuxHeaders}
)
add_pcsx2_plugin(${Output} "${lilypadFinalSources}" "${lilypadFinalLibs}" "${lilypadFinalFlags}")

View File

@ -20,18 +20,24 @@ set(Headers
Settings.h
)
set(LinuxSources
Unix/GtkGui.cpp
Unix/LinuxConfig.cpp
Unix/LinuxIOCtlSrc.cpp
)
if(Windows)
LIST(APPEND Sources
Windows/config.cpp
Windows/resource.h
)
else()
LIST(APPEND Sources
Unix/GtkGui.cpp
Unix/LinuxConfig.cpp
Unix/LinuxIOCtlSrc.cpp
)
endif()
set(FinalSources
${Sources}
${Headers}
)
set(FinalSources ${FinalSources} ${LinuxSources})
set(FinalLibs
${GTK2_LIBRARIES}
${LIBC_LIBRARIES}

View File

@ -67,30 +67,49 @@ set(spu2xHeaders
WavFile.h
)
if(Windows)
LIST(APPEND spu2xSources
Windows/SndOut_waveOut.cpp
Windows/SndOut_DSound.cpp
Windows/SndOut_XAudio2_27.cpp
Windows/UIHelpers.cpp
Windows/RealtimeDebugger.cpp
Windows/dsp.cpp
Windows/SndOut_XAudio2.cpp
Windows/ConfigSoundtouch.cpp
)
# spu2x Linux sources
set(spu2xLinuxSources
Linux/AboutBox.cpp
Linux/Alsa.cpp
Linux/CfgHelpers.cpp
Linux/Config.cpp
Linux/ConfigDebug.cpp
Linux/ConfigSoundTouch.cpp
Linux/Dialogs.cpp)
LIST(APPEND spu2xHeaders
Windows/resource.h
Windows/WinConfig.h
Windows/dsp.h
)
# spu2x Linux headers
set(spu2xLinuxHeaders
Linux/Alsa.h
Linux/Config.h
Linux/Dialogs.h)
include_directories("Windows")
else()
LIST(APPEND spu2xSources
Linux/AboutBox.cpp
Linux/Alsa.cpp
Linux/CfgHelpers.cpp
Linux/Config.cpp
Linux/ConfigDebug.cpp
Linux/ConfigSoundTouch.cpp
Linux/Dialogs.cpp
)
LIST(APPEND spu2xHeaders
Linux/Alsa.h
Linux/Config.h
Linux/Dialogs.h
)
include_directories(Linux)
endif()
# add additional include directories
include_directories(Linux)
set(spu2xFinalSources
${spu2xSources}
${spu2xHeaders}
${spu2xLinuxSources}
${spu2xLinuxHeaders}
)