[vlc-commits] contrib: add Solaris to bootstrap

[Sean McGovern]

vlc | branch: master | Sean McGovern <gseanmcg at gmail.com> | Thu Mar 13 13:50:27 2014 -0400| [591e83a116399a9e1de2fa749dcd88c36674d9aa] | committer: Rafaël Carré

contrib: add Solaris to bootstrap

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=591e83a116399a9e1de2fa749dcd88c36674d9aa
---

 contrib/bootstrap    |    3 +++
 contrib/src/main.mak |   10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 26e1c2c..2c755df 100755
--- 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 b6b70c1..45ba470 100644
--- 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