CTurt/dsgmLib
1
Fork 0
mirror of https://github.com/CTurt/dsgmLib.git synced 2025-06-19 07:05:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Directory structure refactor

Browse Source
This commit is contained in:
CTurt 2014-10-03 22:40:35 +01:00
parent 22d40171c4
commit b410ee4e07
52 changed files with 198 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
dsgmLib/build/ build/
template/build/ template/build/
template/*.elf template/*.elf
examples/*/build/ examples/*/build/

135
Makefile
View File

@ -1,6 +1,131 @@
.PHONY: all #---------------------------------------------------------------------------------
.SUFFIXES:
#---------------------------------------------------------------------------------
all: ifeq ($(strip $(DEVKITARM)),)
make -C dsgmLib $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
make -C template endif
make -C examples
include $(DEVKITARM)/ds_rules
# Uncomment for debug mode
#DSGMDEBUG := -DDEBUG
#---------------------------------------------------------------------------------
# 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
#---------------------------------------------------------------------------------
TARGET := libdsgm
BUILD := build
SOURCES := gfx source data
INCLUDES := include build
#---------------------------------------------------------------------------------
# options for code generation
#---------------------------------------------------------------------------------
ARCH := -mthumb -mthumb-interwork
CFLAGS := -g -Wall -O2 -fms-extensions\
-march=armv5te -mtune=arm946e-s -fomit-frame-pointer\
-ffast-math \
$(ARCH)
CFLAGS += $(INCLUDE) -DARM9 -DBUILDINGLIB $(DSGMDEBUG)
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 := -lnds9
LIBS := -lnds
#---------------------------------------------------------------------------------
# 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 ($(BUILD),$(notdir $(CURDIR)))
#---------------------------------------------------------------------------------
export OUTPUT := $(CURDIR)/lib/$(TARGET).a
export VPATH := $(foreach dir,$(SOURCES),$(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,$(SOURCES),$(notdir $(wildcard $(dir)/*.bin)))
#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
#---------------------------------------------------------------------------------
ifeq ($(strip $(CPPFILES)),)
#---------------------------------------------------------------------------------
export LD := $(CC)
#---------------------------------------------------------------------------------
else
#---------------------------------------------------------------------------------
export LD := $(CXX)
#---------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------
export OFILES := $(BINFILES:.bin=.o) \
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD)
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
.PHONY: $(BUILD) clean
#---------------------------------------------------------------------------------
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGET).elf $(TARGET).nds $(TARGET).ds.gba
#---------------------------------------------------------------------------------
else
DEPENDS := $(OFILES:.o=.d)
#---------------------------------------------------------------------------------
# main targets
#---------------------------------------------------------------------------------
#$(OUTPUT).nds : $(OUTPUT).elf
#$(OUTPUT).elf : $(OFILES)
$(OUTPUT) : $(OFILES)
#---------------------------------------------------------------------------------
%.o : %.bin
#---------------------------------------------------------------------------------
@echo $(notdir $<)
$(bin2o)
-include $(DEPENDS)
#---------------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------------

131
dsgmLib/Makefile
View File

@ -1,131 +0,0 @@
#---------------------------------------------------------------------------------
.SUFFIXES:
#---------------------------------------------------------------------------------
ifeq ($(strip $(DEVKITARM)),)
$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
endif
include $(DEVKITARM)/ds_rules
# Uncomment for debug mode
#DSGMDEBUG := -DDEBUG
#---------------------------------------------------------------------------------
# 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
#---------------------------------------------------------------------------------
TARGET := $(shell basename $(CURDIR))
BUILD := build
SOURCES := gfx source data
INCLUDES := include build
#---------------------------------------------------------------------------------
# options for code generation
#---------------------------------------------------------------------------------
ARCH := -mthumb -mthumb-interwork
CFLAGS := -g -Wall -O2 -fms-extensions\
-march=armv5te -mtune=arm946e-s -fomit-frame-pointer\
-ffast-math \
$(ARCH)
CFLAGS += $(INCLUDE) -DARM9 -DBUILDINGLIB $(DSGMDEBUG)
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 := -lnds9
LIBS := -lnds
#---------------------------------------------------------------------------------
# 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 ($(BUILD),$(notdir $(CURDIR)))
#---------------------------------------------------------------------------------
export OUTPUT := $(CURDIR)/$(TARGET).a
export VPATH := $(foreach dir,$(SOURCES),$(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,$(SOURCES),$(notdir $(wildcard $(dir)/*.bin)))
#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
#---------------------------------------------------------------------------------
ifeq ($(strip $(CPPFILES)),)
#---------------------------------------------------------------------------------
export LD := $(CC)
#---------------------------------------------------------------------------------
else
#---------------------------------------------------------------------------------
export LD := $(CXX)
#---------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------
export OFILES := $(BINFILES:.bin=.o) \
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD)
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
.PHONY: $(BUILD) clean
#---------------------------------------------------------------------------------
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGET).elf $(TARGET).nds $(TARGET).ds.gba
#---------------------------------------------------------------------------------
else
DEPENDS := $(OFILES:.o=.d)
#---------------------------------------------------------------------------------
# main targets
#---------------------------------------------------------------------------------
#$(OUTPUT).nds : $(OUTPUT).elf
#$(OUTPUT).elf : $(OFILES)
$(OUTPUT) : $(OFILES)
#---------------------------------------------------------------------------------
%.o : %.bin
#---------------------------------------------------------------------------------
@echo $(notdir $<)
$(bin2o)
-include $(DEPENDS)
#---------------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------------

6
examples/3D/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/Collision/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/CustomFont/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/CustomVariables/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/DrawableBackground/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/NiFi/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

BIN
examples/NiFi/NiFi.nds
View File

Binary file not shown.

6
examples/Priority/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/RoomPersistency/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/RotsetEffects/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/TopDownShooter/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

6
examples/Unpossible/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

0
dsgmLib/include/DSGM.h → include/DSGM.h
View File

0
dsgmLib/include/DSGM_3D.h → include/DSGM_3D.h
View File

0
dsgmLib/include/DSGM_alarm.h → include/DSGM_alarm.h
View File

0
dsgmLib/include/DSGM_background.h → include/DSGM_background.h
View File

0
dsgmLib/include/DSGM_drawable.h → include/DSGM_drawable.h
View File

0
dsgmLib/include/DSGM_file.h → include/DSGM_file.h
View File

0
dsgmLib/include/DSGM_input.h → include/DSGM_input.h
View File

0
dsgmLib/include/DSGM_malloc.h → include/DSGM_malloc.h
View File

0
dsgmLib/include/DSGM_misc.h → include/DSGM_misc.h
View File

9
dsgmLib/include/DSGM_object.h → include/DSGM_object.h
View File

@ -77,8 +77,13 @@ DSGM_ObjectGroup *DSGM_GetObjectGroupFull(DSGM_Room *room, u8 screen, DSGM_Objec
#define DSGM_CreateObjectInstance(screen, x, y, object) DSGM_CreateObjectInstanceFull(&DSGM_Rooms[DSGM_currentRoom], (DSGM_ObjectInstance **)&me, screen, x, y, object) #define DSGM_CreateObjectInstance(screen, x, y, object) DSGM_CreateObjectInstanceFull(&DSGM_Rooms[DSGM_currentRoom], (DSGM_ObjectInstance **)&me, screen, x, y, object)
DSGM_ObjectInstance *DSGM_CreateObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance **meP, u8 screen, int x, int y, DSGM_Object *object); DSGM_ObjectInstance *DSGM_CreateObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance **meP, u8 screen, int x, int y, DSGM_Object *object);
#define DSGM_DeleteObjectInstance(objectInstance) DSGM_DeleteObjectInstanceFull(&DSGM_Rooms[DSGM_currentRoom], (DSGM_ObjectInstance *)objectInstance) #define DSGM_DeleteObjectInstance(objectInstance) do {\
void DSGM_DeleteObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance *objectInstance); bool kill = false;\
if((DSGM_ObjectInstance *)objectInstance == (DSGM_ObjectInstance *)me) kill = true;\
DSGM_DeleteObjectInstanceFull(&DSGM_Rooms[DSGM_currentRoom], (DSGM_ObjectInstance **)&me, (DSGM_ObjectInstance *)objectInstance);\
if(kill) return;\
} while(0)
void DSGM_DeleteObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance **meP, DSGM_ObjectInstance *objectInstance);
#define DSGM_GetObjectInstanceRelation(me) DSGM_GetObjectInstanceRelationFull(&DSGM_Rooms[DSGM_currentRoom], (DSGM_ObjectInstance *)me) #define DSGM_GetObjectInstanceRelation(me) DSGM_GetObjectInstanceRelationFull(&DSGM_Rooms[DSGM_currentRoom], (DSGM_ObjectInstance *)me)
DSGM_ObjectInstanceRelation DSGM_GetObjectInstanceRelationFull(DSGM_Room *room, DSGM_ObjectInstance *me); DSGM_ObjectInstanceRelation DSGM_GetObjectInstanceRelationFull(DSGM_Room *room, DSGM_ObjectInstance *me);

0
dsgmLib/include/DSGM_palette.h → include/DSGM_palette.h
View File

0
dsgmLib/include/DSGM_projectHelper.h → include/DSGM_projectHelper.h
View File

0
dsgmLib/include/DSGM_room.h → include/DSGM_room.h
View File

0
dsgmLib/include/DSGM_sound.h → include/DSGM_sound.h
View File

0
dsgmLib/include/DSGM_sprite.h → include/DSGM_sprite.h
View File

0
dsgmLib/include/DSGM_text.h → include/DSGM_text.h
View File

0
dsgmLib/include/DSGM_view.h → include/DSGM_view.h
View File

0
dsgmLib/include/DSGM_wireless.h → include/DSGM_wireless.h
View File

BIN
dsgmLib/dsgmLib.a → lib/libdsgm.a
View File

Binary file not shown.

0
dsgmLib/source/DGM_wireless.c → source/DGM_wireless.c
View File

0
dsgmLib/source/DSGM.c → source/DSGM.c
View File

0
dsgmLib/source/DSGM_3D.c → source/DSGM_3D.c
View File

0
dsgmLib/source/DSGM_background.c → source/DSGM_background.c
View File

0
dsgmLib/source/DSGM_drawable.c → source/DSGM_drawable.c
View File

0
dsgmLib/source/DSGM_file.c → source/DSGM_file.c
View File

0
dsgmLib/source/DSGM_input.c → source/DSGM_input.c
View File

0
dsgmLib/source/DSGM_malloc.c → source/DSGM_malloc.c
View File

0
dsgmLib/source/DSGM_misc.c → source/DSGM_misc.c
View File

38
dsgmLib/source/DSGM_object.c → source/DSGM_object.c
View File

@ -210,7 +210,18 @@ DSGM_ObjectInstance *DSGM_CreateObjectInstanceFull(DSGM_Room *room, DSGM_ObjectI
} }
} }
void DSGM_DeleteObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance *objectInstance) { void DSGM_DeleteObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance **meP, DSGM_ObjectInstance *objectInstance) {
printf("full\n");
swiWaitForVBlank();
if(objectInstance->object->destroy) {
printf("destr i[ here\n");
swiWaitForVBlank();
}
DSGM_ObjectInstanceRelation relation = { 0, 0 };
if(meP && *meP) relation = DSGM_GetObjectInstanceRelationFull(room, *meP);
DSGM_ObjectGroup *group = DSGM_GetObjectGroupFull(room, objectInstance->screen, objectInstance->object); DSGM_ObjectGroup *group = DSGM_GetObjectGroupFull(room, objectInstance->screen, objectInstance->object);
if(!group) { if(!group) {
@ -228,16 +239,37 @@ void DSGM_DeleteObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance *objectI
int ID = DSGM_GetObjectInstanceIDFull(room, objectInstance); int ID = DSGM_GetObjectInstanceIDFull(room, objectInstance);
DSGM_Debug("Deleting object instance with ID %d\n", ID); DSGM_Debug("Deleting object instance with ID %d\n", ID);
if(objectInstance->object->destroy) objectInstance->object->destroy(objectInstance); printf("got ID\n");
swiWaitForVBlank();
if(objectInstance->object->destroy) {
printf("destr part 1\n");
swiWaitForVBlank();
objectInstance->object->destroy(objectInstance);
}
printf("destr\n");
swiWaitForVBlank();
DSGM_DeinitObjectInstanceRotScale(objectInstance); DSGM_DeinitObjectInstanceRotScale(objectInstance);
printf("rotscaled\n");
swiWaitForVBlank();
if(ID < group->objectInstanceCount - 1) { if(ID < group->objectInstanceCount - 1) {
DSGM_Debug("Shifting %d object instances for deletion\n", (group->objectInstanceCount - ID - 1)); DSGM_Debug("Shifting %d object instances for deletion\n", (group->objectInstanceCount - ID - 1));
memcpy(&group->objectInstances[ID], &group->objectInstances[ID + 1], (group->objectInstanceCount - ID - 1) * sizeof(DSGM_ObjectInstance)); memcpy(&group->objectInstances[ID], &group->objectInstances[ID + 1], (group->objectInstanceCount - ID - 1) * sizeof(DSGM_ObjectInstance));
} }
printf("shifted\n");
swiWaitForVBlank();
group->objectInstances = realloc(group->objectInstances, --group->objectInstanceCount * sizeof(DSGM_ObjectInstance)); group->objectInstances = realloc(group->objectInstances, --group->objectInstanceCount * sizeof(DSGM_ObjectInstance));
printf("re\n");
swiWaitForVBlank();
if(spriteNumbersChange) { if(spriteNumbersChange) {
int i; int i;
for(i = 0; i < 128; i++) { for(i = 0; i < 128; i++) {
@ -245,6 +277,8 @@ void DSGM_DeleteObjectInstanceFull(DSGM_Room *room, DSGM_ObjectInstance *objectI
} }
DSGM_RedistributeSpriteNumbers(room, screen); DSGM_RedistributeSpriteNumbers(room, screen);
} }
if(meP && *meP) *meP = DSGM_GetMeFromObjectInstanceRelationFull(room, &relation);
} }
DSGM_ObjectInstanceRelation DSGM_GetObjectInstanceRelationFull(DSGM_Room *room, DSGM_ObjectInstance *me) { DSGM_ObjectInstanceRelation DSGM_GetObjectInstanceRelationFull(DSGM_Room *room, DSGM_ObjectInstance *me) {

0
dsgmLib/source/DSGM_palette.c → source/DSGM_palette.c
View File

0
dsgmLib/source/DSGM_room.c → source/DSGM_room.c
View File

0
dsgmLib/source/DSGM_saving.c → source/DSGM_saving.c
View File

0
dsgmLib/source/DSGM_sound.c → source/DSGM_sound.c
View File

0
dsgmLib/source/DSGM_sprite.c → source/DSGM_sprite.c
View File

0
dsgmLib/source/DSGM_text.c → source/DSGM_text.c
View File

6
template/Makefile
View File

@ -8,9 +8,7 @@ endif
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
ifeq ($(strip $(DSGMLIB)),) DSGMLIB := $(DEVKITPRO)/dsgmLib
$(error "Please set in your environment. export DSGMLIB=<path to dsgmLib>")
endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
@ -46,7 +44,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important) # any extra libraries we wish to link with the project (order is important)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := $(DSGMLIB)/dsgmLib.a -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9 LIBS := -ldsgm -ldsgmdswifi9 -lfilesystem -lfat -lnds9 -lmm9
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

BIN
template/template.nds
View File

Binary file not shown.