diff options
| author | Android Code Review <code-review@android.com> | 2009-09-14 05:48:30 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2009-09-14 05:48:30 -0700 |
| commit | 4b5dd6552c18c3295c6363235c3b6ae4ff3f0698 (patch) | |
| tree | 12aec6497b0e73abb0dca1cc7db92ed2cca53ce7 | |
| parent | 8ac092bcc7c6928b848dfc3e946eb83cc6f8cad6 (diff) | |
| parent | 088232286a7814a92b5b0d4a34f243a2e857facc (diff) | |
| download | external_qemu-4b5dd6552c18c3295c6363235c3b6ae4ff3f0698.zip external_qemu-4b5dd6552c18c3295c6363235c3b6ae4ff3f0698.tar.gz external_qemu-4b5dd6552c18c3295c6363235c3b6ae4ff3f0698.tar.bz2 | |
Merge change 11469
* changes:
General changes to support freebsd system in building scripts
| -rwxr-xr-x | android-configure.sh | 11 | ||||
| -rw-r--r-- | android/build/common.sh | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/android-configure.sh b/android-configure.sh index 59ec9b4..16e0d4d 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -203,6 +203,12 @@ log "SDL-probe : SDL_LIBS = $SDL_LIBS" EXTRA_CFLAGS="$SDL_CFLAGS" EXTRA_LDFLAGS="$SDL_LIBS" +case "$OS" in + freebsd-*) + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm -lpthread" + ;; +esac + cat > $TMPC << EOF #include <SDL.h> #undef main @@ -269,6 +275,8 @@ case "$OS" in ;; linux-*) PROBE_ALSA=yes; PROBE_OSS=yes; PROBE_ESD=yes; ;; + freebsd-*) PROBE_OSS=yes; + ;; windows) PROBE_WINAUDIO=yes ;; esac @@ -414,6 +422,9 @@ case "$OS" in darwin-*) CONFIG_OS=DARWIN BSD=1 ;; + freebsd-*) CONFIG_OS=FREEBSD + BSD=1 + ;; windows*) CONFIG_OS=WIN32 ;; *) CONFIG_OS=$OS diff --git a/android/build/common.sh b/android/build/common.sh index b22ef7d..565864f 100644 --- a/android/build/common.sh +++ b/android/build/common.sh @@ -88,6 +88,9 @@ case "$OS" in Linux) # note that building 32-bit binaries on x86_64 is handled later OS=linux-$CPU + ;; + FreeBSD) + OS=freebsd-$CPU ;; CYGWIN*|*_NT-*) OS=windows @@ -123,6 +126,8 @@ case $OS in ;; darwin-*) HOST_OS=darwin ;; + freebsd-*) HOST_OS=freebsd + ;; *) HOST_OS=$OS esac @@ -161,6 +166,7 @@ force_32bit_binaries () case $OS in linux-x86_64) OS=linux-x86 ;; darwin-x86_64) OS=darwin-x86 ;; + freebsd-x86_64) OS=freebsd-x86 ;; esac HOST_ARCH=x86 CPU=x86 |