diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-08-21 20:26:53 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-08-21 20:26:53 +0000 |
commit | 8ccd04c33d09faa09c648d38848ae284120b2c95 (patch) | |
tree | 09c029c1836a06f3f079cd3b2743b1596dcdf45f | |
parent | 0119ebb04466fbf10cb2d191313cd123d818acef (diff) | |
download | rockbox-8ccd04c33d09faa09c648d38848ae284120b2c95.tar.gz rockbox-8ccd04c33d09faa09c648d38848ae284120b2c95.zip |
Add CheckWPS entry to tools/configure
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22456 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | tools/checkwps/Makefile | 32 | ||||
-rwxr-xr-x | tools/checkwps/buildall.sh | 2 | ||||
-rw-r--r-- | tools/checkwps/checkwps.make | 34 | ||||
-rwxr-xr-x | tools/configure | 12 |
4 files changed, 57 insertions, 23 deletions
diff --git a/tools/checkwps/Makefile b/tools/checkwps/Makefile index 2f127af618..faa75efac3 100644 --- a/tools/checkwps/Makefile +++ b/tools/checkwps/Makefile | |||
@@ -7,8 +7,6 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | ROOT=../.. | ||
11 | |||
12 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) | 10 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) |
13 | CFLAGS+=-mno-cygwin | 11 | CFLAGS+=-mno-cygwin |
14 | EXT = .exe | 12 | EXT = .exe |
@@ -19,28 +17,20 @@ CC = mingw32-gcc | |||
19 | endif | 17 | endif |
20 | endif | 18 | endif |
21 | 19 | ||
22 | COMMON=$(ROOT)/apps/gui/skin_engine/wps_debug.c \ | 20 | # This is a wrapper for checkwps.make |
23 | $(ROOT)/apps/gui/skin_engine/skin_parser.c \ | 21 | APPSDIR=. |
24 | $(ROOT)/apps/gui/skin_engine/skin_buffer.c \ | 22 | ROOTDIR=../.. |
25 | $(ROOT)/apps/misc.c \ | 23 | BUILDDIR=. |
26 | $(ROOT)/apps/recorder/bmp.c \ | 24 | BINARY=checkwps.$(MODELNAME)$(EXT) |
27 | $(ROOT)/firmware/common/strlcpy.c | 25 | HOSTCC=$(CC) |
28 | 26 | TARGET=-D$(TARGETNAME) | |
29 | INCLUDE=-I $(ROOT)/apps/gui \ | 27 | include checkwps.make |
30 | -I $(ROOT)/apps/gui/skin_engine \ | ||
31 | -I $(ROOT)/firmware/export \ | ||
32 | -I $(ROOT)/apps \ | ||
33 | -I $(ROOT)/apps/recorder \ | ||
34 | -I . | ||
35 | |||
36 | CFLAGS = -g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" | ||
37 | 28 | ||
38 | all: | 29 | all: |
39 | @echo To build, run the buildall.sh script | 30 | @echo To build, run the buildall.sh script |
40 | 31 | ||
41 | checkwps: checkwps.c $(COMMON) | 32 | checkwps: $(BUILDDIR)/$(BINARY) |
42 | @echo CC [$(TARGET)] | 33 | @echo foo > /dev/null |
43 | @$(CC) $(INCLUDE) $(CFLAGS) $(COMMON) -D$(TARGET) checkwps.c -o $@.$(MODEL)$(EXT) | ||
44 | 34 | ||
45 | clean: | 35 | clean: |
46 | rm -f checkwps.$(MODEL)$(EXT) | 36 | rm -f checkwps.$(MODELNAME)$(EXT) |
diff --git a/tools/checkwps/buildall.sh b/tools/checkwps/buildall.sh index 8d0ad9fd21..b66bee224c 100755 --- a/tools/checkwps/buildall.sh +++ b/tools/checkwps/buildall.sh | |||
@@ -5,7 +5,7 @@ cat $rootdir/targets.txt | ( | |||
5 | while read target model | 5 | while read target model |
6 | do | 6 | do |
7 | rm -f checkwps.$model | 7 | rm -f checkwps.$model |
8 | make -s -C $rootdir MODEL=$model TARGET=$target checkwps | 8 | make -s -C $rootdir MODELNAME=$model TARGETNAME=$target checkwps |
9 | mv $rootdir/checkwps.$model ./checkwps.$model > /dev/null 2>&1 | 9 | mv $rootdir/checkwps.$model ./checkwps.$model > /dev/null 2>&1 |
10 | done | 10 | done |
11 | ) | 11 | ) |
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make new file mode 100644 index 0000000000..87144453a5 --- /dev/null +++ b/tools/checkwps/checkwps.make | |||
@@ -0,0 +1,34 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | |||
10 | FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" | ||
11 | |||
12 | COMMON = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \ | ||
13 | $(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \ | ||
14 | $(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \ | ||
15 | $(ROOTDIR)/apps/misc.c \ | ||
16 | $(ROOTDIR)/apps/recorder/bmp.c \ | ||
17 | $(ROOTDIR)/firmware/common/strlcpy.c | ||
18 | |||
19 | INCLUDE = -I $(ROOTDIR)/apps/gui \ | ||
20 | -I $(ROOTDIR)/apps/gui/skin_engine \ | ||
21 | -I $(ROOTDIR)/firmware/export \ | ||
22 | -I $(ROOTDIR)/apps \ | ||
23 | -I $(ROOTDIR)/apps/recorder \ | ||
24 | -I $(APPSDIR) | ||
25 | |||
26 | # Makes mkdepfile happy | ||
27 | GCCOPTS+=-D__PCTOOL__ | ||
28 | SRC=$(APPSDIR)/checkwps.c $(COMMON) | ||
29 | OTHER_SRC=$(SRC) | ||
30 | ASMDEFS_SRC=$(SRC) | ||
31 | |||
32 | $(BUILDDIR)/$(BINARY): $(APPSDIR)/checkwps.c $(COMMON) | ||
33 | @echo CC $(BINARY) | ||
34 | @$(HOSTCC) $(INCLUDE) $(FLAGS) $(COMMON) $(TARGET) $(APPSDIR)/checkwps.c -o $@ | ||
diff --git a/tools/configure b/tools/configure index 486a4706db..2f96f377e5 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -2430,7 +2430,7 @@ esac | |||
2430 | if [ "$ARG_TYPE" ]; then | 2430 | if [ "$ARG_TYPE" ]; then |
2431 | btype=$ARG_TYPE | 2431 | btype=$ARG_TYPE |
2432 | else | 2432 | else |
2433 | echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, $gdbstub(M)anual: (Defaults to N)" | 2433 | echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, (C)heckWPS, $gdbstub(M)anual: (Defaults to N)" |
2434 | btype=`input`; | 2434 | btype=`input`; |
2435 | fi | 2435 | fi |
2436 | 2436 | ||
@@ -2511,6 +2511,16 @@ fi | |||
2511 | apps="manual" | 2511 | apps="manual" |
2512 | echo "Manual build selected" | 2512 | echo "Manual build selected" |
2513 | ;; | 2513 | ;; |
2514 | [Cc]) | ||
2515 | uname=`uname` | ||
2516 | simcc | ||
2517 | toolset=''; | ||
2518 | t_cpu=''; | ||
2519 | GCCOPTS=''; | ||
2520 | appsdir='\$(ROOTDIR)/tools/checkwps'; | ||
2521 | output='checkwps.'${modelname}; | ||
2522 | echo "CheckWPS build selected" | ||
2523 | ;; | ||
2514 | *) | 2524 | *) |
2515 | if [ "$modelname" = "e200r" ]; then | 2525 | if [ "$modelname" = "e200r" ]; then |
2516 | echo "Do not use the e200R target for regular builds. Use e200 instead." | 2526 | echo "Do not use the e200R target for regular builds. Use e200 instead." |