From a0ae74b1ff15872c83ead7fef4831cc58630d6e0 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Fri, 7 Oct 2005 16:48:24 +0000 Subject: [PATCH] Working on linux dist. --- bootloader/Makefile | 4 ++-- build/linux/make.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootloader/Makefile b/bootloader/Makefile index 60d1c03e6..8c0edd375 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -13,7 +13,7 @@ ISPPARAMS = -dprog=stk500 -dserial=$(SERIAL) -dspeed=115200 #DIRAVR = /usr/local/avr DIRAVRBIN = $(DIRAVR)/bin DIRAVRUTILS = $(DIRAVR)/utils/bin -DIRINC = . +DIRINC = $(DIRAVR)/include DIRLIB = $(DIRAVR)/avr/lib @@ -36,7 +36,7 @@ CC = $(DIRAVRBIN)/avr-gcc # Override is only needed by avr-lib build system. -override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -D$(PRODUCT) $(DEFS) +override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -D$(PRODUCT) $(DEFS) -I$(DIRINC) override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION) OBJCOPY = $(DIRAVRBIN)/avr-objcopy diff --git a/build/linux/make.sh b/build/linux/make.sh index 3aff0cb47..87d08fd95 100755 --- a/build/linux/make.sh +++ b/build/linux/make.sh @@ -96,7 +96,7 @@ echo Building the PDE... # compile the code as java 1.3, so that the application will run and # show the user an error, rather than crapping out with some strange # "class not found" crap -jikes -target 1.3 +D -classpath ../build/linux/work/classes:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/oro.jar:../build/linux/work/lib/registry.jar:../build/linux/work/lib/RXTXcomm.jar:../build/linux/work/lib/mrj.jar:$CLASSPATH -d ../build/linux/work/classes tools/*.java preproc/*.java syntax/*.java *.java +jikes -classpath ../build/linux/work/classes:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/oro.jar:../build/linux/work/lib/registry.jar:../build/linux/work/lib/RXTXcomm.jar:../build/linux/work/lib/mrj.jar:$CLASSPATH -d ../build/linux/work/classes tools/*.java preproc/*.java syntax/*.java *.java cd ../build/linux/work/classes rm -f ../lib/pde.jar