Fix name issue with nekop2, use ${DEVKITPRO} for smdhtool, got devkitarm setup, compiles and works

This commit is contained in:
Unknown 2017-11-25 18:35:05 -08:00
parent 621567e0e6
commit 7f2f90de24
5 changed files with 7 additions and 7 deletions

View File

@ -228,7 +228,7 @@ endif
%.vsh: %.vsh:
$(TARGET).smdh: $(APP_ICON) $(TARGET).smdh: $(APP_ICON)
smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@ $(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
$(TARGET).3dsx: $(TARGET).elf $(TARGET).3dsx: $(TARGET).elf
ifeq ($(APP_BIG_TEXT_SECTION), 1) ifeq ($(APP_BIG_TEXT_SECTION), 1)
@ -236,7 +236,7 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
else else
rm -f $(TARGET).xml rm -f $(TARGET).xml
endif endif
-3dsxtool $< $@ $(_3DSXFLAGS) $(DEVKITPRO)/devkitARM/bin/3dsxtool $< $@ $(_3DSXFLAGS)
$(TARGET).elf: ctr/3dsx_custom_crt0.o $(TARGET).elf: ctr/3dsx_custom_crt0.o
$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@ $(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@

View File

@ -44,7 +44,7 @@ ifeq ($(strip $(DEVKITPRO)),)
endif endif
ifeq ($(strip $(CTRULIB)),) ifeq ($(strip $(CTRULIB)),)
CTRULIB = $(DEVKITPRO)/ctrulib CTRULIB = $(DEVKITPRO)/libctru
endif endif
APP_TITLE := $(shell echo "$(APP_TITLE)" | cut -c1-128) APP_TITLE := $(shell echo "$(APP_TITLE)" | cut -c1-128)
@ -160,7 +160,7 @@ endif
%.vsh: %.vsh:
$(TARGET).smdh: $(APP_ICON) $(TARGET).smdh: $(APP_ICON)
smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@ $(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
$(TARGET).3dsx: $(TARGET).elf $(TARGET).3dsx: $(TARGET).elf
ifeq ($(APP_BIG_TEXT_SECTION), 1) ifeq ($(APP_BIG_TEXT_SECTION), 1)

View File

@ -210,13 +210,13 @@ else ifeq ($(LIBRETRO), dosbox)
APP_ICON = pkg/ctr/assets/dosbox.png APP_ICON = pkg/ctr/assets/dosbox.png
APP_BANNER = pkg/ctr/assets/dosbox_banner.png APP_BANNER = pkg/ctr/assets/dosbox_banner.png
else ifeq ($(LIBRETRO), np2) else ifeq ($(LIBRETRO), nekop2)
APP_TITLE = Neko Project 2 APP_TITLE = Neko Project 2
APP_AUTHOR = various APP_AUTHOR = various
APP_PRODUCT_CODE = RARCH-NP2 APP_PRODUCT_CODE = RARCH-NP2
APP_UNIQUE_ID = 0xBAC1C APP_UNIQUE_ID = 0xBAC1C
APP_ICON = pkg/ctr/assets/np2.png APP_ICON = pkg/ctr/assets/nekop2.png
APP_BANNER = pkg/ctr/assets/np2_banner.png APP_BANNER = pkg/ctr/assets/nekop2_banner.png
else ifeq ($(LIBRETRO), np2kai) else ifeq ($(LIBRETRO), np2kai)
APP_TITLE = Neko Project 2 Kai APP_TITLE = Neko Project 2 Kai

View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB