From d91cf598be24a880ed1fdfd7df595a86659b0b20 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 11 Jul 2020 15:19:15 -0400 Subject: [PATCH] Ensures qmake paths are explicit. --- OSBindings/Qt/ClockSignal.pro | 386 +++++++++++++++++----------------- 1 file changed, 194 insertions(+), 192 deletions(-) diff --git a/OSBindings/Qt/ClockSignal.pro b/OSBindings/Qt/ClockSignal.pro index 7b92a5e97..aa1b8b624 100644 --- a/OSBindings/Qt/ClockSignal.pro +++ b/OSBindings/Qt/ClockSignal.pro @@ -19,102 +19,104 @@ QMAKE_CXXFLAGS_RELEASE += -DNDEBUG DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 +SRC = $$PWD/../.. + SOURCES += \ - ../../Analyser/Dynamic/*.cpp \ - ../../Analyser/Dynamic/MultiMachine/*.cpp \ - ../../Analyser/Dynamic/MultiMachine/Implementation/*.cpp \ + $$SRC/Analyser/Dynamic/*.cpp \ + $$SRC/Analyser/Dynamic/MultiMachine/*.cpp \ + $$SRC/Analyser/Dynamic/MultiMachine/Implementation/*.cpp \ \ - ../../Analyser/Static/*.cpp \ - ../../Analyser/Static/Acorn/*.cpp \ - ../../Analyser/Static/AmstradCPC/*.cpp \ - ../../Analyser/Static/AppleII/*.cpp \ - ../../Analyser/Static/Atari2600/*.cpp \ - ../../Analyser/Static/AtariST/*.cpp \ - ../../Analyser/Static/Coleco/*.cpp \ - ../../Analyser/Static/Commodore/*.cpp \ - ../../Analyser/Static/Disassembler/*.cpp \ - ../../Analyser/Static/DiskII/*.cpp \ - ../../Analyser/Static/Macintosh/*.cpp \ - ../../Analyser/Static/MSX/*.cpp \ - ../../Analyser/Static/Oric/*.cpp \ - ../../Analyser/Static/Sega/*.cpp \ - ../../Analyser/Static/ZX8081/*.cpp \ + $$SRC/Analyser/Static/*.cpp \ + $$SRC/Analyser/Static/Acorn/*.cpp \ + $$SRC/Analyser/Static/AmstradCPC/*.cpp \ + $$SRC/Analyser/Static/AppleII/*.cpp \ + $$SRC/Analyser/Static/Atari2600/*.cpp \ + $$SRC/Analyser/Static/AtariST/*.cpp \ + $$SRC/Analyser/Static/Coleco/*.cpp \ + $$SRC/Analyser/Static/Commodore/*.cpp \ + $$SRC/Analyser/Static/Disassembler/*.cpp \ + $$SRC/Analyser/Static/DiskII/*.cpp \ + $$SRC/Analyser/Static/Macintosh/*.cpp \ + $$SRC/Analyser/Static/MSX/*.cpp \ + $$SRC/Analyser/Static/Oric/*.cpp \ + $$SRC/Analyser/Static/Sega/*.cpp \ + $$SRC/Analyser/Static/ZX8081/*.cpp \ \ - ../../Components/1770/*.cpp \ - ../../Components/5380/*.cpp \ - ../../Components/6522/Implementation/*.cpp \ - ../../Components/6560/*.cpp \ - ../../Components/6850/*.cpp \ - ../../Components/68901/*.cpp \ - ../../Components/8272/*.cpp \ - ../../Components/8530/*.cpp \ - ../../Components/9918/*.cpp \ - ../../Components/AudioToggle/*.cpp \ - ../../Components/AY38910/*.cpp \ - ../../Components/DiskII/*.cpp \ - ../../Components/KonamiSCC/*.cpp \ - ../../Components/OPx/*.cpp \ - ../../Components/SN76489/*.cpp \ - ../../Components/Serial/*.cpp \ + $$SRC/Components/1770/*.cpp \ + $$SRC/Components/5380/*.cpp \ + $$SRC/Components/6522/Implementation/*.cpp \ + $$SRC/Components/6560/*.cpp \ + $$SRC/Components/6850/*.cpp \ + $$SRC/Components/68901/*.cpp \ + $$SRC/Components/8272/*.cpp \ + $$SRC/Components/8530/*.cpp \ + $$SRC/Components/9918/*.cpp \ + $$SRC/Components/AudioToggle/*.cpp \ + $$SRC/Components/AY38910/*.cpp \ + $$SRC/Components/DiskII/*.cpp \ + $$SRC/Components/KonamiSCC/*.cpp \ + $$SRC/Components/OPx/*.cpp \ + $$SRC/Components/SN76489/*.cpp \ + $$SRC/Components/Serial/*.cpp \ \ - ../../Concurrency/*.cpp \ + $$SRC/Concurrency/*.cpp \ \ - ../../Inputs/*.cpp \ + $$SRC/Inputs/*.cpp \ \ - ../../Machines/*.cpp \ - ../../Machines/AmstradCPC/*.cpp \ - ../../Machines/Apple/AppleII/*.cpp \ - ../../Machines/Apple/Macintosh/*.cpp \ - ../../Machines/Atari/2600/*.cpp \ - ../../Machines/Atari/ST/*.cpp \ - ../../Machines/ColecoVision/*.cpp \ - ../../Machines/Commodore/*.cpp \ - ../../Machines/Commodore/1540/Implementation/*.cpp \ - ../../Machines/Commodore/Vic-20/*.cpp \ - ../../Machines/Electron/*.cpp \ - ../../Machines/MasterSystem/*.cpp \ - ../../Machines/MSX/*.cpp \ - ../../Machines/Oric/*.cpp \ - ../../Machines/Utility/*.cpp \ - ../../Machines/ZX8081/*.cpp \ + $$SRC/Machines/*.cpp \ + $$SRC/Machines/AmstradCPC/*.cpp \ + $$SRC/Machines/Apple/AppleII/*.cpp \ + $$SRC/Machines/Apple/Macintosh/*.cpp \ + $$SRC/Machines/Atari/2600/*.cpp \ + $$SRC/Machines/Atari/ST/*.cpp \ + $$SRC/Machines/ColecoVision/*.cpp \ + $$SRC/Machines/Commodore/*.cpp \ + $$SRC/Machines/Commodore/1540/Implementation/*.cpp \ + $$SRC/Machines/Commodore/Vic-20/*.cpp \ + $$SRC/Machines/Electron/*.cpp \ + $$SRC/Machines/MasterSystem/*.cpp \ + $$SRC/Machines/MSX/*.cpp \ + $$SRC/Machines/Oric/*.cpp \ + $$SRC/Machines/Utility/*.cpp \ + $$SRC/Machines/ZX8081/*.cpp \ \ - ../../Outputs/*.cpp \ - ../../Outputs/CRT/*.cpp \ - ../../Outputs/OpenGL/*.cpp \ - ../../Outputs/OpenGL/Primitives/*.cpp \ + $$SRC/Outputs/*.cpp \ + $$SRC/Outputs/CRT/*.cpp \ + $$SRC/Outputs/OpenGL/*.cpp \ + $$SRC/Outputs/OpenGL/Primitives/*.cpp \ \ - ../../Processors/6502/Implementation/*.cpp \ - ../../Processors/6502/State/*.cpp \ - ../../Processors/68000/Implementation/*.cpp \ - ../../Processors/68000/State/*.cpp \ - ../../Processors/Z80/Implementation/*.cpp \ - ../../Processors/Z80/State/*.cpp \ + $$SRC/Processors/6502/Implementation/*.cpp \ + $$SRC/Processors/6502/State/*.cpp \ + $$SRC/Processors/68000/Implementation/*.cpp \ + $$SRC/Processors/68000/State/*.cpp \ + $$SRC/Processors/Z80/Implementation/*.cpp \ + $$SRC/Processors/Z80/State/*.cpp \ \ - ../../Reflection/*.cpp \ + $$SRC/Reflection/*.cpp \ \ - ../../SignalProcessing/*.cpp \ + $$SRC/SignalProcessing/*.cpp \ \ - ../../Storage/*.cpp \ - ../../Storage/Cartridge/*.cpp \ - ../../Storage/Cartridge/Encodings/*.cpp \ - ../../Storage/Cartridge/Formats/*.cpp \ - ../../Storage/Data/*.cpp \ - ../../Storage/Disk/*.cpp \ - ../../Storage/Disk/Controller/*.cpp \ - ../../Storage/Disk/DiskImage/Formats/*.cpp \ - ../../Storage/Disk/DiskImage/Formats/Utility/*.cpp \ - ../../Storage/Disk/Encodings/*.cpp \ - ../../Storage/Disk/Encodings/AppleGCR/*.cpp \ - ../../Storage/Disk/Encodings/MFM/*.cpp \ - ../../Storage/Disk/Parsers/*.cpp \ - ../../Storage/Disk/Track/*.cpp \ - ../../Storage/MassStorage/*.cpp \ - ../../Storage/MassStorage/Encodings/*.cpp \ - ../../Storage/MassStorage/Formats/*.cpp \ - ../../Storage/MassStorage/SCSI/*.cpp \ - ../../Storage/Tape/*.cpp \ - ../../Storage/Tape/Formats/*.cpp \ - ../../Storage/Tape/Parsers/*.cpp \ + $$SRC/Storage/*.cpp \ + $$SRC/Storage/Cartridge/*.cpp \ + $$SRC/Storage/Cartridge/Encodings/*.cpp \ + $$SRC/Storage/Cartridge/Formats/*.cpp \ + $$SRC/Storage/Data/*.cpp \ + $$SRC/Storage/Disk/*.cpp \ + $$SRC/Storage/Disk/Controller/*.cpp \ + $$SRC/Storage/Disk/DiskImage/Formats/*.cpp \ + $$SRC/Storage/Disk/DiskImage/Formats/Utility/*.cpp \ + $$SRC/Storage/Disk/Encodings/*.cpp \ + $$SRC/Storage/Disk/Encodings/AppleGCR/*.cpp \ + $$SRC/Storage/Disk/Encodings/MFM/*.cpp \ + $$SRC/Storage/Disk/Parsers/*.cpp \ + $$SRC/Storage/Disk/Track/*.cpp \ + $$SRC/Storage/MassStorage/*.cpp \ + $$SRC/Storage/MassStorage/Encodings/*.cpp \ + $$SRC/Storage/MassStorage/Formats/*.cpp \ + $$SRC/Storage/MassStorage/SCSI/*.cpp \ + $$SRC/Storage/Tape/*.cpp \ + $$SRC/Storage/Tape/Formats/*.cpp \ + $$SRC/Storage/Tape/Parsers/*.cpp \ \ main.cpp \ mainwindow.cpp \ @@ -122,125 +124,125 @@ SOURCES += \ timer.cpp HEADERS += \ - ../../Activity/*.hpp \ + $$SRC/Activity/*.hpp \ \ - ../../Analyser/*.hpp \ - ../../Analyser/Dynamic/*.hpp \ - ../../Analyser/Dynamic/MultiMachine/*.hpp \ - ../../Analyser/Dynamic/MultiMachine/Implementation/*.hpp \ + $$SRC/Analyser/*.hpp \ + $$SRC/Analyser/Dynamic/*.hpp \ + $$SRC/Analyser/Dynamic/MultiMachine/*.hpp \ + $$SRC/Analyser/Dynamic/MultiMachine/Implementation/*.hpp \ \ - ../../Analyser/Static/*.hpp \ - ../../Analyser/Static/Acorn/*.hpp \ - ../../Analyser/Static/AmstradCPC/*.hpp \ - ../../Analyser/Static/AppleII/*.hpp \ - ../../Analyser/Static/Atari2600/*.hpp \ - ../../Analyser/Static/AtariST/*.hpp \ - ../../Analyser/Static/Coleco/*.hpp \ - ../../Analyser/Static/Commodore/*.hpp \ - ../../Analyser/Static/Disassembler/*.hpp \ - ../../Analyser/Static/DiskII/*.hpp \ - ../../Analyser/Static/Macintosh/*.hpp \ - ../../Analyser/Static/MSX/*.hpp \ - ../../Analyser/Static/Oric/*.hpp \ - ../../Analyser/Static/Sega/*.hpp \ - ../../Analyser/Static/ZX8081/*.hpp \ + $$SRC/Analyser/Static/*.hpp \ + $$SRC/Analyser/Static/Acorn/*.hpp \ + $$SRC/Analyser/Static/AmstradCPC/*.hpp \ + $$SRC/Analyser/Static/AppleII/*.hpp \ + $$SRC/Analyser/Static/Atari2600/*.hpp \ + $$SRC/Analyser/Static/AtariST/*.hpp \ + $$SRC/Analyser/Static/Coleco/*.hpp \ + $$SRC/Analyser/Static/Commodore/*.hpp \ + $$SRC/Analyser/Static/Disassembler/*.hpp \ + $$SRC/Analyser/Static/DiskII/*.hpp \ + $$SRC/Analyser/Static/Macintosh/*.hpp \ + $$SRC/Analyser/Static/MSX/*.hpp \ + $$SRC/Analyser/Static/Oric/*.hpp \ + $$SRC/Analyser/Static/Sega/*.hpp \ + $$SRC/Analyser/Static/ZX8081/*.hpp \ \ - ../../ClockReceiver/*.hpp \ + $$SRC/ClockReceiver/*.hpp \ \ - ../../Components/1770/*.hpp \ - ../../Components/5380/*.hpp \ - ../../Components/6522/*.hpp \ - ../../Components/6522/Implementation/*.hpp \ - ../../Components/6532/*.hpp \ - ../../Components/6560/*.hpp \ - ../../Components/6845/*.hpp \ - ../../Components/6850/*.hpp \ - ../../Components/8255/*.hpp \ - ../../Components/8272/*.hpp \ - ../../Components/8530/*.hpp \ - ../../Components/9918/*.hpp \ - ../../Components/9918/Implementation/*.hpp \ - ../../Components/68901/*.hpp \ - ../../Components/AudioToggle/*.hpp \ - ../../Components/AY38910/*.hpp \ - ../../Components/DiskII/*.hpp \ - ../../Components/KonamiSCC/*.hpp \ - ../../Components/OPx/*.hpp \ - ../../Components/OPx/Implementation/*.hpp \ - ../../Components/Serial/*.hpp \ - ../../Components/SN76489/*.hpp \ + $$SRC/Components/1770/*.hpp \ + $$SRC/Components/5380/*.hpp \ + $$SRC/Components/6522/*.hpp \ + $$SRC/Components/6522/Implementation/*.hpp \ + $$SRC/Components/6532/*.hpp \ + $$SRC/Components/6560/*.hpp \ + $$SRC/Components/6845/*.hpp \ + $$SRC/Components/6850/*.hpp \ + $$SRC/Components/8255/*.hpp \ + $$SRC/Components/8272/*.hpp \ + $$SRC/Components/8530/*.hpp \ + $$SRC/Components/9918/*.hpp \ + $$SRC/Components/9918/Implementation/*.hpp \ + $$SRC/Components/68901/*.hpp \ + $$SRC/Components/AudioToggle/*.hpp \ + $$SRC/Components/AY38910/*.hpp \ + $$SRC/Components/DiskII/*.hpp \ + $$SRC/Components/KonamiSCC/*.hpp \ + $$SRC/Components/OPx/*.hpp \ + $$SRC/Components/OPx/Implementation/*.hpp \ + $$SRC/Components/Serial/*.hpp \ + $$SRC/Components/SN76489/*.hpp \ \ - ../../Concurrency/*.hpp \ + $$SRC/Concurrency/*.hpp \ \ - ../../Configurable/*.hpp \ + $$SRC/Configurable/*.hpp \ \ - ../../Inputs/*.hpp \ - ../../Inputs/QuadratureMouse/*.hpp \ + $$SRC/Inputs/*.hpp \ + $$SRC/Inputs/QuadratureMouse/*.hpp \ \ - ../../Machines/*.hpp \ - ../../Machines/AmstradCPC/*.hpp \ - ../../Machines/Apple/AppleII/*.hpp \ - ../../Machines/Apple/Macintosh/*.hpp \ - ../../Machines/Atari/2600/*.hpp \ - ../../Machines/Atari/ST/*.hpp \ - ../../Machines/ColecoVision/*.hpp \ - ../../Machines/Commodore/*.hpp \ - ../../Machines/Commodore/1540/Implementation/*.hpp \ - ../../Machines/Commodore/Vic-20/*.hpp \ - ../../Machines/Electron/*.hpp \ - ../../Machines/MasterSystem/*.hpp \ - ../../Machines/MSX/*.hpp \ - ../../Machines/Oric/*.hpp \ - ../../Machines/Utility/*.hpp \ - ../../Machines/ZX8081/*.hpp \ + $$SRC/Machines/*.hpp \ + $$SRC/Machines/AmstradCPC/*.hpp \ + $$SRC/Machines/Apple/AppleII/*.hpp \ + $$SRC/Machines/Apple/Macintosh/*.hpp \ + $$SRC/Machines/Atari/2600/*.hpp \ + $$SRC/Machines/Atari/ST/*.hpp \ + $$SRC/Machines/ColecoVision/*.hpp \ + $$SRC/Machines/Commodore/*.hpp \ + $$SRC/Machines/Commodore/1540/Implementation/*.hpp \ + $$SRC/Machines/Commodore/Vic-20/*.hpp \ + $$SRC/Machines/Electron/*.hpp \ + $$SRC/Machines/MasterSystem/*.hpp \ + $$SRC/Machines/MSX/*.hpp \ + $$SRC/Machines/Oric/*.hpp \ + $$SRC/Machines/Utility/*.hpp \ + $$SRC/Machines/ZX8081/*.hpp \ \ - ../../Numeric/*.hpp \ + $$SRC/Numeric/*.hpp \ \ - ../../Outputs/*.hpp \ - ../../Outputs/CRT/*.hpp \ - ../../Outputs/CRT/Internals/*.hpp \ - ../../Outputs/OpenGL/*.hpp \ - ../../Outputs/OpenGL/Primitives/*.hpp \ - ../../Outputs/Speaker/*.hpp \ - ../../Outputs/Speaker/Implementation/*.hpp \ + $$SRC/Outputs/*.hpp \ + $$SRC/Outputs/CRT/*.hpp \ + $$SRC/Outputs/CRT/Internals/*.hpp \ + $$SRC/Outputs/OpenGL/*.hpp \ + $$SRC/Outputs/OpenGL/Primitives/*.hpp \ + $$SRC/Outputs/Speaker/*.hpp \ + $$SRC/Outputs/Speaker/Implementation/*.hpp \ \ - ../../Processors/6502/*.hpp \ - ../../Processors/6502/Implementation/*.hpp \ - ../../Processors/6502/State/*.hpp \ - ../../Processors/68000/*.hpp \ - ../../Processors/68000/Implementation/*.hpp \ - ../../Processors/68000/State/*.hpp \ - ../../Processors/Z80/*.hpp \ - ../../Processors/Z80/Implementation/*.hpp \ - ../../Processors/Z80/State/*.hpp \ + $$SRC/Processors/6502/*.hpp \ + $$SRC/Processors/6502/Implementation/*.hpp \ + $$SRC/Processors/6502/State/*.hpp \ + $$SRC/Processors/68000/*.hpp \ + $$SRC/Processors/68000/Implementation/*.hpp \ + $$SRC/Processors/68000/State/*.hpp \ + $$SRC/Processors/Z80/*.hpp \ + $$SRC/Processors/Z80/Implementation/*.hpp \ + $$SRC/Processors/Z80/State/*.hpp \ \ - ../../Reflection/*.hpp \ + $$SRC/Reflection/*.hpp \ \ - ../../SignalProcessing/*.hpp \ + $$SRC/SignalProcessing/*.hpp \ \ - ../../Storage/*.hpp \ - ../../Storage/Cartridge/*.hpp \ - ../../Storage/Cartridge/Encodings/*.hpp \ - ../../Storage/Cartridge/Formats/*.hpp \ - ../../Storage/Data/*.hpp \ - ../../Storage/Disk/*.hpp \ - ../../Storage/Disk/Controller/*.hpp \ - ../../Storage/Disk/DiskImage/*.hpp \ - ../../Storage/Disk/DiskImage/Formats/*.hpp \ - ../../Storage/Disk/DiskImage/Formats/Utility/*.hpp \ - ../../Storage/Disk/DPLL/*.hpp \ - ../../Storage/Disk/Encodings/*.hpp \ - ../../Storage/Disk/Encodings/AppleGCR/*.hpp \ - ../../Storage/Disk/Encodings/MFM/*.hpp \ - ../../Storage/Disk/Parsers/*.hpp \ - ../../Storage/Disk/Track/*.hpp \ - ../../Storage/MassStorage/*.hpp \ - ../../Storage/MassStorage/Encodings/*.hpp \ - ../../Storage/MassStorage/Formats/*.hpp \ - ../../Storage/MassStorage/SCSI/*.hpp \ - ../../Storage/Tape/*.hpp \ - ../../Storage/Tape/Formats/*.hpp \ - ../../Storage/Tape/Parsers/*.hpp \ + $$SRC/Storage/*.hpp \ + $$SRC/Storage/Cartridge/*.hpp \ + $$SRC/Storage/Cartridge/Encodings/*.hpp \ + $$SRC/Storage/Cartridge/Formats/*.hpp \ + $$SRC/Storage/Data/*.hpp \ + $$SRC/Storage/Disk/*.hpp \ + $$SRC/Storage/Disk/Controller/*.hpp \ + $$SRC/Storage/Disk/DiskImage/*.hpp \ + $$SRC/Storage/Disk/DiskImage/Formats/*.hpp \ + $$SRC/Storage/Disk/DiskImage/Formats/Utility/*.hpp \ + $$SRC/Storage/Disk/DPLL/*.hpp \ + $$SRC/Storage/Disk/Encodings/*.hpp \ + $$SRC/Storage/Disk/Encodings/AppleGCR/*.hpp \ + $$SRC/Storage/Disk/Encodings/MFM/*.hpp \ + $$SRC/Storage/Disk/Parsers/*.hpp \ + $$SRC/Storage/Disk/Track/*.hpp \ + $$SRC/Storage/MassStorage/*.hpp \ + $$SRC/Storage/MassStorage/Encodings/*.hpp \ + $$SRC/Storage/MassStorage/Formats/*.hpp \ + $$SRC/Storage/MassStorage/SCSI/*.hpp \ + $$SRC/Storage/Tape/*.hpp \ + $$SRC/Storage/Tape/Formats/*.hpp \ + $$SRC/Storage/Tape/Parsers/*.hpp \ \ audiobuffer.h \ functionthread.h \ @@ -250,10 +252,10 @@ HEADERS += \ timer.h FORMS += \ - mainwindow.ui + mainwindow.ui TRANSLATIONS += \ - ClockSignal_en_GB.ts + ClockSignal_en_GB.ts # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin