Skip to content

Commit 50d7d82

Browse files
nwahnwah
authored
Merge pull request #1 from FozzTexx/feature/MSX-v2
Move MSX LDFLAGS customization to Makefile
2 parents fdd4607 + 0895413 commit 50d7d82

File tree

10 files changed

+30
-19
lines changed

10 files changed

+30
-19
lines changed

‎Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,14 @@ LDFLAGS_EXTRA_APPLE2 = -C $(A2_LINKER_CFG)
7272
########################################
7373
# Atari customization
7474

75-
CFLAGS_EXTRA_ATARI = -DUSING_FUJINET_LIB
7675
EXTRA_INCLUDE_ATARI = src/atari/asminc
7776

7877
########################################
7978
# Commodore 64 customization
8079

81-
CFLAGS_EXTRA_C64 = -DUSING_FUJINET_LIB -DUSE_EDITSTRING
80+
CFLAGS_EXTRA_C64 = -DUSE_EDITSTRING
8281

8382
########################################
84-
# Adam customization
83+
# MSX customization
8584

86-
CFLAGS_EXTRA_ADAM = -DUSING_FUJINET_LIB
85+
LDFLAGS_EXTRA_MSXROM = -lndos -pragma-redirect:fputc_cons=fputc_cons_generic -pragma-redirect:CRT_FONT=_font_shifted -create-app

‎makefiles/common.mk‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ $(info Building for PLATFORM=$(PLATFORM))
1010

1111
include $(MWD)/../Makefile
1212

13+
# Add GIT_VERSION macro define to CFLAGS, includes tag if available,
14+
# short commit hash, appends '*' if changes haven't been commited
15+
CFLAGS += -DGIT_VERSION='\"$(shell git rev-parse --short HEAD)$(shell git status --porcelain | grep -q '^[ MADRCU]' && echo '*')\"'
16+
1317
IS_LIBRARY := $(if $(filter %.lib,$(PRODUCT)),1,0)
1418
ifeq ($(IS_LIBRARY),1)
1519
PRODUCT_BASE = $(basename $(PRODUCT))
@@ -33,6 +37,10 @@ ifneq ($(strip $(LD_$(TOOLCHAIN_UC))),)
3337
LD_DEFAULT = $(LD_$(TOOLCHAIN_UC))
3438
endif
3539

40+
ifneq ($(strip $(PC_$(TOOLCHAIN_UC))),)
41+
PC_DEFAULT = $(PC_$(TOOLCHAIN_UC))
42+
endif
43+
3644
R2R_PD := $(R2R_DIR)/$(PLATFORM)
3745
OBJ_DIR := $(BUILD_DIR)/$(PLATFORM)
3846
CACHE_PLATFORM := $(CACHE_DIR)/$(PLATFORM)
@@ -60,16 +68,16 @@ SRC_DIRS_EXPANDED := $(call expand_platform_pattern,$(SRC_DIRS))
6068
CFILES := $(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.c))
6169
AFILES := $(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.s)) \
6270
$(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.asm))
71+
PFILES := $(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.pas))
6372

6473
# Need two steps: AFILES may be .s or .asm; `make` swaps one suffix at a time
6574
NORM_AFILES := $(AFILES:.asm=.s)
66-
OBJS := $(addprefix $(OBJ_DIR)/, $(notdir $(CFILES:.c=.o) $(NORM_AFILES:.s=.o)))
75+
OBJS := $(addprefix $(OBJ_DIR)/, $(notdir $(CFILES:.c=.o) $(NORM_AFILES:.s=.o) $(PFILES:.pas=.o)))
6776

6877
$(BUILD_EXEC):: $(OBJS) $(EXECUTABLE_EXTRA_DEPS_$(PLATFORM_UC)) | $(R2R_PD)
6978
$(call link-bin,$@,$(OBJS))
7079
@$(MAKE) -f $(PLATFORM_MK) $(PLATFORM)/executable-post
7180

72-
$(info LIBRARY=$(BUILD_LIB))
7381
$(BUILD_LIB):: $(OBJS) $(LIBRARY_EXTRA_DEPS_$(PLATFORM_UC)) | $(R2R_PD)
7482
$(call link-lib,$@,$(OBJS))
7583
@$(MAKE) -f $(PLATFORM_MK) $(PLATFORM)/library-post
@@ -85,10 +93,13 @@ $(OBJ_DIR)/%.o: %.s | $(OBJ_DIR)
8593
$(call assemble,$@,$<)
8694
$(OBJ_DIR)/%.o: %.asm | $(OBJ_DIR)
8795
$(call assemble,$@,$<)
96+
$(OBJ_DIR)/%.o: %.pas | $(OBJ_DIR)
97+
$(call compile-pas,$@,$<)
8898

8999
vpath %.c $(SRC_DIRS_EXPANDED)
90100
vpath %.s $(SRC_DIRS_EXPANDED)
91101
vpath %.asm $(SRC_DIRS_EXPANDED)
102+
vpath %.pas $(SRC_DIRS_EXPANDED)
92103

93104
.PHONY: clean debug r2r $(PLATFORM)/r2r disk $(PLATFORM)/disk
94105

‎makefiles/fnlib.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def getVersion(self):
201201
return
202202
if self.skipIfMissing:
203203
exit(0)
204-
error_exit(f"No library found for \"{self.PLATFORM}\"")
204+
#error_exit(f"No library found for \"{self.PLATFORM}\"")
205205

206206
# No version was specified, so any version is fine
207207
if self.MV.FUJINET_LIB_VERSION:
@@ -316,8 +316,9 @@ def getInclude(self):
316316
if os.path.exists(os.path.join(idir, "fujinet-fuji.h")):
317317
self.MV.FUJINET_LIB_INCLUDE = idir
318318
return
319+
if self.skipIfMissing:
320+
exit(0)
319321
raise ValueError("Unable to find include directory", self.MV.FUJINET_LIB_DIR)
320-
321322
return
322323

323324
def printMakeVariables(self):

‎makefiles/platforms/atari.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ATRBOOT := $(CACHE_PLATFORM)/$(PICOBOOT_BIN)
1414

1515
$(BUILD_DISK): $(BUILD_EXEC) $(ATRBOOT) $(DISK_EXTRA_DEPS_$(PLATFORM_UC)) | $(R2R_PD)
1616
$(RM) $@
17+
$(RM) -rf $(CACHE_PLATFORM)/disk
1718
$(MKDIR_P) $(CACHE_PLATFORM)/disk
1819
cp $< $(CACHE_PLATFORM)/disk
1920
dir2atr -m -S -B $(ATRBOOT) $@ $(CACHE_PLATFORM)/disk

‎makefiles/platforms/msxrom.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include $(MWD)/toolchains/z88dk.mk
77

88
MSXROM_FLAGS = +msx -subtype=rom
99
CFLAGS += $(MSXROM_FLAGS)
10-
LDFLAGS += $(MSXROM_FLAGS) -lndos -pragma-redirect:fputc_cons=fputc_cons_generic -pragma-redirect:CRT_FONT=_font_shifted -create-app
10+
LDFLAGS += $(MSXROM_FLAGS)
1111

1212
r2r:: $(EXECUTABLE) $(R2R_EXTRA_DEPS_$(PLATFORM_UC))
1313
make -f $(PLATFORM_MK) $(PLATFORM)/r2r-post

‎makefiles/tc-common.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ CC_$(TOOLCHAIN_UC) ?= $(CC_DEFAULT)
88
AS_$(TOOLCHAIN_UC) ?= $(AS_DEFAULT)
99
LD_$(TOOLCHAIN_UC) ?= $(LD_DEFAULT)
1010
AR_$(TOOLCHAIN_UC) ?= $(AR_DEFAULT)
11+
PC_$(TOOLCHAIN_UC) ?= $(PC_DEFAULT)
1112

1213
CC := $(CC_$(TOOLCHAIN_UC))
1314
AS := $(AS_$(TOOLCHAIN_UC))
1415
LD := $(LD_$(TOOLCHAIN_UC))
1516
AR := $(AR_$(TOOLCHAIN_UC))
17+
PC := $(PC_$(TOOLCHAIN_UC))
1618

1719
EXTRA_INCLUDE_$(TOOLCHAIN_UC) += $(EXTRA_INCLUDE) $(EXTRA_INCLUDE_$(PLATFORM_UC))
1820
CFLAGS += $(CFLAGS_EXTRA_$(TOOLCHAIN_UC)) $(CFLAGS_EXTRA_$(PLATFORM_UC))

‎makefiles/toolchains/cc65.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC_DEFAULT ?= cl65 --color off
1+
CC_DEFAULT ?= cl65
22
AS_DEFAULT ?= $(CC_DEFAULT)
33
LD_DEFAULT ?= $(CC_DEFAULT)
44
AR_DEFAULT ?= ar65

‎makefiles/toolchains/cmoc.mk‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ CFLAGS += --intdir=$(OBJ_DIR)
99
ASFLAGS +=
1010
LDFLAGS +=
1111

12-
# Needed because of using sed to strip ANSI color escape sequences
12+
# Needed because of using sed on error messages
1313
SHELL = /bin/bash -o pipefail
1414

15-
define strip-ansi
16-
sed -e 's/'$$'\033''[[][0-9][0-9]*m//g'
17-
endef
18-
1915
define include-dir-flag
2016
-I$1
2117
endef
@@ -37,13 +33,13 @@ define link-lib
3733
endef
3834

3935
define link-bin
40-
$(LD) -o $1 $(LDFLAGS) $2 $(LIBS) 2>&1 | $(strip-ansi)
36+
$(LD) -o $1 $(LDFLAGS) $2 $(LIBS)
4137
endef
4238

4339
define compile
44-
$(CC) -c $(CFLAGS) --deps=$(OBJ_DIR)/$(basename $(notdir $2)).d -o $1 $2 2>&1 | $(strip-ansi)
40+
$(CC) -c $(CFLAGS) --deps=$(OBJ_DIR)/$(basename $(notdir $2)).d -o $1 $2
4541
endef
4642

4743
define assemble
48-
$(AS) -c $(ASFLAGS) -o $1 $2 2>&1 | $(strip-ansi) | sed -e 's/^\(.*\)(\([0-9][0-9]*\)) :/\1:\2:/'
44+
$(AS) -c $(ASFLAGS) -o $1 $2 2>&1 | sed -e 's/^\(.*\)(\([0-9][0-9]*\)) :/\1:\2:/'
4945
endef

‎makefiles/toolchains/ow2.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LD_DEFAULT ?= wlink OPTION quiet
55
include $(MWD)/tc-common.mk
66
CFLAGS += -0 -bt=dos -ms -s -osh -zu
77
ASFLAGS +=
8-
LDFLAGS += SYSTEM dos OPTION MAP LIBPATH $(FUJINET_LIB_DIR)
8+
LDFLAGS += SYSTEM dos LIBPATH $(FUJINET_LIB_DIR)
99

1010
define include-dir-flag
1111
-I$1

‎src/msx/screen.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ void screen_show_info(bool printerEnabled,AdapterConfig* ac)
538538
cprintf("%10s%02x:%02x:%02x:%02x:%02x:%02x\n","MAC:",ac->macAddress[0],ac->macAddress[1],ac->macAddress[2],ac->macAddress[3],ac->macAddress[4],ac->macAddress[5]);
539539
cprintf("%10s%02x:%02x:%02x:%02x:%02x:%02x\n","BSSID:",ac->bssid[0],ac->bssid[1],ac->bssid[2],ac->bssid[3],ac->bssid[4],ac->bssid[5]);
540540
cprintf("%10s%s\n","FNVER:",ac->fn_version);
541+
cprintf("%10s%s\n","CONFIG:",GIT_VERSION);
541542

542543
vdp_vfill(MODE2_ATTR+0x0700,0xF4,256);
543544
vdp_vfill(MODE2_ATTR+0x0800,0x1F,256);

0 commit comments

Comments
 (0)