From 5b3a60c5067e10d618529fc987acbb5ee86fe7d3 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Tue, 28 Apr 2009 23:25:42 +0000 Subject: [PATCH] * Add support in configure.in to detect the arch. * Add two new targets, osx-tinderbox-(bundle|dmg) to handle tinderbox building. Originally committed to SVN as r2873. --- aegisub/Makefile.am | 12 ++++++++++-- aegisub/configure.in | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 2a7619ca9..3ad5aac3c 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -23,10 +23,18 @@ SUBDIRS = \ desktop osx-bundle: - @SHELL@ scripts/osx-bundle.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@@PACKAGE_DEBUG@ @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) + @SHELL@ scripts/osx-bundle.sh "Aegisub (r@SVN_REVISION@@PACKAGE_DEBUG@)" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) + osx-dmg: - @SHELL@ scripts/osx-dmg.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@@PACKAGE_DEBUG@ "@PACKAGE_TARNAME@-@PACKAGE_VERSION@" + @SHELL@ scripts/osx-dmg.sh aegisub-r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@ "Aegisub (r@SVN_REVISION@@PACKAGE_DEBUG@)" + +osx-tinderbox-bundle: + @SHELL@ scripts/osx-bundle.sh "$(T_BUNDLE)" @AEGISUB_VERSION_DATA@ DICT_DIR="$(DICT_DIR)" + +osx-tinderbox-dmg: + @SHELL@ scripts/osx-dmg.sh "$(T_DMG)" "$(T_BUNDLE)" + mv "$(T_DMG).dmg" bundle.dmg EXTRA_DIST = \ intltool-extract.in \ diff --git a/aegisub/configure.in b/aegisub/configure.in index eb537405b..54c79c9eb 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -71,6 +71,29 @@ case "$target_or_host" in ;; esac +case "$target_or_host" in + ppc-*-* | powerpc-*) + arch_ppc="yes" + ;; + + i*86-*-*) + arch_x86="yes" + ;; + + x86_64-*-*) + arch_x86="yes" + arch_x86_64="yes" + ;; +esac + +if test "$build_darwin" = "yes"; then + if test "$arch_x86" = "yes"; then + DARWIN_ARCH="intel" + elif "$arch_ppc" = "yes"; then + DARWIN_ARCH="ppc" + fi + AC_SUBST(DARWIN_ARCH) +fi # Used for universalchardet. AC_AGI_MDCPUCFG($target_or_host)