remove Amiga cross-compile bits
This commit is contained in:
nhmall
@@ -41,84 +41,6 @@ dospkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
|
||||
@echo msdos package zip file $(TARGETPFX)NH370DOS.ZIP
|
||||
endif # CROSS_TO_MSDOS
|
||||
|
||||
ifdef CROSS_TO_AMIGA
|
||||
$(TARGETPFX)amidos.o : ../outdated/sys/amiga/amidos.c $(HACK_H)
|
||||
$(TARGETPFX)amigst.o : ../outdated/sys/amiga/amigst.c $(HACK_H)
|
||||
$(TARGETPFX)amirip.o : ../outdated/sys/amiga/amirip.c $(HACK_H)
|
||||
$(TARGETPFX)amistack.o : ../outdated/sys/amiga/amistack.c $(HACK_H)
|
||||
$(TARGETPFX)amitty.o : ../outdated/sys/amiga/amitty.c $(HACK_H)
|
||||
$(TARGETPFX)amiwind.o : ../outdated/sys/amiga/amiwind.c \
|
||||
../outdated/sys/amiga/amimenu.c $(HACK_H)
|
||||
$(TARGETPFX)winami.o : ../outdated/sys/amiga/winami.c $(HACK_H)
|
||||
$(TARGETPFX)winchar.o : ../outdated/sys/amiga/winchar.c tile.c $(HACK_H)
|
||||
$(TARGETPFX)winfuncs.o : ../outdated/sys/amiga/winfuncs.c $(HACK_H)
|
||||
$(TARGETPFX)winkey.o : ../outdated/sys/amiga/winkey.c $(HACK_H)
|
||||
$(TARGETPFX)winamenu.o : ../outdated/sys/amiga/winamenu.c $(HACK_H)
|
||||
$(TARGETPFX)winreq.o : ../outdated/sys/amiga/winreq.c \
|
||||
../outdated/sys/amiga/colorwin.c \
|
||||
../outdated/sys/amiga/clipwin.c $(HACK_H)
|
||||
$(TARGETPFX)winstr.o : ../outdated/sys/amiga/winstr.c $(HACK_H)
|
||||
$(TARGETPFX)tomb.iff : ../util/xpm2iff ../outdated/sys/amiga/gave16.xpm
|
||||
../util/tiletext.o : ../win/share/tiletext.c
|
||||
$(CC) $(CFLAGS) -c \
|
||||
-o $@ ../win/share/tiletext.c
|
||||
../util/txt2iff : ../util/txt2iff.o ../util/tiletext.o \
|
||||
../util/tiletxt.o
|
||||
$(LINK) $(LFLAGS) -L../lib -o $@ ../util/txt2iff.o ../util/tiletext.o \
|
||||
../util/tiletxt.o -lriffl
|
||||
../util/txt2iff.o : ../outdated/sys/amiga/txt2iff.c $(HACK_H)
|
||||
$(CC) $(CFLAGS) -c \
|
||||
-I../lib/riffl-0.2/include \
|
||||
-I/opt/amiga/m68k-amigaos/ndk13-include \
|
||||
-o $@ ../outdated/sys/amiga/txt2iff.c
|
||||
../util/xpm2iff : ../util/xpm2iff.o
|
||||
$(LINK) $(LFLAGS) -L../lib -o $@ ../util/txt2iff.o -lriffl
|
||||
../util/xpm2iff.o : ../outdated/sys/amiga/xpm2iff.c $(HACK_H)
|
||||
$(CC) $(CFLAGS) -o $@ ../outdated/sys/amiga/xpm2iff.c
|
||||
$(TARGETPFX)objects.iff: ../win/share/objects.txt ../util/txt2iff
|
||||
../util/txt2iff ../win/share/objects.txt $@
|
||||
$(TARGETPFX)monsters.iff: ../win/share/monsters.txt ../util/txt2iff
|
||||
../util/txt2iff ../win/share/monsters.txt $@
|
||||
$(TARGETPFX)other.iff: ../win/share/other.txt ../util/txt2iff
|
||||
../util/txt2iff ../win/share/other.txt $@
|
||||
$(GAMEBIN) : $(HOBJ) $(LUACROSSLIB)
|
||||
$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
|
||||
$(HOBJ) $(WINLIB) $(TARGET_LIBS)
|
||||
#
|
||||
.PHONY: amigapkg
|
||||
amigapkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
|
||||
mkdir -p $(TARGETPFX)pkg
|
||||
cp $(GAMEBIN) $(TARGETPFX)pkg/nethack
|
||||
cp ../dat/nhdat $(TARGETPFX)pkg/nhdat
|
||||
cp ../dat/license $(TARGETPFX)pkg/license
|
||||
cp ../dat/nhtiles.bmp $(TARGETPFX)pkg/nhtiles.bmp
|
||||
cp $(TARGETPFX)tomb.iff $(TARGETPFX)pkg/tomb.iff
|
||||
cp $(TARGETPFX)monsters.iff $(TARGETPFX)pkg/monsters.iff
|
||||
cp $(TARGETPFX)objects.iff $(TARGETPFX)pkg/objects.iff
|
||||
cp $(TARGETPFX)other.iff $(TARGETPFX)pkg/other.iff
|
||||
cp ../dat/symbols $(TARGETPFX)pkg/symbols
|
||||
cp ../sys/share/NetHack.cnf $(TARGETPFX)pkg/nethack.cnf
|
||||
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf
|
||||
cp ../outdated/sys/amiga/amii.hlp $(TARGETPFX)pkg/amii.hlp
|
||||
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf
|
||||
cp ../doc/nethack.txt $(TARGETPFX)pkg/nethack.txt
|
||||
../util/uudecode ../outdated/sys/amiga/amifont8.uu
|
||||
cp 8 $(TARGETPFX)pkg/8
|
||||
../util/uudecode ../outdated/sys/amiga/amifont.uu
|
||||
cp hack.font $(TARGETPFX)pkg/hack.font
|
||||
../util/uudecode ../outdated/sys/amiga/dflticon.uu
|
||||
cp default.icon $(TARGETPFX)pkg/default.icon
|
||||
../util/uudecode ../outdated/sys/amiga/NHinfo.uu
|
||||
cp NetHack.info $(TARGETPFX)pkg/NetHack.info
|
||||
../util/uudecode ../outdated/sys/amiga/NewGame.uu
|
||||
cp NewGame.info $(TARGETPFX)pkg/NewGame.info
|
||||
../util/uudecode ../outdated/sys/amiga/HackWB.uu
|
||||
cp HackWB.info $(TARGETPFX)pkg/HackWB.info
|
||||
-touch $(TARGETPFX)pkg/record
|
||||
zip -9 $(TARGETPFX)NH370AMI.ZIP $(TARGETPFX)pkg/*
|
||||
@echo amiga package zip file $(TARGETPFX)NH370AMI.ZIP
|
||||
endif # CROSS_TO_AMIGA
|
||||
|
||||
ifdef CROSS_TO_WASM
|
||||
$(WASM_TARGET): pregame $(HOSTOBJ) $(HOBJ) $(LUACROSSLIB) $(WASM_DATA_DIR)
|
||||
-rm $@
|
||||
|
||||
@@ -15,17 +15,6 @@ override TARGETPFX = $(TARGETDIR)/
|
||||
override TARGET_LIBS=
|
||||
endif
|
||||
|
||||
ifdef CROSS_TO_AMIGA
|
||||
CROSS=1
|
||||
BUILD_TARGET_LUA=1
|
||||
BUILD_PDCURSES=1
|
||||
CROSS_SHARED=1
|
||||
override TARGET = amiga
|
||||
override TARGETDIR=../targets/$(TARGET)
|
||||
override TARGETPFX = $(TARGETDIR)/
|
||||
override TARGET_LIBS=
|
||||
endif
|
||||
|
||||
ifdef CROSS_TO_WASM
|
||||
CROSS=1
|
||||
BUILD_TARGET_LUA=1
|
||||
@@ -209,94 +198,6 @@ $(TARGETPFX)%.o : ../sys/msdos/%.c
|
||||
endif # CROSS_TO_MSDOS
|
||||
#=================================================================
|
||||
|
||||
ifdef CROSS_TO_AMIGA
|
||||
#===============-=================================================
|
||||
# AmigaOS m68k cross-compile recipe
|
||||
#===============-=================================================
|
||||
# Uses an Amiga M68K cross-compiler on linux or macOS.
|
||||
#
|
||||
# 1. You can obtain the cross-compiler for your system via:
|
||||
# sys/amiga/fetch-cross.sh
|
||||
# 2. Then
|
||||
# make CROSS_TO_AMIGAOS=1 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 all
|
||||
#
|
||||
# Amiga m68k from https://github.com/bebbo/amiga-gcc
|
||||
#=================================================================
|
||||
|
||||
CFLAGS += -DCROSSCOMPILE
|
||||
|
||||
#
|
||||
# Override the build tools and some obj files to
|
||||
# reflect the amiga-gccs cross-compiler.
|
||||
#
|
||||
TOOLTOP = /opt/amiga/bin
|
||||
#TOOLARCH = -m68020 -mcrt=clib2
|
||||
#TOOLARCH = -m68020 #newlib
|
||||
TOOLARCH = -m68020 -noixemul
|
||||
override REGEXOBJ = $(TARGETPFX)cppregex.o
|
||||
override TARGET_CC = $(TOOLTOP)/m68k-amigaos-gcc
|
||||
override TARGET_CXX = $(TOOLTOP)/m68k-amigaos-c++
|
||||
override TARGET_AR = $(TOOLTOP)/m68k-amigaos-ar
|
||||
override TARGET_STUBEDIT=
|
||||
#override TARGET_CFLAGS = -c -O $(TOOLARCH) -I../include -I../outdated/include
|
||||
override TARGET_CFLAGS = -c -O $(TOOLARCH) \
|
||||
-I../include -I../outdated/include \
|
||||
-I../outdated/sys/amiga -I../win/share \
|
||||
$(LUAINCL) -DAMIGA -DUSE_TILES $(PDCURSESDEF) \
|
||||
-DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_AMIGA \
|
||||
-DAMIGA_VERSION_STRING=\""VER: NetHack 3.7.0\""
|
||||
override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
|
||||
ifeq "$(REGEXOBJ)" "$(TARGETPFX)cppregex.o"
|
||||
override TARGET_LINK = $(TARGET_CXX)
|
||||
else
|
||||
override TARGET_LINK = $(TARGET_CC)
|
||||
endif
|
||||
override TARGET_LFLAGS= $(TOOLARCH)
|
||||
#override TARGET_LIBS +=
|
||||
VARDATND += nhtiles.bmp
|
||||
override SYSSRC = ../outdated/sys/amiga/amidos.c ../outdated/sys/amiga/amigst.c \
|
||||
../outdated/sys/amiga/amimenu.c ../outdated/sys/amiga/amirip.c \
|
||||
../outdated/sys/amiga/amistack.c ../outdated/sys/amiga/amitty.c \
|
||||
../outdated/sys/amiga/amiwind.c ../outdated/sys/amiga/clipwin.c \
|
||||
../outdated/sys/amiga/colorwin.c \
|
||||
../outdated/sys/amiga/winami.c ../outdated/sys/amiga/winchar.c \
|
||||
../outdated/sys/amiga/winfuncs.c ../outdated/sys/amiga/winkey.c \
|
||||
../outdated/sys/amiga/winamenu.c ../outdated/sys/amiga/winreq.c \
|
||||
../outdated/sys/amiga/winstr.c ../sys/share/pcmain.c \
|
||||
../win/share/bmptiles.c ../win/share/giftiles.c \
|
||||
../win/share/tileset.c
|
||||
# ../outdated/sys/amiga/xpm2iff.c
|
||||
# ../outdated/sys/amiga/txt2iff.c
|
||||
override SYSOBJ = $(TARGETPFX)amidos.o $(TARGETPFX)amigst.o \
|
||||
$(TARGETPFX)amirip.o $(TARGETPFX)amistack.o \
|
||||
$(TARGETPFX)amitty.o $(TARGETPFX)amiwind.o \
|
||||
$(TARGETPFX)winami.o $(TARGETPFX)winchar.o \
|
||||
$(TARGETPFX)winfuncs.o $(TARGETPFX)winkey.o \
|
||||
$(TARGETPFX)winamenu.o $(TARGETPFX)winreq.o \
|
||||
$(TARGETPFX)winstr.o $(TARGETPFX)pcmain.o \
|
||||
$(TARGETPFX)bmptiles.o $(TARGETPFX)giftiles.o \
|
||||
$(TARGETPFX)tileset.o
|
||||
# $(TARGETPFX)xpm2iff.o
|
||||
# ../util/txt2iff.o
|
||||
override WINLIB=
|
||||
override LUALIB=
|
||||
override TOPLUALIB=
|
||||
override GAMEBIN = $(TARGETPFX)nethack
|
||||
override PACKAGE = amigapkg
|
||||
override PREGAME += mkdir -p $(TARGETDIR) ;
|
||||
override CLEANMORE += rm -r $(TARGETDIR) ;
|
||||
# ../util/txt2iff
|
||||
#
|
||||
ifdef WANT_WIN_CURSES
|
||||
# rules for pdcurses sdl1-specific files
|
||||
$(TARGETPFX)%.o : $(PDCTOP)/sdl1/%.c
|
||||
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
|
||||
endif # WANT_WIN_CURSES
|
||||
# Rule for files in sys/amiga
|
||||
$(TARGETPFX)%.o : ../outdated/sys/amiga/%.c
|
||||
$(TARGET_CC) $(TARGET_CFLAGS) -o$@ $<
|
||||
endif # CROSS_TO_AMIGA
|
||||
#=================================================================
|
||||
|
||||
ifdef CROSS_TO_WASM
|
||||
#===============-=================================================
|
||||
|
||||
Reference in New Issue
Block a user