mirror of
https://github.com/izzy2lost/dolphin.git
synced 2026-06-19 01:16:48 -07:00
Merge pull request #4995 from lioncash/normalize
CMakeLists: Normalize whitespace
This commit is contained in:
+516
-516
File diff suppressed because it is too large
Load Diff
@@ -20,18 +20,18 @@ add_definitions(-D__STDC_LIMIT_MACROS)
|
||||
add_definitions(-D__STDC_CONSTANT_MACROS)
|
||||
|
||||
macro(add_dolphin_library lib srcs libs)
|
||||
add_library(${lib} STATIC ${srcs})
|
||||
target_link_libraries(${lib} PUBLIC ${libs})
|
||||
add_library(${lib} STATIC ${srcs})
|
||||
target_link_libraries(${lib} PUBLIC ${libs})
|
||||
endmacro()
|
||||
|
||||
add_subdirectory(Core)
|
||||
if (ANDROID)
|
||||
add_subdirectory(Android/jni)
|
||||
add_subdirectory(Android/jni)
|
||||
endif()
|
||||
add_subdirectory(UnitTests)
|
||||
|
||||
if (DSPTOOL)
|
||||
add_subdirectory(DSPTool)
|
||||
add_subdirectory(DSPTool)
|
||||
endif()
|
||||
|
||||
# TODO: Add DSPSpy. Preferably make it option() and cpack component
|
||||
|
||||
@@ -9,5 +9,5 @@ add_subdirectory(VideoCommon)
|
||||
add_subdirectory(VideoBackends)
|
||||
|
||||
if(ENABLE_QT2)
|
||||
add_subdirectory(DolphinQt2)
|
||||
add_subdirectory(DolphinQt2)
|
||||
endif()
|
||||
|
||||
@@ -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()
|
||||
|
||||
+306
-302
File diff suppressed because it is too large
Load Diff
@@ -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}" "")
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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})
|
||||
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)
|
||||
# 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})
|
||||
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)
|
||||
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})
|
||||
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()
|
||||
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()
|
||||
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)
|
||||
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
|
||||
)
|
||||
# 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()
|
||||
# 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})
|
||||
# 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()
|
||||
# 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})
|
||||
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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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}")
|
||||
|
||||
@@ -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}")
|
||||
|
||||
@@ -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}")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
add_executable(dsptool DSPTool.cpp)
|
||||
target_link_libraries(dsptool core)
|
||||
if(NOT APPLE)
|
||||
install(TARGETS dsptool RUNTIME DESTINATION ${bindir})
|
||||
install(TARGETS dsptool RUNTIME DESTINATION ${bindir})
|
||||
endif()
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
set(LIBS core gtest_main)
|
||||
if(APPLE)
|
||||
list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY})
|
||||
list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY})
|
||||
endif()
|
||||
if(ANDROID)
|
||||
set(LIBS ${LIBS} android log)
|
||||
set(LIBS ${LIBS} android log)
|
||||
endif()
|
||||
file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
|
||||
macro(add_dolphin_test target srcs)
|
||||
# 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
|
||||
# core, but before other core dependencies like videocommon which also use
|
||||
# Host_ functions.
|
||||
set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp)
|
||||
add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2})
|
||||
set_target_properties(Test_${target} PROPERTIES
|
||||
OUTPUT_NAME Tests/${target}
|
||||
FOLDER Tests
|
||||
)
|
||||
target_link_libraries(Test_${target} ${LIBS})
|
||||
add_dependencies(unittests Test_${target})
|
||||
add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target})
|
||||
# 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
|
||||
# core, but before other core dependencies like videocommon which also use
|
||||
# Host_ functions.
|
||||
set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp)
|
||||
add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2})
|
||||
set_target_properties(Test_${target} PROPERTIES
|
||||
OUTPUT_NAME Tests/${target}
|
||||
FOLDER Tests
|
||||
)
|
||||
target_link_libraries(Test_${target} ${LIBS})
|
||||
add_dependencies(unittests Test_${target})
|
||||
add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target})
|
||||
endmacro()
|
||||
|
||||
add_subdirectory(TestUtils)
|
||||
|
||||
Reference in New Issue
Block a user