*** empty log message ***

This commit is contained in:
Dave Murphy 2005-07-03 21:30:09 +00:00
parent 27f1e4615f
commit 088eeca46f
7 changed files with 69 additions and 57 deletions

View File

@ -47,9 +47,9 @@ define bin2o
padbin 4 $(<)
$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
--rename-section .data=.rodata,readonly,data,contents,alloc \
--redefine-sym _binary_`(echo $(<) | sed -e 's/^\///' | sed -e 's/^\([a-zA-Z]\/\)/\1_/' | tr . _ | tr / _)`_start=`(echo $(<F) | tr . _)`\
--redefine-sym _binary_`(echo $(<) | sed -e 's/^\///' | sed -e 's/^\([a-zA-Z]\/\)/\1_/' | tr . _ | tr / _)`_end=`(echo $(<F) | tr . _)`_end\
--redefine-sym _binary_`(echo $(<) | sed -e 's/^\///' | sed -e 's/^\([a-zA-Z]\/\)/\1_/' | tr . _ | tr / _)`_size=`(echo $(<F) | tr . _)`_size\
--redefine-sym _binary_`(echo $(<) | sed -e 's/^\/\([a-zA-Z]\/\)/\1_/' | tr . _ | tr / _)`_start=`(echo $(<F) | tr . _)`\
--redefine-sym _binary_`(echo $(<) | sed -e 's/^\/\([a-zA-Z]\/\)/\1_/' | tr . _ | tr / _)`_end=`(echo $(<F) | tr . _)`_end\
--redefine-sym _binary_`(echo $(<) | sed -e 's/^\/\([a-zA-Z]\/\)/\1_/' | tr . _ | tr / _)`_size=`(echo $(<F) | tr . _)`_size\
$(<) $(@)
echo "extern const u32" `(echo $(<F) | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
echo "extern const u8" `(echo $(<F) | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h

View File

@ -62,14 +62,8 @@ export OBJCOPY := $(PREFIX)objcopy
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
PCXFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pcx)))
BINFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.bin)))
PALFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pal)))
RAWFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.raw)))
MAPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.map)))
export OFILES := $(MAPFILES:.map=.o) $(RAWFILES:.raw=.o) $(PALFILES:.pal=.o) $(BINFILES:.bin=.o) $(PCXFILES:.pcx=.o)\
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \

View File

@ -1,22 +1,26 @@
#---------------------------------------------------------------------------------
.SUFFIXES:
#---------------------------------------------------------------------------------
-include $(DEVKITARM)/ds_rules
include $(DEVKITARM)/ds_rules
export TARGET := template
#---------------------------------------------------------------------------------
# main targets
#---------------------------------------------------------------------------------
.PHONY: $(TARGET).nds
.PHONY: arm7/$(TARGET).arm7 arm9/$(TARGET).arm9
$(TARGET).ds.gba : $(TARGET).nds
$(TARGET).nds :
@make -C arm7
@make -C arm9
$(TARGET).nds : arm7/$(TARGET).arm7 arm9/$(TARGET).arm9
@ndstool -c $(TARGET).nds -7 arm7/$(TARGET).arm7 -9 arm9/$(TARGET).arm9
arm7/$(TARGET).arm7 :
@make -C arm7
arm9/$(TARGET).arm9 :
@make -C arm9
clean:
@make -C arm9 clean
@make -C arm7 clean

View File

@ -9,7 +9,7 @@
# INCLUDES is a list of directories containing extra header files
#---------------------------------------------------------------------------------
BUILD := build
SOURCES := gfx source data
SOURCES := source
INCLUDES := include build
#---------------------------------------------------------------------------------
@ -50,7 +50,8 @@ ifneq ($(BUILD),$(notdir $(CURDIR)))
#---------------------------------------------------------------------------------
export OUTPUT := $(CURDIR)/$(TARGET)
export DEPSDIR := $(CURDIR)/$(BUILD)
export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir))
export CC := $(PREFIX)gcc
@ -61,14 +62,8 @@ export OBJCOPY := $(PREFIX)objcopy
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
PCXFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pcx)))
BINFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.bin)))
PALFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pal)))
RAWFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.raw)))
MAPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.map)))
export OFILES := $(MAPFILES:.map=.o) $(RAWFILES:.raw=.o) $(PALFILES:.pal=.o) $(BINFILES:.bin=.o) $(PCXFILES:.pcx=.o)\
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \

View File

@ -53,7 +53,8 @@ ifneq ($(BUILD),$(notdir $(CURDIR)))
#---------------------------------------------------------------------------------
export OUTPUT := $(CURDIR)/$(TARGET)
export DEPSDIR := $(CURDIR)/$(BUILD)
export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir))
export CC := $(PREFIX)gcc
@ -64,11 +65,6 @@ export OBJCOPY := $(PREFIX)objcopy
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
PCXFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pcx)))
BINFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.bin)))
PALFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pal)))
RAWFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.raw)))
MAPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.map)))
#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
@ -84,8 +80,7 @@ else
endif
#---------------------------------------------------------------------------------
export OFILES := $(MAPFILES:.map=.o) $(RAWFILES:.raw=.o) $(PALFILES:.pal=.o) $(BINFILES:.bin=.o) $(PCXFILES:.pcx=.o)\
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \

View File

@ -7,6 +7,11 @@ void irqVBlank(void) {
IF = IF;
}
eroe
eprpweor
//---------------------------------------------------------------------------------
int main(void) {
//---------------------------------------------------------------------------------

View File

@ -1,12 +1,12 @@
[Project ID]
Signature=UE Proj: v.1
[Group]
0=arm7
0=
1=arm7 - include
2=arm7 - source
3=arm9
4=arm9 - include
5=arm9 - source
5=
6=
[Project Information]
Filter=*.*
@ -17,32 +17,51 @@ Project Wordfile=
Project Tagfile=
Create Tagfile=0
Include Sub Directories=0
[Files - arm9 - source]
0=arm9\source\template.c
[Open Files]
Open File0=C:\devkitPro\devkitARM\base_rules
Active File Display Mode=3
Open File Pos0=1116
Open File Line0=622
Open File Window Pos0=0,1,-1,-1,-4,-23,44,44,944,423
Open File1=C:\projects\devkitPro\buildscripts\build-devkit.sh
Open File Pos1=5763
Open File Line1=5276
Open File Window Pos1=0,1,-1,-1,-4,-23,88,88,988,467
Open File2=C:\Program Files\HMSoft\NIS Edit\tools\iss2nsi\readme.txt
Open File Pos2=0
Open File Line2=0
Active File Index=2
Open File Window Pos2=2,3,-1,-1,-4,-23,110,110,1010,489
Open File3=
Open File Pos3=0
Open File Line3=0
Open File Window Pos3=0,1,-1,-1,-4,-23,66,66,966,445
Open File4=C:\projects\devkitPro\buildscripts\templates\devkitARM\nds\template\arm7\Makefile
Open File Pos4=0
Open File Line4=0
Open File Window Pos4=0,1,-1,-1,-4,-23,88,88,988,467
Open File5=C:\projects\devkitPro\examples\gba\mbv2print\Makefile
Open File Pos5=2756
Open File Line5=1687
Open File Window Pos5=0,1,-1,-1,-4,-23,110,110,1010,489
Open File6=C:\projects\devkitPro\buildscripts\templates\devkitARM\nds\template\combined\arm9\Makefile
Open File Pos6=3484
Open File Line6=4128
Open File Window Pos6=0,1,-1,-1,-4,-23,132,132,1032,511
Open File7=
[File View]
Current Select=Project Files\arm9\source\template.c
Scroll Position=0
[Files - arm7 - source]
0=arm7\source\template.c
[Files - arm7]
0=arm7\Makefile
[Files - arm9 - source]
0=arm9\source\template.c
[Files - arm9]
0=arm9\Makefile
0=arm9\source\
1=arm9\Makefile
[Files]
0=Makefile
[Open Files]
Open File0=C:\projects\devkitPro\buildscripts\templates\devkitARM\nds\template\combined\Makefile
Active File Display Mode=3
Open File Pos0=0
Open File Line0=0
Open File Window Pos0=0,1,-1,-1,-4,-23,22,22,896,462
Open File1=C:\projects\devkitPro\buildscripts\templates\devkitARM\nds\template\combined\arm7\Makefile
Open File Pos1=0
Open File Line1=0
Open File Window Pos1=0,1,-1,-1,-4,-23,44,44,922,488
Open File2=C:\projects\USB\neowriter\source\neousb.cpp
Open File Pos2=0
Open File Line2=13242
Active File Index=2
Open File Window Pos2=2,3,-1,-1,-4,-23,88,88,966,532
Open File3=
[File View]
Current Select=Project Files
Scroll Position=0
0=arm7\source\
1=arm9\source\
2=Makefile