From 2614519ff81fc4cb8c9079ca806184cf57af7bf7 Mon Sep 17 00:00:00 2001 From: korli Date: Wed, 14 Mar 2012 00:15:38 +0000 Subject: patch for 1.0.0 diff --git a/build/make/configure.sh b/build/make/configure.sh index c592b63..916636f 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -704,6 +704,9 @@ process_common_toolchain() { *os2*) tgt_os=os2 ;; + *haiku*) + tgt_os=haiku + ;; esac if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then @@ -1190,8 +1193,8 @@ EOF EOF case ${tgt_cc} in gcc*) - add_cflags -m${bits} - add_ldflags -m${bits} + enabled haiku || add_cflags -m${bits} + enabled haiku || add_ldflags -m${bits} ;; esac @@ -1238,7 +1241,7 @@ EOF enabled debug && add_asflags -g cv8 EXE_SFX=.exe ;; - linux*|solaris*|android*) + linux*|solaris*|android*|haiku*) add_asflags -f elf${bits} enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 enabled debug && [ "${AS}" = nasm ] && add_asflags -g @@ -1353,6 +1356,8 @@ EOF ;; *-android-gcc) ;; + *-haiku*) + ;; *) check_header pthread.h && add_extralibs -lpthread ;; diff --git a/configure b/configure index a40f3ab..d836421 100755 --- a/configure +++ b/configure @@ -122,6 +122,7 @@ all_platforms="${all_platforms} x86-darwin11-gcc" all_platforms="${all_platforms} x86-darwin12-gcc" all_platforms="${all_platforms} x86-darwin13-gcc" all_platforms="${all_platforms} x86-darwin14-gcc" +all_platforms="${all_platforms} x86-haiku-gcc" all_platforms="${all_platforms} x86-iphonesimulator-gcc" all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc" diff --git a/examples.mk b/examples.mk index f10bec6..ee454dd 100644 --- a/examples.mk +++ b/examples.mk @@ -223,8 +223,10 @@ endif # We should not link to math library (libm) on RVCT # when building for bare-metal targets ifeq ($(CONFIG_OS_SUPPORT), yes) -CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -CODEC_EXTRA_LIBS-$(CONFIG_VP9) += m + ifneq ($(TOOLCHAIN),x86-haiku-gcc) + CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m + CODEC_EXTRA_LIBS-$(CONFIG_VP9) += m + endif else ifeq ($(CONFIG_GCC), yes) CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -- 2.2.2 From cdbf2455ecd1835f50b58ede50749291292d9aae Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:09:11 +0200 Subject: configure: enable shared library building for Haiku diff --git a/configure b/configure index d836421..16d0a69 100755 --- a/configure +++ b/configure @@ -508,7 +508,7 @@ process_detect() { # Can only build shared libs on a subset of platforms. Doing this check # here rather than at option parse time because the target auto-detect # magic happens after the command line has been parsed. - if ! enabled linux && ! enabled os2; then + if ! enabled linux && ! enabled os2 && ! enabled haiku; then if enabled gnu; then echo "--enable-shared is only supported on ELF; assuming this is OK" else -- 2.2.2 From b09eddbbca0f76239e8e505aedad73ec2cbc2905 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:09:28 +0200 Subject: libs.mk: no -lm or -lpthread on Haiku diff --git a/libs.mk b/libs.mk index f28d84a..ab2baf0 100644 --- a/libs.mk +++ b/libs.mk @@ -290,7 +290,6 @@ LIBS-$(CONFIG_SHARED) += $(BUILD_PFX)$(LIBVPX_SO)\ $(notdir $(LIBVPX_SO_SYMLINKS)) \ $(if $(LIBVPX_SO_IMPLIB), $(BUILD_PFX)$(LIBVPX_SO_IMPLIB)) $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE) -$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(SO_VERSION_MAJOR) $(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE) @@ -353,11 +352,11 @@ vpx.pc: config.mk libs.mk $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@ $(qexec)echo 'Requires:' >> $@ $(qexec)echo 'Conflicts:' >> $@ - $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@ + $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@ ifeq ($(HAVE_PTHREAD_H),yes) - $(qexec)echo 'Libs.private: -lm -lpthread' >> $@ + $(qexec)echo 'Libs.private: -lpthread' >> $@ else - $(qexec)echo 'Libs.private: -lm' >> $@ + $(qexec)echo 'Libs.private: ' >> $@ endif $(qexec)echo 'Cflags: -I$${includedir}' >> $@ INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc @@ -522,7 +521,7 @@ TEST_LIBS := lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a $(LIBVPX_TEST_BIN): $(TEST_LIBS) $(eval $(call linkerxx_template,$(LIBVPX_TEST_BIN), \ $(LIBVPX_TEST_OBJS) \ - -L. -lvpx -lgtest $(extralibs) -lm)) + -L. -lvpx -lgtest $(extralibs))) ifneq ($(strip $(TEST_INTRA_PRED_SPEED_OBJS)),) $(TEST_INTRA_PRED_SPEED_OBJS) $(TEST_INTRA_PRED_SPEED_OBJS:.o=.d): CXXFLAGS += $(GTEST_INCLUDES) @@ -532,7 +531,7 @@ BINS-yes += $(TEST_INTRA_PRED_SPEED_BIN) $(TEST_INTRA_PRED_SPEED_BIN): $(TEST_LIBS) $(eval $(call linkerxx_template,$(TEST_INTRA_PRED_SPEED_BIN), \ $(TEST_INTRA_PRED_SPEED_OBJS) \ - -L. -lvpx -lgtest $(extralibs) -lm)) + -L. -lvpx -lgtest $(extralibs))) endif # TEST_INTRA_PRED_SPEED endif # CONFIG_UNIT_TESTS -- 2.2.2 From 7096ec35f15cf19b9388e4fa405461f49d4fbf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 3 Dec 2013 22:18:36 +0000 Subject: x86_64 support * configure, amples.mk diff --git a/configure b/configure index 16d0a69..105fdbb 100755 --- a/configure +++ b/configure @@ -143,6 +143,7 @@ all_platforms="${all_platforms} x86_64-darwin11-gcc" all_platforms="${all_platforms} x86_64-darwin12-gcc" all_platforms="${all_platforms} x86_64-darwin13-gcc" all_platforms="${all_platforms} x86_64-darwin14-gcc" +all_platforms="${all_platforms} x86_64-haiku-gcc" all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" diff --git a/examples.mk b/examples.mk index ee454dd..e567cda 100644 --- a/examples.mk +++ b/examples.mk @@ -223,7 +223,7 @@ endif # We should not link to math library (libm) on RVCT # when building for bare-metal targets ifeq ($(CONFIG_OS_SUPPORT), yes) - ifneq ($(TOOLCHAIN),x86-haiku-gcc) + ifeq (,$(findstring haiku,$(TOOLCHAIN))) CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m CODEC_EXTRA_LIBS-$(CONFIG_VP9) += m endif -- 2.2.2