darkkirb/buildtools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modified a bunch of stuff to my liking

Browse source
This commit is contained in:
Morten Delenk 2016-10-23 14:23:33 +02:00
parent b63471329c
commit 1e555db41c
No known key found for this signature in database
GPG key ID: 7A440DAC152A4743
7 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
3ds/bannertool-linux32
View file

Binary file not shown.

BIN
3ds/bannertool-linux64
View file

Binary file not shown.

BIN
3ds/bannertool-mac
View file

Binary file not shown.

BIN
3ds/bannertool32.exe
View file

Binary file not shown.

BIN
3ds/bannertool64.exe
View file

Binary file not shown.

4
3ds/template.rsf
View file

@ -1,7 +1,7 @@
BasicInfo: BasicInfo:
Title : $(APP_TITLE) Title : $(APP_TITLE)
ProductCode : $(APP_PRODUCT_CODE) ProductCode : $(APP_PRODUCT_CODE)
Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem Logo : Distributed # Nintendo / Licensed / Distributed / iQue / iQueForSystem
RomFs: RomFs:
RootPath: $(APP_ROMFS) RootPath: $(APP_ROMFS)
@ -243,7 +243,7 @@ AccessControlInfo:
SystemControlInfo: SystemControlInfo:
SaveDataSize: 0KB # Change if the app uses savedata SaveDataSize: 0KB # Change if the app uses savedata
RemasterVersion: $(APP_VERSION_MAJOR) RemasterVersion: 2
StackSize: 0x40000 StackSize: 0x40000
# Modules that run services listed above should be included below # Modules that run services listed above should be included below

30
make_base
View file

@ -57,12 +57,8 @@ OBJECT_FILES := $(filter-out $(BUILT_FILTER),$(OBJECT_FILES))
OUTPUT_ZIP_FILE ?= $(OUTPUT_DIR)/$(STRIPPED_NAME).zip OUTPUT_ZIP_FILE ?= $(OUTPUT_DIR)/$(STRIPPED_NAME).zip
VERSION_MAJOR ?= 0
VERSION_MINOR ?= 0
VERSION_MICRO ?= 0
LD_FLAGS := $(patsubst %,-L%/lib,$(LIBRARY_DIRS)) $(patsubst %,-l%,$(LIBRARIES)) LD_FLAGS := $(patsubst %,-L%/lib,$(LIBRARY_DIRS)) $(patsubst %,-l%,$(LIBRARIES))
COMMON_CC_FLAGS := $(sort $(foreach dir,$(SOURCE_DIRS),$(patsubst %,-I$(BUILD_DIR)/%,$(dir $(call rwildcard,$(dir),*))))) $(patsubst %,-I%,$(INCLUDE_DIRS)) $(patsubst %,-I%/include,$(LIBRARY_DIRS)) -g -Wall -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) $(BUILD_FLAGS) COMMON_CC_FLAGS := $(sort $(foreach dir,$(SOURCE_DIRS),$(patsubst %,-I$(BUILD_DIR)/%,$(dir $(call rwildcard,$(dir),*))))) $(patsubst %,-I%,$(INCLUDE_DIRS)) $(patsubst %,-I%/include,$(LIBRARY_DIRS)) -g -Wall $(BUILD_FLAGS)
ifeq ($(findstring -O,$(BUILD_FLAGS)),) ifeq ($(findstring -O,$(BUILD_FLAGS)),)
COMMON_CC_FLAGS += -O2 COMMON_CC_FLAGS += -O2
@ -88,9 +84,11 @@ ifeq ($(TARGET),3DS)
OBJECT_FILES := $(filter-out $(BUILT_FILTER),$(OBJECT_FILES)) OBJECT_FILES := $(filter-out $(BUILT_FILTER),$(OBJECT_FILES))
REMOTE_IP ?= 127.0.0.1 # User-defined ifeq ($(strip $(TITLE)),)
TITLE := $(NAME)
endif
TITLE ?= $(NAME) REMOTE_IP ?= 127.0.0.1 # User-defined
CATEGORY ?= Application CATEGORY ?= Application
USE_ON_SD ?= true USE_ON_SD ?= true
@ -131,10 +129,16 @@ ifeq ($(TARGET),3DS)
BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-linux32 BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-linux32
CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-linux32 CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-linux32
endif endif
else ifeq ($(UNAME_S),Darwin) else
ifeq ($(UNAME_S),Darwin)
MAKEROM := $(BUILDTOOLS_DIR)/3ds/makerom-mac MAKEROM := $(BUILDTOOLS_DIR)/3ds/makerom-mac
BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-mac BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-mac
CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-mac CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-mac
else
MAKEROM := makerom
BANNERTOOL := bannertool
CITRA := citra
endif
endif endif
endif endif
@ -148,7 +152,7 @@ ifeq ($(TARGET),3DS)
COMMON_CC_FLAGS += -mword-relocations -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -DARM11 -D_3DS COMMON_CC_FLAGS += -mword-relocations -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -DARM11 -D_3DS
_3DSXTOOL_FLAGS := _3DSXTOOL_FLAGS :=
COMMON_MAKEROM_FLAGS := -rsf $(BUILDTOOLS_DIR)/3ds/template.rsf -target t -exefslogo -icon $(BUILD_DIR)/icon.icn -banner $(BUILD_DIR)/banner.bnr -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_TITLE="$(TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" -DAPP_SYSTEM_MODE="$(SYSTEM_MODE)" -DAPP_SYSTEM_MODE_EXT="$(SYSTEM_MODE_EXT)" -DAPP_CATEGORY="$(CATEGORY)" -DAPP_USE_ON_SD="$(USE_ON_SD)" -DAPP_MEMORY_TYPE="$(MEMORY_TYPE)" -DAPP_CPU_SPEED="$(CPU_SPEED)" -DAPP_ENABLE_L2_CACHE="$(ENABLE_L2_CACHE)" -DAPP_VERSION_MAJOR="$(VERSION_MAJOR)" COMMON_MAKEROM_FLAGS := -rsf $(BUILDTOOLS_DIR)/3ds/template.rsf -target t -exefslogo -icon $(BUILD_DIR)/icon.icn -banner $(BUILD_DIR)/banner.bnr -DAPP_TITLE="$(TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" -DAPP_SYSTEM_MODE="$(SYSTEM_MODE)" -DAPP_SYSTEM_MODE_EXT="$(SYSTEM_MODE_EXT)" -DAPP_CATEGORY="$(CATEGORY)" -DAPP_USE_ON_SD="$(USE_ON_SD)" -DAPP_MEMORY_TYPE="$(MEMORY_TYPE)" -DAPP_CPU_SPEED="$(CPU_SPEED)" -DAPP_ENABLE_L2_CACHE="$(ENABLE_L2_CACHE)"
ifneq ("$(wildcard $(ROMFS_DIR))","") ifneq ("$(wildcard $(ROMFS_DIR))","")
_3DSXTOOL_FLAGS += --romfs=$(ROMFS_DIR) _3DSXTOOL_FLAGS += --romfs=$(ROMFS_DIR)
@ -251,8 +255,8 @@ endif
# FINAL COMMON SETUP # # FINAL COMMON SETUP #
CC_FLAGS := $(COMMON_CC_FLAGS) -std=gnu99 CC_FLAGS := $(COMMON_CC_FLAGS) -std=gnu99 -I$(DEVKITPRO)/portlibs/armv6k/include -O0 -w -Werror -Wno-unused -Wno-unused-variable -fPIC
CXX_FLAGS := $(COMMON_CC_FLAGS) -std=gnu++11 CXX_FLAGS := $(COMMON_CC_FLAGS) -std=gnu++11 -I$(DEVKITPRO)/portlibs/armv6k/include -O0 -w -Werror -Wno-unused -Wno-unused-variable -fPIC
ifneq ($(EXTRA_OUTPUT_FILES),) ifneq ($(EXTRA_OUTPUT_FILES),)
EXTRA_OUTPUT_COPY_CMD := cp -r $(EXTRA_OUTPUT_FILES) $(OUTPUT_DIR) EXTRA_OUTPUT_COPY_CMD := cp -r $(EXTRA_OUTPUT_FILES) $(OUTPUT_DIR)
@ -318,7 +322,7 @@ $(BUILD_DIR)/%.shbin.c: %.shlist
%.icn: $(ICON) %.icn: $(ICON)
@echo $@ @echo $@
@$(BANNERTOOL) makesmdh -s "$(TITLE)" -l "$(TITLE) - $(DESCRIPTION)" -p "$(AUTHOR)" -i $(ICON) $(ICON_FLAGS) -o $@ > /dev/null @$(BANNERTOOL) makesmdh -s "$(TITLE)" -l "$(TITLE)" -p "$(AUTHOR)" -i $(ICON) $(ICON_FLAGS) -o $@ > /dev/null
%.smdh: $(ICON) %.smdh: $(ICON)
@echo $@ @echo $@
@ -330,7 +334,7 @@ $(OUTPUT_DIR)/3ds/$(STRIPPED_NAME)/%.3dsx: $(OUTPUT_DIR)/%.elf $(BUILD_DIR)/meta
%.3ds: %.elf $(BUILD_DIR)/banner.bnr $(BUILD_DIR)/icon.icn %.3ds: %.elf $(BUILD_DIR)/banner.bnr $(BUILD_DIR)/icon.icn
@echo $@ @echo $@
@$(MAKEROM) -f cci -o $@ -elf $< -DAPP_ENCRYPTED=true $(COMMON_MAKEROM_FLAGS) @$(MAKEROM) -f cci -o $@ -elf $< -DAPP_ENCRYPTED=false $(COMMON_MAKEROM_FLAGS)
%.cia: %.elf $(BUILD_DIR)/banner.bnr $(BUILD_DIR)/icon.icn %.cia: %.elf $(BUILD_DIR)/banner.bnr $(BUILD_DIR)/icon.icn
@echo $@ @echo $@