Commit Graph

1118 Commits

Author SHA1 Message Date
IoIxD
018c064180
"Change BUILD_JOBS=8" to match the threads on the computer itself. (#264)
Now works for macOS and Linux.
* Update build-toolchain.bash
2024-08-02 18:55:09 +02:00
Wolfgang Thaller
929acbb3c8
Merge pull request #260 from mcayland/fix/minor-docker-updates
Minor docker updates
2024-07-29 15:09:39 +02:00
Mark Cave-Ayland
18ff16c932 install-universal-interfaces.sh: remove workaround for MacBinary library support
Since commit 7b597afbed ("accept .bin for universal interface files and update docs")
the interfaces-and-libraries.sh script now works directly with libraries in MacBinary
format, and so the existing workaround (converting MacBinary libraries to separate
BasiliskII-style data and resource files) can now be removed.
2024-07-29 09:11:37 +01:00
Mark Cave-Ayland
8ef9c3f315 README.md: fix up reference to docker-entrypoint.sh
The file was renamed from entrypoint.sh to docker-entrypoint.sh just before
the updated docker support was merged, but the documentation was not updated
accordingly.
2024-07-29 09:05:47 +01:00
Wolfgang Thaller
7b597afbed accept .bin for universal interface files and update docs 2024-07-24 22:20:23 +02:00
Wolfgang Thaller
e9efa0c989 downgrade lambda syntax for better compat with old compilers 2024-07-20 15:56:35 +02:00
Wolfgang Thaller
2abae70456
Merge pull request #249 from briankendall/fix-empty-resources
Fix compilation of empty resources as generated by MPW's DeRez
2024-06-02 17:44:07 +02:00
Brian Kendall
5a4d8d4db8 Fix compilation of empty resources as generated by MPW's DeRez 2024-06-02 11:31:43 -04:00
Wolfgang Thaller
2c6272e5b1
Merge pull request #247 from autc04/cachix-install-ratelimit-fix
Avoid GitHub's rate limits in CI builds
2024-05-12 13:36:21 +02:00
Wolfgang Thaller
d4636b5c86 avoid using nixpkgs to install cachix, to avoid stressing github's rate limits 2024-05-12 13:20:06 +02:00
Wolfgang Thaller
353b9713b1 remove the 'half-understood hack' added to fixup_args_size_notes years ago; it seems to cause ICEs.
(see #232, #244, #167)
2024-05-11 02:25:05 +02:00
Wolfgang Thaller
2a15e6f1f3 use '#!/usr/bin/env bash' instead of '#!/bin/bash' for better NixOS compatibility 2024-05-11 02:15:41 +02:00
Wolfgang Thaller
5a740db226 make Elf2Mac write non-empty data forks, to unbreak some configure scripts (fixes #233) 2024-05-11 02:13:46 +02:00
Wolfgang Thaller
9f4252d7f8 Elf2Mac: treat an empty RETRO68_REAL_LD environment variable as unset 2024-05-11 01:14:14 +02:00
Wolfgang Thaller
ae4f1cfa1f update multiversal 2024-05-11 01:10:22 +02:00
Wolfgang Thaller
ea25160b2e
Merge pull request #243 from autc04/build-parallel
on linux, adjust `make -j` option to processor count
2024-05-09 14:22:35 +02:00
Wolfgang Thaller
0d6ab657a2 on linux, adjust make -j option to processor count 2024-05-05 21:06:27 +02:00
Wolfgang Thaller
d073b6e52b output rawinline calls in pic modes 2024-05-05 15:43:10 +02:00
Wolfgang Thaller
d5e013f891 add a reference to Retro68NixSample to the README 2024-05-02 00:11:49 +02:00
Wolfgang Thaller
5f72352b3e increase timeout for macOS/Nix builds 2024-05-01 23:31:10 +02:00
Wolfgang Thaller
147252f5a4 LaunchAPPL: allow more flexible configuration 2024-05-01 23:30:20 +02:00
Wolfgang Thaller
ff372a8d82
Merge pull request #241 from pando-fredrik/fix-include-poisoning-sonoma
Fixes include poisoning on sonoma
2024-04-16 15:31:23 -05:00
Fredrik Andersson
d55d90a9e5 Fixes include poisoning on sonoma 2024-04-16 20:12:00 +02:00
Wolfgang Thaller
1ed09307a7
Merge pull request #235 from agoode/cpp
Define "macintosh" and "Macintosh"
2024-04-12 09:29:11 -06:00
Wolfgang Thaller
99de31d45a
Merge pull request #240 from agoode/flush
Call FlushVol on close()
2024-04-11 22:25:44 -06:00
Adam Goode
5157624174 Call FlushVol on close()
This is recommended by Inside Macintosh.
2024-04-11 17:48:22 -04:00
Adam Goode
05a3f397e1 Update to latest multiversal 2024-04-11 17:48:18 -04:00
Wolfgang Thaller
f31e9d99ff
Merge pull request #239 from agoode/glue
Delete glue.c
2024-04-07 02:40:47 +02:00
Adam Goode
9ea4529d12 Delete glue.c
It hasn't been used since
0e11f298ba.

The actual glue.c is in multiversal.
2024-04-05 23:31:27 -04:00
Wolfgang Thaller
6c1dad390a
Merge pull request #234 from agoode/rwx
Disable RWX segment warnings
2024-03-27 19:47:47 +01:00
Adam Goode
085ef7e333 Define "macintosh" and "Macintosh"
See https://sourceforge.net/p/predef/wiki/OperatingSystems/.
2024-03-18 21:47:22 -04:00
Adam Goode
cc38ed3df3 Disable RWX segment warnings 2024-03-18 21:42:54 -04:00
Wolfgang Thaller
4ff2d7d902
Merge pull request #227 from mcayland/fix/update-ubuntu-version
Dockerfile: update Ubuntu base image from 20.04 to 22.04
2024-01-24 03:08:39 +01:00
Mark Cave-Ayland
9facdaf3c1 Dockerfile: update Ubuntu base image from 20.04 to 22.04
The current CI build for Linux fails with the following error:

2791.4 Scanning dependencies of target ResourceFiles
2791.4 [ 68%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/ResourceFork.cc.o
2791.4 [ 69%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/BinaryIO.cc.o
2791.4 [ 69%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/ResType.cc.o
2791.4 [ 70%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/ResourceFile.cc.o
------
Dockerfile:21
--------------------
  20 |
  21 | >>> RUN mkdir /Retro68-build && \
  22 | >>>     mkdir /Retro68-build/bin && \
  23 | >>>     bash -c "cd /Retro68-build && bash /Retro68/build-toolchain.bash"

Looking back through the logs there is no sign of any specific error, however
the CI history indicates that the problem was introduced via commit e187bd21c2
("honor SOURCE_DATE_EPOCH variable when timestamping MacBinary files").

A bit of searching suggests a couple of possible reasons as to why commit e187bd21c2
could introduce a build failure: 1) the version of gcc being used may have a
buggy/incomplete implementation of std::chrono or 2) a bug in the version of cmake.

On this basis updating the Ubuntu base image from 20.04 (old LTS) to 22.04 (current
LTS) should resolve these issues, and indeed with this change applied I can
successfully build the container image from current Retro68 git as well as one of
the sample applications.
2024-01-23 20:55:56 +00:00
Wolfgang Thaller
e187bd21c2 honor SOURCE_DATE_EPOCH variable when timestamping MacBinary files 2024-01-21 11:52:12 +01:00
Wolfgang Thaller
e43fee2701 move standalone nix build experiments to separate module 2024-01-21 11:12:34 +01:00
Wolfgang Thaller
9d542ac1c2
Merge pull request #225 from rhalkyard/macbinary-timestamp
Set a valid timestamp on MacBinary output.
FIXME: makes nix-builds of samples non-deterministic, will need to add support for SOURCE_DATE_EPOCH.
2024-01-15 21:06:33 +01:00
Richard Halkyard
f186dc1d57 Set a valid timestamp on MacBinary output 2024-01-04 17:30:55 -06:00
Wolfgang Thaller
e19ca07b3a
Merge pull request #222 from autc04/gcc12-update
Update to GCC 12.2, newlib 4.2, binutils 2.39
2023-12-29 15:31:04 +01:00
Wolfgang Thaller
398e7361a7 ADO: add texinfo to macos deps 2023-12-29 14:42:53 +01:00
Wolfgang Thaller
86146d338b Merge remote-tracking branch 'origin/master' into gcc12-update 2023-12-29 14:32:26 +01:00
Wolfgang Thaller
fcac947ce2 disable nix hardening for development shell 2023-12-29 11:30:18 +01:00
Wolfgang Thaller
1b0b725552 fix PascalString.c test 2023-12-29 11:29:49 +01:00
Wolfgang Thaller
726972f708 use macOS 13 on azure 2023-12-29 10:11:12 +01:00
Wolfgang Thaller
1857ea24e3 update version numbers in README 2023-12-29 01:50:49 +01:00
Wolfgang Thaller
57f8399076 add .direnv to .gitignore 2023-12-29 01:21:20 +01:00
Wolfgang Thaller
1d05fb39b5 fix WDEF and SystemExtension samples in Nix build
the nix build currently puts the REZ_INCLUDE_PATH in an environment variable rather than CMake, so REZ_INCLUDE_PATH is undefined in CMake
2023-12-29 01:20:20 +01:00
Wolfgang Thaller
cfa89940f2 remove CXXFLAGS hack for gcc9 2023-12-29 01:16:18 +01:00
Wolfgang Thaller
a777d4d585 Merge remote-tracking branch 'origin/master' into gcc12-update 2023-12-29 00:24:02 +01:00
Wolfgang Thaller
c525614549
Merge pull request #221 from autc04/flakes
Nix Flakes
2023-12-29 00:22:26 +01:00