summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/configure20
-rw-r--r--uisimulator/x11/sound.c2
2 files changed, 14 insertions, 8 deletions
diff --git a/tools/configure b/tools/configure
index a92060a4e2..74364b3e22 100755
--- a/tools/configure
+++ b/tools/configure
@@ -52,6 +52,16 @@ crosswincc () {
endian="little" # windows is little endian
}
+checksoundcard () {
+ if test -n "$codecs"; then
+ if test -f "/usr/include/sys/soundcard.h"; then
+ # We have a header file so we can build the sound code
+ use_simsound="#define ROCKBOX_HAS_SIMSOUND 1"
+ fi # header file present
+ fi # has codecs
+}
+
+
simcc () {
# default tool setup for native building
@@ -73,6 +83,7 @@ simcc () {
# x11 version
GCCOPTS="$GCCOPTS"
LDOPTS='-L/usr/X11R6/lib -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 -lpthread'
+ checksoundcard
fi
output="rockboxui.exe" # use this as output binary name
;;
@@ -82,14 +93,9 @@ simcc () {
GCCOPTS="$GCCOPTS"
LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread'
if [ "$simver" = "win32" ]; then
- crosswincc # setup cross-compiler
+ crosswincc # setup cross-compiler
else
- if test -n "$codecs"; then
- if test -f "/usr/include/linux/soundcard.h"; then
- # We have a header file so we can build the sound code
- use_simsound="#define ROCKBOX_HAS_SIMSOUND 1"
- fi # header file present
- fi # has codecs
+ checksoundcard
fi # not a cross-compiler
;;
diff --git a/uisimulator/x11/sound.c b/uisimulator/x11/sound.c
index 761ad01a72..c21615b46d 100644
--- a/uisimulator/x11/sound.c
+++ b/uisimulator/x11/sound.c
@@ -27,7 +27,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#include <linux/soundcard.h>
+#include <sys/soundcard.h>
#include "sound.h"