From 5872753e2dbdca5b252470c5210cdf54ee1788dd Mon Sep 17 00:00:00 2001
From: laforge <laforge@6dc7ffe9-61d6-0310-9af1-9938baff3ed1>
Date: Mon, 25 Sep 2006 21:23:52 +0000
Subject: - Include tool for Converting ASCII to UTF-16LE in C-Header - Build
 UTF-16LE USB String descriptors from ASCII File - Introduce USB String
 Descriptor to DFU and runtime firmware

git-svn-id: https://svn.openpcd.org:2342/trunk@227 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
---
 firmware/Makefile.dfu | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'firmware/Makefile.dfu')

diff --git a/firmware/Makefile.dfu b/firmware/Makefile.dfu
index 99cd1b1..ae98f1c 100644
--- a/firmware/Makefile.dfu
+++ b/firmware/Makefile.dfu
@@ -69,6 +69,8 @@ PATH_TO_LINKSCRIPTS=link/
 # Target file name (without extension).
 TARGET:=dfu
 
+USBSTRINGS=src/picc/usb_strings_dfu.h src/pcd/usb_strings_dfu.h
+
 # List C source files here. (C dependencies are automatically generated.)
 # use file-extension c for "c-only"-files
 SRC = 
@@ -161,16 +163,18 @@ endif
 ifeq ($(BOARD),PICC)
 CDEFS += -DPICC
 ADEFS += -DPICC
+CINCS  = -Isrc/picc
 endif
 
 ifeq ($(BOARD),PCD)
 SUBMDL = AT91SAM7S128
 CDEFS += -DPCD
 ADEFS += -DPCD
+CINCS  = -Isrc/pcd
 endif
 
 # Place -I options here
-CINCS = -Iinclude -Isrc
+CINCS += -Iinclude -Isrc
 
 # Place -D or -U options for ASM here
 ADEFS +=  -D$(RUN_MODE)
@@ -465,7 +469,7 @@ $(COBJ) : %.o : %.c
 	$(CC) -c $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@ 
 
 # Compile: create object files from C source files. ARM-only
-$(COBJARM) : %.o : %.c include/compile.h
+$(COBJARM) : %.o : %.c include/compile.h $(USBSTRINGS)
 	@echo
 	@echo $(MSG_COMPILING_ARM) $<
 	$(CC) -c $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@ 
@@ -536,11 +540,16 @@ clean_list :
 	$(REMOVE) $(CPPSRCARM:.cpp=.s) 
 	$(REMOVE) $(CPPSRCARM:.cpp=.d)
 	$(REMOVE) .dep/*
+	$(REMOVE) src/picc/usb_strings_dfu.h
+	$(REMOVE) src/dfu/usb_strings_dfu.h
 
 .PHONY: include/compile.h
 include/compile.h: 
 	scripts/mkcompile_h > $@
 
+$(USBSTRINGS): %.h : %.txt ./scripts/usbstring
+	cat $< | ./scripts/usbstring > $@
+
 # Include the dependency files.
 -include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
 
-- 
cgit v1.2.3