From 4e904d01e83c27f60b291cac9d2865a9500b54d5 Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 27 Dec 2019 12:13:41 -0500 Subject: [PATCH] msdos cross-compile bits --- sys/msdos/Makefile1.cross | 5 +++-- sys/msdos/Makefile2.cross | 8 +------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sys/msdos/Makefile1.cross b/sys/msdos/Makefile1.cross index a2af8b1fb..e8bae64b9 100644 --- a/sys/msdos/Makefile1.cross +++ b/sys/msdos/Makefile1.cross @@ -285,6 +285,9 @@ $(HOST_O)%.o : $(MSYS)/%.c $(HOST_O)%.o : $(SRC)/%.c $(HOST_CC) $(cflags) -o$@ $< +$(HOST_O)%.o : $(UTIL)/%.c + $(HOST_CC) $(cflags) -o$@ $< + $(HOST_O)%.o : %.c $(HOST_CC) $(cflags) -o$@ $< @@ -411,8 +414,6 @@ hobj.tag: $(U)makedefs: $(MAKEDEFSOBJS) $(HOST_LINK) $(LFLAGS) -o$@ $(MAKEDEFSOBJS) -$(O)makedefs$(HOST).o: - $(HOST_O)makedefs.o: $(U)makedefs.c $(SRC)/mdlib.c $(CONFIG_H) $(INCL)/permonst.h \ $(INCL)/objclass.h $(INCL)/monsym.h \ $(INCL)/artilist.h $(INCL)/dungeon.h $(INCL)/obj.h \ diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross index 0b42d58fa..512f20158 100644 --- a/sys/msdos/Makefile2.cross +++ b/sys/msdos/Makefile2.cross @@ -605,12 +605,6 @@ install: $(GAMEFILE) $(O)install.tag default: $(GAMEFILE) -util: $(O)utility.tag - -$(O)utility.tag: $(INCL)/date.h $(INCL)/trap.h $(INCL)/onames.h \ - $(INCL)/pm.h vis_tab.c $(TILEUTIL) - echo utilities made > $@ - tileutil: $(U)gif2txt $(U)txt2ppm @echo Optional tile development utilities are up to date. @@ -647,7 +641,7 @@ endif #========================================== $(GAMEFILE): $(O)obj.tag $(PDCLIB) $(LUALIB) \ - $(O)utility.tag $(ALLOBJ) $(O)$(GAME).lnk + $(ALLOBJ) $(O)$(GAME).lnk if [ -f temp.a ]; then rm temp.a; fi; @$(TARGET_AR) r temp.a $(VOBJ01) @$(TARGET_AR) r temp.a $(VOBJ02) -- 2.49.0