changed paths in config files
This commit is contained in:
parent
883e642618
commit
75b4e005ce
|
@ -51,7 +51,7 @@ loadables: $(OUTFILE).bin
|
|||
clean:
|
||||
rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex
|
||||
@cd core && $(MAKE) clean
|
||||
@cd tools && $(MAKE) clean
|
||||
@cd ../tools/bootloader && $(MAKE) clean
|
||||
@cd lcd && $(MAKE) clean
|
||||
@cd modules && $(MAKE) clean
|
||||
@cd filesystem && $(MAKE) clean
|
||||
|
@ -78,8 +78,8 @@ filesystem/libfat.a:
|
|||
usb/libusb.a:
|
||||
cd usb && $(MAKE) ROOT_PATH=../$(ROOT_PATH)
|
||||
|
||||
tools/lpcfix:
|
||||
cd tools && $(MAKE)
|
||||
../tools/bootloader/lpcfix:
|
||||
cd ../tools/bootloader && $(MAKE)
|
||||
|
||||
$(LD_TEMP):
|
||||
-@echo "MEMORY" > $(LD_TEMP)
|
||||
|
|
|
@ -26,7 +26,7 @@ SIZE = $(CROSS_COMPILE)size
|
|||
OBJCOPY = $(CROSS_COMPILE)objcopy
|
||||
OBJDUMP = $(CROSS_COMPILE)objdump
|
||||
OUTFILE = firmware
|
||||
LPCFIX = tools/lpcfix
|
||||
LPCFIX = ../tools/bootloader/lpcfix
|
||||
|
||||
ifeq (LPC11xx,$(TARGET))
|
||||
CORTEX_TYPE=m0
|
||||
|
|
|
@ -33,8 +33,7 @@ push @charlist,map {ord $_} qw(
|
|||
my ($verbose,$raw);
|
||||
my $size=18;
|
||||
|
||||
my $font="../ttf/Ubuntu-Regular.ttf";
|
||||
$font="6x9.bdf";
|
||||
my $font="ttf/Ubuntu-Regular.ttf";
|
||||
|
||||
GetOptions ("size=i" => \$size, # numeric
|
||||
"font=s" => \$font, # string
|
||||
|
|
Loading…
Reference in New Issue