Skip to content

Commit 320d4f8

Browse files
committed
Refactor network_read for a2 and atari in to common c file
1 parent 2a71401 commit 320d4f8

40 files changed

+216
-239
lines changed

Changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## [Unreleased]
44

5+
## [2.1.2] - 2024-01-03
6+
7+
### Changed
8+
9+
- network_read handles chunked and delayed loading, and is common cross platform C file
10+
- refactored subdirectories of apple code in preparation for fn_io for apple2
11+
512
## [2.1.1] - 2023-12-07
613

714
### Changed

Makefile

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -138,26 +138,6 @@ else
138138
CC := cl65
139139
endif
140140

141-
142-
###############################################################################
143-
### The magic begins ###
144-
###############################################################################
145-
146-
# The "Native Win32" GNU Make contains quite some workarounds to get along with
147-
# cmd.exe as shell. However it does not provide means to determine that it does
148-
# actually activate those workarounds. Especially does $(SHELL) NOT contain the
149-
# value 'cmd.exe'. So the usual way to determine if cmd.exe is being used is to
150-
# execute the command 'echo' without any parameters. Only cmd.exe will return a
151-
# non-empy string - saying 'ECHO is on/off'.
152-
#
153-
# Many "Native Win32" prorams accept '/' as directory delimiter just fine. How-
154-
# ever the internal commands of cmd.exe generally require '\' to be used.
155-
#
156-
# cmd.exe has an internal command 'mkdir' that doesn't understand nor require a
157-
# '-p' to create parent directories as needed.
158-
#
159-
# cmd.exe has an internal command 'del' that reports a syntax error if executed
160-
# without any file so make sure to call it only if there's an actual argument.
161141
ifeq ($(shell echo),)
162142
MKDIR = mkdir -p $1
163143
RMDIR = rmdir $1
@@ -224,6 +204,13 @@ CFLAGS += \
224204
--include-dir $(TARGETLIST)/$(SRCDIR)/fn_fuji/inc \
225205
--include-dir .
226206

207+
# Add -DBUILD_(TARGET) to all args for the current name.
208+
UPPER_TARGETLIST := $(shell echo $(TARGETLIST) | tr a-z A-Z)
209+
CFLAGS += -DBUILD_$(UPPER_TARGETLIST)
210+
ASFLAGS += -DBUILD_$(UPPER_TARGETLIST)
211+
LDFLAGS += -DBUILD_$(UPPER_TARGETLIST)
212+
213+
227214
CHANGELOG = Changelog.md
228215

229216
# single line with version number in semantic form (e.g. 2.1.3)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)