contrib: add Solaris to bootstrap

Signed-off-by: Rafaël Carré <funman@videolan.org>

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 26e1c2cc0b323e8b02ba178cb396eb7bab51fcba..2c755df45f3ed890c9fd4956322741e3f77ad5fc 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -265,6 +265,9 @@ case "${OS}" in
        *mingw*)
                add_make_enabled "HAVE_WIN32"
                ;;
+       *solaris*)
+               add_make_enabled "HAVE_SOLARIS"
+               ;;
 esac
 
 #

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index b6b70c147050989d32acd1f68a33063b922f5d04..45ba470762e83e8f560d15b575e6e9568b342047 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -148,6 +148,16 @@ HAVE_MINGW_W64 := 1
 endif
 endif
 
+ifdef HAVE_SOLARIS
+ifeq ($(ARCH),x86_64)
+EXTRA_CFLAGS += -m64
+EXTRA_LDFLAGS += -m64
+else
+EXTRA_CFLAGS += -m32
+EXTRA_LDFLAGS += -m32
+endif
+endif
+
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include