Skip to content

Commit

Permalink
update version for release
Browse files Browse the repository at this point in the history
  • Loading branch information
WinterMute committed Dec 12, 2015
1 parent 66b5f03 commit 814b15d
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ endif
include $(DEVKITARM)/ds_rules

export HBMENU_MAJOR := 0
export HBMENU_MINOR := 4
export HBMENU_PATCH := 7
export HBMENU_MINOR := 5
export HBMENU_PATCH := 0


VERSION := $(HBMENU_MAJOR).$(HBMENU_MINOR).$(HBMENU_PATCH)
Expand All @@ -27,7 +27,7 @@ TARGET := hbmenu
BUILD := build
SOURCES := source
INCLUDES := include
DATA := data
DATA := data
GRAPHICS := gfx

#---------------------------------------------------------------------------------
Expand All @@ -44,20 +44,20 @@ CFLAGS += $(INCLUDE) -DARM9
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions

ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
LDFLAGS = -specs=ds_arm9.specs -g -Wl,--gc-sections $(ARCH) -Wl,-Map,$(notdir $*.map)

#---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important)
#---------------------------------------------------------------------------------
LIBS := -lfat -lnds9


#---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
LIBDIRS := $(LIBNDS)

#---------------------------------------------------------------------------------
# no real need to edit anything past this point unless you need to add additional
# rules for different file extensions
Expand All @@ -78,7 +78,7 @@ CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
PNGFILES := $(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.png)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
BINFILES := load.bin bootstub.bin

#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
#---------------------------------------------------------------------------------
Expand All @@ -96,11 +96,11 @@ endif
export OFILES := $(addsuffix .o,$(BINFILES)) \
$(PNGFILES:.png=.o) \
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)

export INCLUDE := $(foreach dir,$(INCLUDES),-iquote $(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD)

export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)

icons := $(wildcard *.bmp)
Expand All @@ -112,23 +112,23 @@ else
export GAME_ICON := $(CURDIR)/icon.bmp
endif
endif

.PHONY: bootloader bootstub BootStrap $(BUILD) clean

all: bootloader bootstub $(BUILD) BootStrap

dist: all
@rm -fr hbmenu
@mkdir hbmenu
@cp hbmenu.nds hbmenu/BOOT.NDS
@cp BootStrap/_BOOT_MP.NDS BootStrap/TTMENU.DAT BootStrap/_DS_MENU.DAT BootStrap/ez5sys.bin BootStrap/akmenu4.nds hbmenu
@tar -cvjf hbmenu-$(VERSION).tar.bz2 hbmenu testfiles README.html COPYING -X exclude.lst
@tar -cvjf hbmenu-$(VERSION).tar.bz2 hbmenu testfiles README.md COPYING -X exclude.lst

#---------------------------------------------------------------------------------
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile

#---------------------------------------------------------------------------------
clean:
@echo clean ...
Expand All @@ -151,13 +151,13 @@ BootStrap:

#---------------------------------------------------------------------------------
else

#---------------------------------------------------------------------------------
# main targets
#---------------------------------------------------------------------------------
$(OUTPUT).nds : $(OUTPUT).elf
$(OUTPUT).elf : $(OFILES)

#---------------------------------------------------------------------------------
%.bin.o : %.bin
#---------------------------------------------------------------------------------
Expand All @@ -175,7 +175,7 @@ $(OUTPUT).elf : $(OFILES)
grit $< -fts -o$*

-include $(DEPSDIR)/*.d

#---------------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------------

0 comments on commit 814b15d

Please sign in to comment.