len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-11 06:05:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Once again fix building of the database tool that gets broke over and over

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22990 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-10-06 21:08:59 +00:00
parent 5c755a8f48
commit dcc49194ac
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/export/system.h
View file

@ -121,10 +121,9 @@ 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 #if defined(SIMULATOR) || defined(__PCTOOL__)
#undef letoh16 #undef letoh16
#undef letoh32 #undef letoh32
#undef htole16 #undef htole16
@ -160,7 +159,6 @@ 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) | \

4
tools/database/Makefile
View file

@ -2,7 +2,7 @@ ifndef V
SILENT = @ SILENT = @
endif endif
INCLUDE = -I../../firmware/export \ INCLUDE = -I../../firmware/export \
-I../../apps -I../../uisimulator/sdl -I/usr/include/SDL -I../../apps -I../../apps/gui -I../../uisimulator/sdl -I/usr/include/SDL
FIRMINC = -I../../firmware/include -fno-builtin FIRMINC = -I../../firmware/include -fno-builtin
DEFINES = -D__PCTOOL__ -DHAVE_TAGCACHE -DSIMULATOR -DCONFIG_CODEC=1 \ DEFINES = -D__PCTOOL__ -DHAVE_TAGCACHE -DSIMULATOR -DCONFIG_CODEC=1 \
-DROCKBOX_LITTLE_ENDIAN -DROCKBOX_DIR=\".rockbox\" -DROCKBOX_HAS_LOGF \ -DROCKBOX_LITTLE_ENDIAN -DROCKBOX_DIR=\".rockbox\" -DROCKBOX_HAS_LOGF \
@ -13,7 +13,7 @@ SRC = database.o tagcache.o replaygain.o \
metadata.o metadata_common.o mp3data.o \ metadata.o metadata_common.o mp3data.o \
a52.o mp3.o adx.o mp4.o aiff.o mpc.o ape.o ogg.o \ a52.o mp3.o adx.o mp4.o aiff.o mpc.o ape.o ogg.o \
asap.o sid.o asf.o spc.o flac.o vorbis.o wave.o \ asap.o sid.o asf.o spc.o flac.o vorbis.o wave.o \
mod.o wavpack.o monkeys.o rm.o \ mod.o wavpack.o monkeys.o rm.o nsf.c\
logf.o unicode.o ctype.o structec.o crc32.o io.o \ logf.o unicode.o ctype.o structec.o crc32.o io.o \
misc.o strlcpy.o fixedpoint.o misc.o strlcpy.o fixedpoint.o