summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-10-06 21:08:59 +0000
committerNils Wallménius <nils@rockbox.org>2009-10-06 21:08:59 +0000
commitdcc49194ac544eeefae4905cc930bc8f6d0c1fec (patch)
tree8cf7f0e82b5098d4477b068197dfb2a59da155d0
parent5c755a8f48692b21c976090ed0d30cb62d71736c (diff)
downloadrockbox-dcc49194ac544eeefae4905cc930bc8f6d0c1fec.tar.gz
rockbox-dcc49194ac544eeefae4905cc930bc8f6d0c1fec.zip
Once again fix building of the database tool that gets broke over and over
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22990 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/system.h4
-rw-r--r--tools/database/Makefile4
2 files changed, 3 insertions, 5 deletions
diff --git a/firmware/export/system.h b/firmware/export/system.h
index aa95167b8a..196c20a33b 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -121,10 +121,9 @@ int get_cpu_boost_counter(void);
ptr = (typeof(ptr))tmp_ptr1; \
}
-#ifndef __PCTOOL__
/* newer? SDL includes endian.h, So we ignore it */
-#ifdef SIMULATOR
+#if defined(SIMULATOR) || defined(__PCTOOL__)
#undef letoh16
#undef letoh32
#undef htole16
@@ -160,7 +159,6 @@ int get_cpu_boost_counter(void);
#define swap_odd_even_le32(x) (x)
#endif
-#endif
/* static endianness conversion */
#define SWAP_16(x) ((typeof(x))(unsigned short)(((unsigned short)(x) >> 8) | \
diff --git a/tools/database/Makefile b/tools/database/Makefile
index fc59dd6fc0..d61be90ed2 100644
--- a/tools/database/Makefile
+++ b/tools/database/Makefile
@@ -2,7 +2,7 @@ ifndef V
SILENT = @
endif
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
DEFINES = -D__PCTOOL__ -DHAVE_TAGCACHE -DSIMULATOR -DCONFIG_CODEC=1 \
-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 \
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 \
- 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 \
misc.o strlcpy.o fixedpoint.o