len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed checkwps build warnings. Updated checkwps makefile to be closer to main.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22593 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2009-09-01 14:53:37 +00:00
parent f81cadad2a
commit ffaf24674d
3 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/export/system.h
View file

@ -121,6 +121,8 @@ int get_cpu_boost_counter(void);
ptr = (typeof(ptr))tmp_ptr1; \ ptr = (typeof(ptr))tmp_ptr1; \
} }
#ifndef __PCTOOL__
/* newer? SDL includes endian.h, So we ignore it */ /* newer? SDL includes endian.h, So we ignore it */
#ifdef SIMULATOR #ifdef SIMULATOR
#undef letoh16 #undef letoh16
@ -158,6 +160,8 @@ int get_cpu_boost_counter(void);
#define swap_odd_even_le32(x) (x) #define swap_odd_even_le32(x) (x)
#endif #endif
#endif
/* static endianness conversion */ /* static endianness conversion */
#define SWAP_16(x) ((typeof(x))(unsigned short)(((unsigned short)(x) >> 8) | \ #define SWAP_16(x) ((typeof(x))(unsigned short)(((unsigned short)(x) >> 8) | \
((unsigned short)(x) << 8))) ((unsigned short)(x) << 8)))

30
tools/checkwps/checkwps.make
View file

@ -7,28 +7,28 @@
# $Id$ # $Id$
# #
FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET)
COMMON = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \ SRC = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \
$(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \ $(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \
$(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \ $(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \
$(ROOTDIR)/apps/misc.c \ $(ROOTDIR)/apps/misc.c \
$(ROOTDIR)/apps/recorder/bmp.c \ $(ROOTDIR)/apps/recorder/bmp.c \
$(ROOTDIR)/firmware/common/strlcpy.c $(ROOTDIR)/firmware/common/strlcpy.c \
$(APPSDIR)/checkwps.c
INCLUDE = -I $(ROOTDIR)/apps/gui \ INCLUDES = -I$(ROOTDIR)/apps/gui \
-I $(ROOTDIR)/apps/gui/skin_engine \ -I$(ROOTDIR)/apps/gui/skin_engine \
-I $(ROOTDIR)/firmware/export \ -I$(ROOTDIR)/firmware/export \
-I $(ROOTDIR)/apps \ -I$(ROOTDIR)/apps \
-I $(ROOTDIR)/apps/recorder \ -I$(ROOTDIR)/apps/recorder \
-I $(APPSDIR) -I$(APPSDIR)
# Makes mkdepfile happy # Makes mkdepfile happy
GCCOPTS+=-D__PCTOOL__ GCCOPTS+=-D__PCTOOL__
SRC=$(APPSDIR)/checkwps.c $(COMMON)
OTHER_SRC=$(SRC)
ASMDEFS_SRC=$(SRC)
$(BUILDDIR)/$(BINARY): $(APPSDIR)/checkwps.c $(COMMON) .SECONDEXPANSION: # $$(OBJ) is not populated until after this
@echo CC $(BINARY)
@$(HOSTCC) $(INCLUDE) $(FLAGS) $(COMMON) $(TARGET) $(APPSDIR)/checkwps.c -o $@ $(BUILDDIR)/$(BINARY): $$(OBJ)
@echo LD $(BINARY)
$(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -o $@ $+

7
tools/root.make
View file

@ -54,8 +54,11 @@ all: $(DEPFILE) build
# Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC & # Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC &
# ASMDEFS_SRC but they also define special dependencies and compile rules # ASMDEFS_SRC but they also define special dependencies and compile rules
include $(TOOLSDIR)/tools.make include $(TOOLSDIR)/tools.make
include $(FIRMDIR)/firmware.make
include $(ROOTDIR)/apps/bitmaps/bitmaps.make ifeq (,$(findstring checkwps,$(APPSDIR)))
include $(FIRMDIR)/firmware.make
include $(ROOTDIR)/apps/bitmaps/bitmaps.make
endif
ifneq (,$(findstring bootloader,$(APPSDIR))) ifneq (,$(findstring bootloader,$(APPSDIR)))
include $(APPSDIR)/bootloader.make include $(APPSDIR)/bootloader.make