print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix CROSS variable on multiple environments (#483)

Browse Source 
The name of the compiler that CROSS is set to varies from system to
system. (gcc-mips-linux-gnu on Debian) This was not handled in
s2d_engine and calc_bss.sh
This commit is contained in:
Chasarr
2022-10-01 00:54:07 +02:00
committed by GitHub
parent da4b4db7ae
commit 0dd3ef7f50
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -119,20 +119,10 @@ else ifeq ($(GRUCODE),super3d) # Super3D
DEFINES += SUPER3D_GBI=1 F3D_NEW=1
endif
LIBRARIES := nustd hvqm2 z goddard
# TEXT ENGINES
# s2dex_text_engine - Text Engine by someone2639
TEXT_ENGINE := none
ifeq ($(TEXT_ENGINE), s2dex_text_engine)
DEFINES += S2DEX_GBI_2=1 S2DEX_TEXT_ENGINE=1
LIBRARIES += s2d_engine
DUMMY != make -C src/s2d_engine COPY_DIR=$(shell pwd)/lib/
endif
# add more text engines here
LINK_LIBRARIES = $(foreach i,$(LIBRARIES),-l$(i))
$(eval $(call validate-option,TEXT_ENGINE,none s2dex_text_engine))
#==============================================================================#
# Optimization flags #
@@ -417,6 +407,18 @@ else
$(error Unable to detect a suitable MIPS toolchain installed)
endif
LIBRARIES := nustd hvqm2 z goddard
# Text engine
ifeq ($(TEXT_ENGINE), s2dex_text_engine)
DEFINES += S2DEX_GBI_2=1 S2DEX_TEXT_ENGINE=1
LIBRARIES += s2d_engine
DUMMY != $(MAKE) -C src/s2d_engine COPY_DIR=$(shell pwd)/lib/ CROSS=$(CROSS)
endif
# add more text engines here
LINK_LIBRARIES = $(foreach i,$(LIBRARIES),-l$(i))
export LD_LIBRARY_PATH=./tools
AS := $(CROSS)as

1
src/s2d_engine/Makefile
View File

@@ -10,7 +10,6 @@ DUMMY != mkdir -p $(BUILD_DIR)
C_FILES = $(wildcard ./*.c)
O_FILES = $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o))
CROSS := mips-linux-gnu-
CC = $(CROSS)gcc
AR = $(CROSS)ar

16
tools/calc_bss.sh
View File

@@ -18,8 +18,24 @@ if [ -z "$QEMU_IRIX" ]; then
exit 1
fi
# detect prefix for MIPS toolchain unless CROSS is already defined
if [ -z "$CROSS" ]; then
if command -v mips64-elf-ld &> /dev/null ; then
CROSS=mips64-elf-
elif command -v mips-n64-ld &> /dev/null ; then
CROSS=mips-n64-
elif command -v mips64-ld &> /dev/null ; then
CROSS=mips64-
elif command -v mips-linux-gnu-ld &> /dev/null ; then
CROSS=mips-linux-gnu-
elif command -v mips64-linux-gnu-ld &> /dev/null ; then
CROSS=mips64-linux-gnu-
elif command -v mips-ld &> /dev/null ; then
CROSS=mips-
else
echo "Unable to detect a suitable MIPS toolchain installed"
exit 1
fi
fi
# bss indexing starts at 3