Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add .app support and fixed warning (#126)

This commit is contained in:
EmeraldLoc 2022-06-05 21:11:58 -05:00 committed by GitHub
parent 074c915335
commit 1d89f4353e
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -68,6 +68,8 @@ PROFILE ?= 0
HEADLESS ?= 0 HEADLESS ?= 0
# Enable Game ICON # Enable Game ICON
ICON ?= 1 ICON ?= 1
# Use .app (mac only)
USE_APP ?= 1
# Various workarounds for weird toolchains # Various workarounds for weird toolchains
NO_BZERO_BCOPY ?= 0 NO_BZERO_BCOPY ?= 0
@ -380,12 +382,21 @@ endif
COMPARE ?= 1 COMPARE ?= 1
$(eval $(call validate-option,COMPARE,0 1)) $(eval $(call validate-option,COMPARE,0 1))
ifeq ($(OSX_BUILD),0)
USE_APP := 0
endif
ifeq ($(USE_APP),0)
TARGET_STRING := sm64.$(VERSION).$(GRUCODE) TARGET_STRING := sm64.$(VERSION).$(GRUCODE)
else
TARGET_STRING := sm64.$(VERSION).$(GRUCODE).app
endif
# If non-default settings were chosen, disable COMPARE # If non-default settings were chosen, disable COMPARE
ifeq ($(filter $(TARGET_STRING), sm64.jp.f3d_old sm64.us.f3d_old sm64.eu.f3d_new sm64.sh.f3d_new),) ifeq ($(filter $(TARGET_STRING), sm64.jp.f3d_old sm64.us.f3d_old sm64.eu.f3d_new sm64.sh.f3d_new),)
COMPARE := 0 COMPARE := 0
endif endif
# Whether to hide commands or not # Whether to hide commands or not
VERBOSE ?= 0 VERBOSE ?= 0
ifeq ($(VERBOSE),0) ifeq ($(VERBOSE),0)
@ -673,7 +684,11 @@ ifeq ($(WINDOWS_AUTO_BUILDER),1)
else ifeq ($(COMPILER),gcc) else ifeq ($(COMPILER),gcc)
CC := $(CROSS)gcc CC := $(CROSS)gcc
CXX := $(CROSS)g++ CXX := $(CROSS)g++
EXTRA_CFLAGS += -Wno-unused-result -Wno-format-truncation ifeq ($(OSX_BUILD),0)
EXTRA_CFLAGS += -Wno-unused-result -Wno-format-truncation
else
EXTRA_CFLAGS += -Wno-unused-result
endif
else ifeq ($(COMPILER),clang) else ifeq ($(COMPILER),clang)
CC := clang CC := clang
CXX := clang++ CXX := clang++
@ -1166,14 +1181,13 @@ endif
clean: clean:
$(RM) -r $(BUILD_DIR_BASE) $(RM) -r $(BUILD_DIR_BASE)
cleantools: cleantools:
$(MAKE) -s -C $(TOOLS_DIR) clean $(MAKE) -s -C $(TOOLS_DIR) clean
distclean: clean distclean: clean
$(PYTHON) extract_assets.py --clean $(PYTHON) extract_assets.py --clean
cleantools
test: $(ROM) test: $(ROM)
$(EMULATOR) $(EMU_FLAGS) $< $(EMULATOR) $(EMU_FLAGS) $<