Get CROSSCOMPILE defined earlier in the Makefiles
This commit is contained in:
@@ -50,6 +50,7 @@ override TARGET_LIBS=
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef CROSS
|
ifdef CROSS
|
||||||
|
CROSSCOMPILE=1
|
||||||
override PREGAME=
|
override PREGAME=
|
||||||
override BUILDMORE=
|
override BUILDMORE=
|
||||||
override CLEANMORE=
|
override CLEANMORE=
|
||||||
|
|||||||
@@ -123,8 +123,6 @@ ifdef CROSS_TO_MSDOS
|
|||||||
#=================================================================
|
#=================================================================
|
||||||
|
|
||||||
CFLAGS += -DCROSSCOMPILE
|
CFLAGS += -DCROSSCOMPILE
|
||||||
#also set a make variable flagging this as a crosscompile
|
|
||||||
CROSSCOMPILE=1
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Override the build tools and some obj files to
|
# Override the build tools and some obj files to
|
||||||
@@ -277,7 +275,6 @@ ifdef CROSS_TO_WASM
|
|||||||
# originally from https://github.com/NetHack/NetHack/pull/385
|
# originally from https://github.com/NetHack/NetHack/pull/385
|
||||||
#===============-=================================================
|
#===============-=================================================
|
||||||
#also set a make variable flagging this as a crosscompile
|
#also set a make variable flagging this as a crosscompile
|
||||||
CROSSCOMPILE=1
|
|
||||||
#
|
#
|
||||||
#WASM_DEBUG = 1
|
#WASM_DEBUG = 1
|
||||||
WASM_DATA_DIR = $(TARGETPFX)wasm-data
|
WASM_DATA_DIR = $(TARGETPFX)wasm-data
|
||||||
@@ -414,8 +411,6 @@ ifdef CROSS_TO_MIPS
|
|||||||
#=================================================================
|
#=================================================================
|
||||||
|
|
||||||
CFLAGS += -DCROSSCOMPILE
|
CFLAGS += -DCROSSCOMPILE
|
||||||
#also set a make variable flagging this as a crosscompile
|
|
||||||
CROSSCOMPILE=1
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Override the build tools and some obj files to
|
# Override the build tools and some obj files to
|
||||||
@@ -492,8 +487,6 @@ ifdef CROSS_TO_AMIGA
|
|||||||
#=================================================================
|
#=================================================================
|
||||||
|
|
||||||
CFLAGS += -DCROSSCOMPILE
|
CFLAGS += -DCROSSCOMPILE
|
||||||
#also set a make variable flagging this as a crosscompile
|
|
||||||
CROSSCOMPILE=1
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Override the build tools and some obj files to
|
# Override the build tools and some obj files to
|
||||||
|
|||||||
@@ -384,7 +384,7 @@ ifdef WANT_WIN_X11
|
|||||||
USE_XPM=1
|
USE_XPM=1
|
||||||
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
|
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
|
||||||
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
|
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
|
||||||
GENTILEOFILE = $(SRCDIR)/tile.o
|
GENTILEOFILE = $(TARGETPFX)tile.o
|
||||||
# -x: if built without dlb, some versions of mkfontdir think *.lev are fonts
|
# -x: if built without dlb, some versions of mkfontdir think *.lev are fonts
|
||||||
POSTINSTALL += bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
|
POSTINSTALL += bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
|
||||||
# separate from CFLAGS so that we don't pass it to every file
|
# separate from CFLAGS so that we don't pass it to every file
|
||||||
|
|||||||
Reference in New Issue
Block a user