-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from lispy2010/master
alpha2.0 some
- Loading branch information
Showing
72 changed files
with
998 additions
and
6,574 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,5 +52,6 @@ | |
| "streambuf": "cpp", | ||
| "cinttypes": "cpp", | ||
| "typeinfo": "cpp" | ||
| } | ||
| }, | ||
| "editor.formatOnSave": true | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,184 +1,185 @@ | ||
| #--------------------------------------------------------------------------------- | ||
| .SUFFIXES: | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| ifeq ($(strip $(DEVKITARM)),) | ||
| $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM") | ||
| endif | ||
|
|
||
| GAME_ICON := ../icon.bmp | ||
| GAME_TITLE := DS-Craft | ||
| GAME_SUBTITLE1 := Minecraft clone for NDS | ||
| GAME_SUBTITLE2 := Version alpha2.0 | ||
|
|
||
| include $(DEVKITARM)/ds_rules | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # TARGET is the name of the output | ||
| # BUILD is the directory where object files & intermediate files will be placed | ||
| # SOURCES is a list of directories containing source code | ||
| # INCLUDES is a list of directories containing extra header files | ||
| # DATA is a list of directories containing binary data | ||
| # AUDIO is a list of directories containing sound and music files | ||
| # GRAPHICS is a list of directories containing files to be processed by grit | ||
| # | ||
| # All directories are specified relative to the project directory where | ||
| # the makefile is found | ||
| # | ||
| #--------------------------------------------------------------------------------- | ||
| TARGET := $(notdir $(CURDIR)) | ||
| BUILD := build | ||
| SOURCES := source | ||
| DATA := data | ||
| INCLUDES := include | ||
| GRAPHICS := gfx | ||
| AUDIO := audio | ||
|
|
||
| EMULATOR := D:\melonds\melonds.exe | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # options for code generation | ||
| #--------------------------------------------------------------------------------- | ||
| ARCH := -mthumb -mthumb-interwork | ||
|
|
||
| CFLAGS := -g -Wall -O2\ | ||
| -march=armv5te -mtune=arm946e-s \ | ||
| $(ARCH) -I../include -Wno-switch -Wno-reorder | ||
|
|
||
| CFLAGS += $(INCLUDE) -DARM9 | ||
| CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions | ||
|
|
||
| ASFLAGS := -g $(ARCH) | ||
| LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # any extra libraries we wish to link with the project | ||
| #--------------------------------------------------------------------------------- | ||
| LIBS := -lmm9 -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 | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
|
|
||
| ifneq ($(BUILDDIR), $(CURDIR)) | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| export OUTPUT := $(CURDIR)/$(TARGET) | ||
|
|
||
| export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ | ||
| $(foreach dir,$(DATA),$(CURDIR)/$(dir)) \ | ||
| $(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) | ||
|
|
||
| export DEPSDIR := $(CURDIR)/$(BUILD) | ||
|
|
||
| CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) | ||
| CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) | ||
| SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) | ||
| BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) soundbank.bin | ||
| BMPFILES := $(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.bmp))) | ||
| PNGFILES := $(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.png))) | ||
|
|
||
| export AUDIOFILES := $(foreach dir,$(notdir $(wildcard $(AUDIO)/*.*)),$(CURDIR)/$(AUDIO)/$(dir)) | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # use CXX for linking C++ projects, CC for standard C | ||
| #--------------------------------------------------------------------------------- | ||
| ifeq ($(strip $(CPPFILES)),) | ||
| #--------------------------------------------------------------------------------- | ||
| export LD := $(CC) | ||
| #--------------------------------------------------------------------------------- | ||
| else | ||
| #--------------------------------------------------------------------------------- | ||
| export LD := $(CXX) | ||
| #--------------------------------------------------------------------------------- | ||
| endif | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| export OFILES_BIN := $(addsuffix .o,$(BINFILES)) | ||
|
|
||
| export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) | ||
|
|
||
| export OFILES := $(PNGFILES:.png=.o) $(BMPFILES:.bmp=.o) $(OFILES_BIN) $(OFILES_SOURCES) | ||
|
|
||
| export HFILES := $(PNGFILES:.png=.h) $(BMPFILES:.bmp=.h) $(addsuffix .h,$(subst .,_,$(BINFILES))) | ||
|
|
||
| export INCLUDE := $(foreach dir,$(INCLUDES),-iquote $(CURDIR)/$(dir)) \ | ||
| $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ | ||
| -I$(CURDIR)/$(BUILD) -Iinclude | ||
|
|
||
| export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) | ||
|
|
||
| .PHONY: $(BUILD) clean run | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| $(BUILD): | ||
| @[ -d $@ ] || mkdir -p $@ | ||
| @make BUILDDIR=`cd $(BUILD) && pwd` --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| clean: | ||
| @echo clean ... | ||
| @rm -fr $(BUILD) $(TARGET).elf $(TARGET).nds | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| run: | ||
| @echo run ... | ||
| @$(EMULATOR) $(TARGET).nds | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| else | ||
|
|
||
| DEPENDS := $(OFILES:.o=.d) | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # main targets | ||
| #--------------------------------------------------------------------------------- | ||
| $(OUTPUT).nds : $(OUTPUT).elf | ||
| $(OUTPUT).elf : $(OFILES) | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # The bin2o rule should be copied and modified | ||
| # for each extension used in the data directories | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| %.bin.o %_bin.h : %.bin | ||
| #--------------------------------------------------------------------------------- | ||
| @echo $(notdir $<) | ||
| @$(bin2o) | ||
|
|
||
| soundbank.bin: $(AUDIOFILES) | ||
| @mmutil $^ -osoundbank.bin -hsoundbank.h | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # This rule creates assembly source files using grit | ||
| # grit takes an image file and a .grit describing how the file is to be processed | ||
| # add additional rules like this for each image extension | ||
| # you use in the graphics folders | ||
| #--------------------------------------------------------------------------------- | ||
| %.s %.h : %.bmp %.grit | ||
| #--------------------------------------------------------------------------------- | ||
| grit $< -fts -o$* | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| %.s %.h : %.png %.grit | ||
| #--------------------------------------------------------------------------------- | ||
| grit $< -fts -o$* | ||
|
|
||
|
|
||
| -include $(DEPENDS) | ||
|
|
||
| #--------------------------------------------------------------------------------------- | ||
| endif | ||
| #--------------------------------------------------------------------------------------- | ||
| #--------------------------------------------------------------------------------- | ||
| .SUFFIXES: | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| ifeq ($(strip $(DEVKITARM)),) | ||
| $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM") | ||
| endif | ||
|
|
||
| GAME_ICON := ../icon.bmp | ||
| GAME_TITLE := DS-Craft | ||
| GAME_SUBTITLE1 := Minecraft clone for NDS | ||
| GAME_SUBTITLE2 := Version alpha2.0 | ||
|
|
||
| include $(DEVKITARM)/ds_rules | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # TARGET is the name of the output | ||
| # BUILD is the directory where object files & intermediate files will be placed | ||
| # SOURCES is a list of directories containing source code | ||
| # INCLUDES is a list of directories containing extra header files | ||
| # DATA is a list of directories containing binary data | ||
| # AUDIO is a list of directories containing sound and music files | ||
| # GRAPHICS is a list of directories containing files to be processed by grit | ||
| # | ||
| # All directories are specified relative to the project directory where | ||
| # the makefile is found | ||
| # | ||
| #--------------------------------------------------------------------------------- | ||
| TARGET := $(notdir $(CURDIR)) | ||
| BUILD := build | ||
| SOURCES := source | ||
| DATA := data | ||
| INCLUDES := include | ||
| GRAPHICS := gfx | ||
| AUDIO := audio | ||
|
|
||
| EMULATOR := E:\melonds\melonds.exe | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # options for code generation | ||
| #--------------------------------------------------------------------------------- | ||
| ARCH := -mthumb -mthumb-interwork | ||
|
|
||
| CFLAGS := -g -Wall -Wextra -O2\ | ||
| -march=armv5te -mtune=arm946e-s \ | ||
| $(ARCH) -I../include -Wno-switch -Wno-ignored-qualifiers \ | ||
| -Wno-unused-parameter | ||
|
|
||
| CFLAGS += $(INCLUDE) -DARM9 | ||
| CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -Wno-reorder | ||
|
|
||
| ASFLAGS := -g $(ARCH) | ||
| LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # any extra libraries we wish to link with the project | ||
| #--------------------------------------------------------------------------------- | ||
| LIBS := -lmm9 -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 | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
|
|
||
| ifneq ($(BUILDDIR), $(CURDIR)) | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| export OUTPUT := $(CURDIR)/$(TARGET) | ||
|
|
||
| export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ | ||
| $(foreach dir,$(DATA),$(CURDIR)/$(dir)) \ | ||
| $(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) | ||
|
|
||
| export DEPSDIR := $(CURDIR)/$(BUILD) | ||
|
|
||
| CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) | ||
| CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) | ||
| SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) | ||
| BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) soundbank.bin | ||
| BMPFILES := $(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.bmp))) | ||
| PNGFILES := $(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.png))) | ||
|
|
||
| export AUDIOFILES := $(foreach dir,$(notdir $(wildcard $(AUDIO)/*.wav)),$(CURDIR)/$(AUDIO)/$(dir)) | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # use CXX for linking C++ projects, CC for standard C | ||
| #--------------------------------------------------------------------------------- | ||
| ifeq ($(strip $(CPPFILES)),) | ||
| #--------------------------------------------------------------------------------- | ||
| export LD := $(CC) | ||
| #--------------------------------------------------------------------------------- | ||
| else | ||
| #--------------------------------------------------------------------------------- | ||
| export LD := $(CXX) | ||
| #--------------------------------------------------------------------------------- | ||
| endif | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| export OFILES_BIN := $(addsuffix .o,$(BINFILES)) | ||
|
|
||
| export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) | ||
|
|
||
| export OFILES := $(PNGFILES:.png=.o) $(BMPFILES:.bmp=.o) $(OFILES_BIN) $(OFILES_SOURCES) | ||
|
|
||
| export HFILES := $(PNGFILES:.png=.h) $(BMPFILES:.bmp=.h) $(addsuffix .h,$(subst .,_,$(BINFILES))) | ||
|
|
||
| export INCLUDE := $(foreach dir,$(INCLUDES),-iquote $(CURDIR)/$(dir)) \ | ||
| $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ | ||
| -I$(CURDIR)/$(BUILD) -Iinclude | ||
|
|
||
| export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) | ||
|
|
||
| .PHONY: $(BUILD) clean run | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| $(BUILD): | ||
| @[ -d $@ ] || mkdir -p $@ | ||
| @make BUILDDIR=`cd $(BUILD) && pwd` --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| clean: | ||
| @echo clean ... | ||
| @rm -fr $(BUILD) $(TARGET).elf $(TARGET).nds | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| run: | ||
| @echo run ... | ||
| @$(EMULATOR) $(TARGET).nds | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| else | ||
|
|
||
| DEPENDS := $(OFILES:.o=.d) | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # main targets | ||
| #--------------------------------------------------------------------------------- | ||
| $(OUTPUT).nds : $(OUTPUT).elf | ||
| $(OUTPUT).elf : $(OFILES) | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # The bin2o rule should be copied and modified | ||
| # for each extension used in the data directories | ||
| #--------------------------------------------------------------------------------- | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| %.bin.o %_bin.h : %.bin | ||
| #--------------------------------------------------------------------------------- | ||
| @echo $(notdir $<) | ||
| @$(bin2o) | ||
|
|
||
| soundbank.bin: $(AUDIOFILES) | ||
| @mmutil $^ -osoundbank.bin -hsoundbank.h -d | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| # This rule creates assembly source files using grit | ||
| # grit takes an image file and a .grit describing how the file is to be processed | ||
| # add additional rules like this for each image extension | ||
| # you use in the graphics folders | ||
| #--------------------------------------------------------------------------------- | ||
| %.s %.h : %.bmp %.grit | ||
| #--------------------------------------------------------------------------------- | ||
| grit $< -fts -o$* | ||
|
|
||
| #--------------------------------------------------------------------------------- | ||
| %.s %.h : %.png %.grit | ||
| #--------------------------------------------------------------------------------- | ||
| grit $< -fts -o$* | ||
|
|
||
|
|
||
| -include $(DEPENDS) | ||
|
|
||
| #--------------------------------------------------------------------------------------- | ||
| endif | ||
| #--------------------------------------------------------------------------------------- |
Oops, something went wrong.