mirror of
				https://github.com/davidgiven/fluxengine.git
				synced 2025-10-31 11:17:01 -07:00 
			
		
		
		
	Make build again (at least on Fedora).
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/ccpp.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ccpp.yml
									
									
									
									
										vendored
									
									
								
							| @@ -61,7 +61,7 @@ jobs: | ||||
|         wsl --import fedora fedora install.tar.gz | ||||
|         wsl --set-default fedora | ||||
|         wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-38-1.noarch.rpm' | ||||
|         wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico' | ||||
|         wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis qt-devel mingw32-png2ico' | ||||
|  | ||||
|     - name: fix line endings | ||||
|       run: | | ||||
|   | ||||
| @@ -136,7 +136,7 @@ choices because they can store multiple types of file system. | ||||
| | [`rolandd20`](doc/disk-rolandd20.md) | Roland D20: 3.5" electronic synthesiser disks | 🦄 | 🦖 | ROLAND  | | ||||
| | [`rx50`](doc/disk-rx50.md) | Digital RX50: 400kB 5.25" 80-track 10-sector SSDD | 🦖 | 🦖 |  | | ||||
| | [`smaky6`](doc/disk-smaky6.md) | Smaky 6: 308kB 5.25" 77-track 16-sector SSDD, hard sectored | 🦖 |  | SMAKY6  | | ||||
| | [`tartu`](doc/disk-tartu.md) | Tartu: The Palivere and variations | 🦄 |  | CPMFS  | | ||||
| | [`tartu`](doc/disk-tartu.md) | Tartu: The Palivere and variations | 🦄 | 🦖 | CPMFS  | | ||||
| | [`tids990`](doc/disk-tids990.md) | Texas Instruments DS990: 1126kB 8" DSSD | 🦖 | 🦖 |  | | ||||
| | [`tiki`](doc/disk-tiki.md) | Tiki 100: CP/M |  |  | CPMFS  | | ||||
| | [`victor9k`](doc/disk-victor9k.md) | Victor 9000 / Sirius One: 1224kB 5.25" DSDD GCR | 🦖 | 🦖 |  | | ||||
|   | ||||
| @@ -22,7 +22,7 @@ density, using MFM and with up to 780kB on a double-sided 80 track disk. | ||||
| <img src="tartu-fdc.jpg" alt="The Tartu FDC with Soviet TTL logic chips."/> | ||||
| </div> | ||||
|  | ||||
| FluxEngine supports reading Tartu disks with CP/M filesystem access. | ||||
| FluxEngine supports reading and writing Tartu disks with CP/M filesystem access. | ||||
|  | ||||
| ## Options | ||||
|  | ||||
|   | ||||
| @@ -13,7 +13,7 @@ def uic(self, name, src: Target = None, dest=None): | ||||
|         replaces=self, | ||||
|         ins=[src], | ||||
|         outs=[dest], | ||||
|         commands=["uic -g cpp -o {outs[0]} {ins[0]}"], | ||||
|         commands=["uic-qt5 -g cpp -o {outs[0]} {ins[0]}"], | ||||
|         label="UIC", | ||||
|     ) | ||||
|  | ||||
| @@ -25,7 +25,7 @@ normalrule( | ||||
|     name="resources_cc", | ||||
|     ins=["./resources.qrc"], | ||||
|     outs=["resources.cc"], | ||||
|     commands=["rcc -g cpp --name resources -o {outs[0]} {ins[0]}"], | ||||
|     commands=["rcc-qt5 -g cpp --name resources -o {outs[0]} {ins[0]}"], | ||||
|     label="RCC", | ||||
| ) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user