diff options
author | Björn Stenberg <bjorn@haxx.se> | 2009-09-01 14:53:37 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2009-09-01 14:53:37 +0000 |
commit | ffaf24674d6528606be7a62a1bc7db24d0793e88 (patch) | |
tree | ca9f5d44d2e35128c4547d4c1e5105fe48d1ba18 | |
parent | f81cadad2a5cf56cccba2d74d7ad06508f95f2ba (diff) | |
download | rockbox-ffaf24674d6528606be7a62a1bc7db24d0793e88.tar.gz rockbox-ffaf24674d6528606be7a62a1bc7db24d0793e88.zip |
Fixed checkwps build warnings. Updated checkwps makefile to be closer to main.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22593 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/system.h | 4 | ||||
-rw-r--r-- | tools/checkwps/checkwps.make | 38 | ||||
-rw-r--r-- | tools/root.make | 7 |
3 files changed, 28 insertions, 21 deletions
diff --git a/firmware/export/system.h b/firmware/export/system.h index 3216948997..aa95167b8a 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -121,6 +121,8 @@ int get_cpu_boost_counter(void); | |||
121 | ptr = (typeof(ptr))tmp_ptr1; \ | 121 | ptr = (typeof(ptr))tmp_ptr1; \ |
122 | } | 122 | } |
123 | 123 | ||
124 | #ifndef __PCTOOL__ | ||
125 | |||
124 | /* newer? SDL includes endian.h, So we ignore it */ | 126 | /* newer? SDL includes endian.h, So we ignore it */ |
125 | #ifdef SIMULATOR | 127 | #ifdef SIMULATOR |
126 | #undef letoh16 | 128 | #undef letoh16 |
@@ -158,6 +160,8 @@ int get_cpu_boost_counter(void); | |||
158 | #define swap_odd_even_le32(x) (x) | 160 | #define swap_odd_even_le32(x) (x) |
159 | #endif | 161 | #endif |
160 | 162 | ||
163 | #endif | ||
164 | |||
161 | /* static endianness conversion */ | 165 | /* static endianness conversion */ |
162 | #define SWAP_16(x) ((typeof(x))(unsigned short)(((unsigned short)(x) >> 8) | \ | 166 | #define SWAP_16(x) ((typeof(x))(unsigned short)(((unsigned short)(x) >> 8) | \ |
163 | ((unsigned short)(x) << 8))) | 167 | ((unsigned short)(x) << 8))) |
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make index 87144453a5..0a455e9770 100644 --- a/tools/checkwps/checkwps.make +++ b/tools/checkwps/checkwps.make | |||
@@ -7,28 +7,28 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" | 10 | FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET) |
11 | 11 | ||
12 | COMMON = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \ | 12 | SRC = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \ |
13 | $(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \ | 13 | $(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \ |
14 | $(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \ | 14 | $(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \ |
15 | $(ROOTDIR)/apps/misc.c \ | 15 | $(ROOTDIR)/apps/misc.c \ |
16 | $(ROOTDIR)/apps/recorder/bmp.c \ | 16 | $(ROOTDIR)/apps/recorder/bmp.c \ |
17 | $(ROOTDIR)/firmware/common/strlcpy.c | 17 | $(ROOTDIR)/firmware/common/strlcpy.c \ |
18 | $(APPSDIR)/checkwps.c | ||
18 | 19 | ||
19 | INCLUDE = -I $(ROOTDIR)/apps/gui \ | 20 | INCLUDES = -I$(ROOTDIR)/apps/gui \ |
20 | -I $(ROOTDIR)/apps/gui/skin_engine \ | 21 | -I$(ROOTDIR)/apps/gui/skin_engine \ |
21 | -I $(ROOTDIR)/firmware/export \ | 22 | -I$(ROOTDIR)/firmware/export \ |
22 | -I $(ROOTDIR)/apps \ | 23 | -I$(ROOTDIR)/apps \ |
23 | -I $(ROOTDIR)/apps/recorder \ | 24 | -I$(ROOTDIR)/apps/recorder \ |
24 | -I $(APPSDIR) | 25 | -I$(APPSDIR) |
25 | 26 | ||
26 | # Makes mkdepfile happy | 27 | # Makes mkdepfile happy |
27 | GCCOPTS+=-D__PCTOOL__ | 28 | GCCOPTS+=-D__PCTOOL__ |
28 | SRC=$(APPSDIR)/checkwps.c $(COMMON) | ||
29 | OTHER_SRC=$(SRC) | ||
30 | ASMDEFS_SRC=$(SRC) | ||
31 | 29 | ||
32 | $(BUILDDIR)/$(BINARY): $(APPSDIR)/checkwps.c $(COMMON) | 30 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this |
33 | @echo CC $(BINARY) | 31 | |
34 | @$(HOSTCC) $(INCLUDE) $(FLAGS) $(COMMON) $(TARGET) $(APPSDIR)/checkwps.c -o $@ | 32 | $(BUILDDIR)/$(BINARY): $$(OBJ) |
33 | @echo LD $(BINARY) | ||
34 | $(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -o $@ $+ | ||
diff --git a/tools/root.make b/tools/root.make index 5ba321c952..e2525dc8df 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -54,8 +54,11 @@ all: $(DEPFILE) build | |||
54 | # Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC & | 54 | # Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC & |
55 | # ASMDEFS_SRC but they also define special dependencies and compile rules | 55 | # ASMDEFS_SRC but they also define special dependencies and compile rules |
56 | include $(TOOLSDIR)/tools.make | 56 | include $(TOOLSDIR)/tools.make |
57 | include $(FIRMDIR)/firmware.make | 57 | |
58 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | 58 | ifeq (,$(findstring checkwps,$(APPSDIR))) |
59 | include $(FIRMDIR)/firmware.make | ||
60 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | ||
61 | endif | ||
59 | 62 | ||
60 | ifneq (,$(findstring bootloader,$(APPSDIR))) | 63 | ifneq (,$(findstring bootloader,$(APPSDIR))) |
61 | include $(APPSDIR)/bootloader.make | 64 | include $(APPSDIR)/bootloader.make |