1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-22 12:33:29 +00:00

Merge pull request #1324 from ryandesign/cmake

Add CMake build system
This commit is contained in:
Thomas Harte 2024-02-09 14:36:00 -05:00 committed by GitHub
commit 472297e411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 424 additions and 4 deletions

View File

@ -1,8 +1,8 @@
name: Build
on: [pull_request]
jobs:
build-mac:
name: Mac UI on ${{ matrix.os }}
build-mac-xcodebuild:
name: Mac UI / xcodebuild / ${{ matrix.os }}
strategy:
matrix:
os: [macos-11, macos-12, macos-13, macos-14]
@ -13,8 +13,44 @@ jobs:
- name: Make
working-directory: OSBindings/Mac
run: xcodebuild CODE_SIGN_IDENTITY=-
build-sdl:
name: SDL UI on ${{ matrix.os }}
build-sdl-cmake:
name: SDL UI / cmake / ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install dependencies
shell: bash
run: |
case $RUNNER_OS in
Linux)
sudo apt-get --allow-releaseinfo-change update
sudo apt-get --fix-missing install cmake gcc-10 libsdl2-dev
;;
macOS)
brew install cmake sdl2
;;
esac
- name: Make
shell: bash
run: |
case $RUNNER_OS in
Linux)
jobs=$(nproc --all)
;;
macOS)
jobs=$(sysctl -n hw.activecpu)
;;
*)
jobs=1
esac
cmake -S. -Bbuild -DCLK_UI=SDL -DCMAKE_BUILD_TYPE=Release
cmake --build build -v -j"$jobs"
build-sdl-scons:
name: SDL UI / scons / ${{ matrix.os }}
strategy:
matrix:
os: [macos-11, macos-12, macos-13, macos-14, ubuntu-latest]

70
CMakeLists.txt Normal file
View File

@ -0,0 +1,70 @@
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
project(CLK
LANGUAGES CXX
VERSION 24.01.22
)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CLK_UIS "SDL")
#list(PREPEND CLK_UIS "QT")
#if(APPLE)
# list(PREPEND CLK_UIS "MAC")
# set(CLK_DEFAULT_UI "MAC")
#else()
set(CLK_DEFAULT_UI "SDL")
#endif()
set(CLK_UI ${CLK_DEFAULT_UI} CACHE STRING "User interface")
set_property(CACHE CLK_UI PROPERTY STRINGS ${CLK_UIS})
if(NOT CLK_UI IN_LIST CLK_UIS)
list(JOIN CLK_UIS ", " CLK_UIS_PRETTY)
message(FATAL_ERROR "Invalid value for 'CLK_UI'; must be one of ${CLK_UIS_PRETTY}")
endif()
message(STATUS "Configuring for ${CLK_UI} UI")
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include("CLK_SOURCES")
add_executable(clksignal ${CLK_SOURCES})
if(MSVC)
target_compile_options(clksignal PRIVATE /W4)
else()
# TODO: Add -Wpedandic.
target_compile_options(clksignal PRIVATE -Wall -Wextra)
endif()
find_package(ZLIB REQUIRED)
target_link_libraries(clksignal PRIVATE ZLIB::ZLIB)
if(CLK_UI STREQUAL "MAC")
enable_language(OBJC OBJCXX SWIFT)
# TODO: Build the Mac version.
else()
find_package(OpenGL REQUIRED)
target_link_libraries(clksignal PRIVATE OpenGL::GL)
if(APPLE)
target_compile_definitions(clksignal PRIVATE "GL_SILENCE_DEPRECATION" "IGNORE_APPLE")
endif()
endif()
if(CLK_UI STREQUAL "QT")
# TODO: Build the Qt version.
elseif(APPLE)
set(BLA_VENDOR Apple)
find_package(BLAS REQUIRED)
target_link_libraries(clksignal PRIVATE BLAS::BLAS)
endif()
if(CLK_UI STREQUAL "SDL")
find_package(SDL2 REQUIRED CONFIG REQUIRED COMPONENTS SDL2)
target_link_libraries(clksignal PRIVATE SDL2::SDL2)
endif()
# TODO: Investigate building on Windows.

256
cmake/CLK_SOURCES.cmake Normal file
View File

@ -0,0 +1,256 @@
# Generated by generate_CLK_SOURCES.
set(CLK_SOURCES
Analyser/Dynamic/ConfidenceCounter.cpp
Analyser/Dynamic/ConfidenceSummary.cpp
Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp
Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp
Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp
Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.cpp
Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.cpp
Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.cpp
Analyser/Dynamic/MultiMachine/MultiMachine.cpp
Analyser/Static/Acorn/Disk.cpp
Analyser/Static/Acorn/StaticAnalyser.cpp
Analyser/Static/Acorn/Tape.cpp
Analyser/Static/Amiga/StaticAnalyser.cpp
Analyser/Static/AmstradCPC/StaticAnalyser.cpp
Analyser/Static/AppleII/StaticAnalyser.cpp
Analyser/Static/AppleIIgs/StaticAnalyser.cpp
Analyser/Static/Atari2600/StaticAnalyser.cpp
Analyser/Static/AtariST/StaticAnalyser.cpp
Analyser/Static/Coleco/StaticAnalyser.cpp
Analyser/Static/Commodore/Disk.cpp
Analyser/Static/Commodore/File.cpp
Analyser/Static/Commodore/StaticAnalyser.cpp
Analyser/Static/Commodore/Tape.cpp
Analyser/Static/Disassembler/6502.cpp
Analyser/Static/Disassembler/Z80.cpp
Analyser/Static/DiskII/StaticAnalyser.cpp
Analyser/Static/Enterprise/StaticAnalyser.cpp
Analyser/Static/FAT12/StaticAnalyser.cpp
Analyser/Static/MSX/StaticAnalyser.cpp
Analyser/Static/MSX/Tape.cpp
Analyser/Static/Macintosh/StaticAnalyser.cpp
Analyser/Static/Oric/StaticAnalyser.cpp
Analyser/Static/Oric/Tape.cpp
Analyser/Static/PCCompatible/StaticAnalyser.cpp
Analyser/Static/Sega/StaticAnalyser.cpp
Analyser/Static/StaticAnalyser.cpp
Analyser/Static/ZX8081/StaticAnalyser.cpp
Analyser/Static/ZXSpectrum/StaticAnalyser.cpp
Components/1770/1770.cpp
Components/5380/ncr5380.cpp
Components/6522/Implementation/IRQDelegatePortHandler.cpp
Components/6560/6560.cpp
Components/6850/6850.cpp
Components/68901/MFP68901.cpp
Components/8272/i8272.cpp
Components/8530/z8530.cpp
Components/9918/Implementation/9918.cpp
Components/AY38910/AY38910.cpp
Components/AudioToggle/AudioToggle.cpp
Components/DiskII/DiskII.cpp
Components/DiskII/DiskIIDrive.cpp
Components/DiskII/IWM.cpp
Components/DiskII/MacintoshDoubleDensityDrive.cpp
Components/KonamiSCC/KonamiSCC.cpp
Components/OPx/OPLL.cpp
Components/RP5C01/RP5C01.cpp
Components/SN76489/SN76489.cpp
Components/Serial/Line.cpp
Inputs/Keyboard.cpp
InstructionSets/M50740/Decoder.cpp
InstructionSets/M50740/Executor.cpp
InstructionSets/M68k/Decoder.cpp
InstructionSets/M68k/Instruction.cpp
InstructionSets/PowerPC/Decoder.cpp
InstructionSets/x86/Decoder.cpp
InstructionSets/x86/Instruction.cpp
Machines/Amiga/Amiga.cpp
Machines/Amiga/Audio.cpp
Machines/Amiga/Bitplanes.cpp
Machines/Amiga/Blitter.cpp
Machines/Amiga/Chipset.cpp
Machines/Amiga/Copper.cpp
Machines/Amiga/Disk.cpp
Machines/Amiga/Keyboard.cpp
Machines/Amiga/MouseJoystick.cpp
Machines/Amiga/Sprites.cpp
Machines/AmstradCPC/AmstradCPC.cpp
Machines/AmstradCPC/Keyboard.cpp
Machines/Apple/ADB/Bus.cpp
Machines/Apple/ADB/Keyboard.cpp
Machines/Apple/ADB/Mouse.cpp
Machines/Apple/ADB/ReactiveDevice.cpp
Machines/Apple/AppleII/AppleII.cpp
Machines/Apple/AppleII/DiskIICard.cpp
Machines/Apple/AppleII/Joystick.cpp
Machines/Apple/AppleII/SCSICard.cpp
Machines/Apple/AppleII/Video.cpp
Machines/Apple/AppleIIgs/ADB.cpp
Machines/Apple/AppleIIgs/AppleIIgs.cpp
Machines/Apple/AppleIIgs/MemoryMap.cpp
Machines/Apple/AppleIIgs/Sound.cpp
Machines/Apple/AppleIIgs/Video.cpp
Machines/Apple/Macintosh/Audio.cpp
Machines/Apple/Macintosh/DriveSpeedAccumulator.cpp
Machines/Apple/Macintosh/Keyboard.cpp
Machines/Apple/Macintosh/Macintosh.cpp
Machines/Apple/Macintosh/Video.cpp
Machines/Atari/2600/Atari2600.cpp
Machines/Atari/2600/TIA.cpp
Machines/Atari/2600/TIASound.cpp
Machines/Atari/ST/AtariST.cpp
Machines/Atari/ST/DMAController.cpp
Machines/Atari/ST/IntelligentKeyboard.cpp
Machines/Atari/ST/Video.cpp
Machines/ColecoVision/ColecoVision.cpp
Machines/Commodore/1540/Implementation/C1540.cpp
Machines/Commodore/SerialBus.cpp
Machines/Commodore/Vic-20/Keyboard.cpp
Machines/Commodore/Vic-20/Vic20.cpp
Machines/Electron/Electron.cpp
Machines/Electron/Keyboard.cpp
Machines/Electron/Plus3.cpp
Machines/Electron/SoundGenerator.cpp
Machines/Electron/Tape.cpp
Machines/Electron/Video.cpp
Machines/Enterprise/Dave.cpp
Machines/Enterprise/EXDos.cpp
Machines/Enterprise/Enterprise.cpp
Machines/Enterprise/Keyboard.cpp
Machines/Enterprise/Nick.cpp
Machines/KeyboardMachine.cpp
Machines/MSX/DiskROM.cpp
Machines/MSX/Keyboard.cpp
Machines/MSX/MSX.cpp
Machines/MSX/MemorySlotHandler.cpp
Machines/MasterSystem/MasterSystem.cpp
Machines/Oric/BD500.cpp
Machines/Oric/Jasmin.cpp
Machines/Oric/Keyboard.cpp
Machines/Oric/Microdisc.cpp
Machines/Oric/Oric.cpp
Machines/Oric/Video.cpp
Machines/PCCompatible/PCCompatible.cpp
Machines/Sinclair/Keyboard/Keyboard.cpp
Machines/Sinclair/ZX8081/Video.cpp
Machines/Sinclair/ZX8081/ZX8081.cpp
Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
Machines/Utility/MachineForTarget.cpp
Machines/Utility/MemoryFuzzer.cpp
Machines/Utility/MemoryPacker.cpp
Machines/Utility/ROMCatalogue.cpp
Machines/Utility/StringSerialiser.cpp
Machines/Utility/Typer.cpp
Outputs/CRT/CRT.cpp
Outputs/DisplayMetrics.cpp
Outputs/OpenGL/Primitives/Rectangle.cpp
Outputs/OpenGL/Primitives/Shader.cpp
Outputs/OpenGL/Primitives/TextureTarget.cpp
Outputs/OpenGL/ScanTarget.cpp
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
Outputs/ScanTarget.cpp
Outputs/ScanTargets/BufferingScanTarget.cpp
Processors/6502/Implementation/6502Storage.cpp
Processors/6502/State/State.cpp
Processors/65816/Implementation/65816Base.cpp
Processors/65816/Implementation/65816Storage.cpp
Processors/Z80/Implementation/PartialMachineCycle.cpp
Processors/Z80/Implementation/Z80Base.cpp
Processors/Z80/Implementation/Z80Storage.cpp
Processors/Z80/State/State.cpp
Reflection/Struct.cpp
SignalProcessing/FIRFilter.cpp
Storage/Cartridge/Cartridge.cpp
Storage/Cartridge/Encodings/CommodoreROM.cpp
Storage/Cartridge/Formats/BinaryDump.cpp
Storage/Cartridge/Formats/PRG.cpp
Storage/Data/Commodore.cpp
Storage/Data/ZX8081.cpp
Storage/Disk/Controller/DiskController.cpp
Storage/Disk/Controller/MFMDiskController.cpp
Storage/Disk/DiskImage/Formats/2MG.cpp
Storage/Disk/DiskImage/Formats/AcornADF.cpp
Storage/Disk/DiskImage/Formats/AmigaADF.cpp
Storage/Disk/DiskImage/Formats/AppleDSK.cpp
Storage/Disk/DiskImage/Formats/CPCDSK.cpp
Storage/Disk/DiskImage/Formats/D64.cpp
Storage/Disk/DiskImage/Formats/DMK.cpp
Storage/Disk/DiskImage/Formats/FAT12.cpp
Storage/Disk/DiskImage/Formats/G64.cpp
Storage/Disk/DiskImage/Formats/HFE.cpp
Storage/Disk/DiskImage/Formats/IMD.cpp
Storage/Disk/DiskImage/Formats/IPF.cpp
Storage/Disk/DiskImage/Formats/MFMSectorDump.cpp
Storage/Disk/DiskImage/Formats/MSA.cpp
Storage/Disk/DiskImage/Formats/MacintoshIMG.cpp
Storage/Disk/DiskImage/Formats/NIB.cpp
Storage/Disk/DiskImage/Formats/OricMFMDSK.cpp
Storage/Disk/DiskImage/Formats/PCBooter.cpp
Storage/Disk/DiskImage/Formats/SSD.cpp
Storage/Disk/DiskImage/Formats/STX.cpp
Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp
Storage/Disk/DiskImage/Formats/WOZ.cpp
Storage/Disk/Drive.cpp
Storage/Disk/Encodings/AppleGCR/Encoder.cpp
Storage/Disk/Encodings/AppleGCR/SegmentParser.cpp
Storage/Disk/Encodings/CommodoreGCR.cpp
Storage/Disk/Encodings/MFM/Encoder.cpp
Storage/Disk/Encodings/MFM/Parser.cpp
Storage/Disk/Encodings/MFM/SegmentParser.cpp
Storage/Disk/Encodings/MFM/Shifter.cpp
Storage/Disk/Parsers/CPM.cpp
Storage/Disk/Parsers/FAT.cpp
Storage/Disk/Track/PCMSegment.cpp
Storage/Disk/Track/PCMTrack.cpp
Storage/Disk/Track/TrackSerialiser.cpp
Storage/Disk/Track/UnformattedTrack.cpp
Storage/FileHolder.cpp
Storage/MassStorage/Encodings/MacintoshVolume.cpp
Storage/MassStorage/Formats/DAT.cpp
Storage/MassStorage/Formats/DSK.cpp
Storage/MassStorage/Formats/HDV.cpp
Storage/MassStorage/Formats/HFV.cpp
Storage/MassStorage/MassStorageDevice.cpp
Storage/MassStorage/SCSI/DirectAccessDevice.cpp
Storage/MassStorage/SCSI/SCSI.cpp
Storage/MassStorage/SCSI/Target.cpp
Storage/State/SNA.cpp
Storage/State/SZX.cpp
Storage/State/Z80.cpp
Storage/Tape/Formats/CAS.cpp
Storage/Tape/Formats/CSW.cpp
Storage/Tape/Formats/CommodoreTAP.cpp
Storage/Tape/Formats/OricTAP.cpp
Storage/Tape/Formats/TZX.cpp
Storage/Tape/Formats/TapePRG.cpp
Storage/Tape/Formats/TapeUEF.cpp
Storage/Tape/Formats/ZX80O81P.cpp
Storage/Tape/Formats/ZXSpectrumTAP.cpp
Storage/Tape/Parsers/Acorn.cpp
Storage/Tape/Parsers/Commodore.cpp
Storage/Tape/Parsers/MSX.cpp
Storage/Tape/Parsers/Oric.cpp
Storage/Tape/Parsers/Spectrum.cpp
Storage/Tape/Parsers/ZX8081.cpp
Storage/Tape/PulseQueuedTape.cpp
Storage/Tape/Tape.cpp
Storage/TimedEventLoop.cpp
)
if(CLK_UI STREQUAL "SDL")
list(APPEND CLK_SOURCES
OSBindings/SDL/main.cpp
)
endif()

58
cmake/generate_CLK_SOURCES Executable file
View File

@ -0,0 +1,58 @@
#!/usr/bin/env bash
# Run this script to regenerate CLK_SOURCES.cmake after you add or remove any
# source files.
set -euo pipefail
script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
top_dir="$script_dir/.."
out="$script_dir/CLK_SOURCES.cmake"
trap 'rm -f "$tmp"' EXIT
tmp=$(mktemp "$out.XXXXXXXX")
awkscript='
BEGIN {
print ind pre "CLK_SOURCES"
}
{
if (NR > 1 && last != $1)
print ""
last = $1
sub("^", ind "\t")
print
}
END {
print ind ")"
}
'
write_sources() {
local ind="$1"
local pre="$2"
shift 2
find -s "$@" | awk -F/ -vind="$ind" -vpre="$pre" "$awkscript" || exit $?
}
cd "$top_dir"
printf '# Generated by %s.\n\n' "${BASH_SOURCE[0]##*/}" > "$tmp"
write_sources '' 'set(' [A-Z]* -name OSBindings -prune -o \
-name '*AllRAM*.cpp' -prune -o -name '*.cpp' -print >> "$tmp"
# TODO: Add 'Mac/Clock Signal'
# TODO: Add Qt
for dir in SDL; do
ui=$(echo "${dir%%/*}" | tr '[:lower:]' '[:upper:]')
dir="OSBindings/$dir"
printf '\nif(CLK_UI STREQUAL "%s")\n' "$ui" >> "$tmp"
if [[ $ui = "MAC" ]]; then
args=('-name' '*.m' '-o' '-name' '*.metal' '-o' '-name' '*.mm' '-o' '-name' '*.swift')
else
args=('-name' '*.cpp')
fi
write_sources $'\t' 'list(APPEND ' "$dir" "${args[@]}" >> "$tmp"
printf 'endif()\n' >> "$tmp"
done
mv "$tmp" "$out"