1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 08:30:06 +02:00

Linux Build Settings.

Configure.ac:
  Upped version number to 2.1.3
  Made FFmpeg and LibFlac Local

Readme.txt:
  Added instruction for CFLAGS.
  Use XCodebuild instructions on Mac, not autotools.
  one reason is, on Mac must use patched wxWidgets 3.0.2
This commit is contained in:
James Crook 2017-02-12 12:31:34 +00:00
parent cf688914de
commit 77ceb6a707
3 changed files with 21 additions and 16 deletions

View File

@ -270,10 +270,10 @@ Installation of other libraries is optional, see:
If you install libraries using a package management system like Apt or RPM, If you install libraries using a package management system like Apt or RPM,
you need to install the "dev" (development) packages for each library. you need to install the "dev" (development) packages for each library.
To compile on Linux, Mac OS X and other Unix systems, execute these To compile on Linux and other Unix systems and using gnu tools, execute these
commands: commands:
./configure ./configure CXXFLAGS="-std=gnu++11"
make make
make install # as root make install # as root

28
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for audacity 2.0.6. # Generated by GNU Autoconf 2.69 for audacity 2.1.3.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='audacity' PACKAGE_NAME='audacity'
PACKAGE_TARNAME='audacity' PACKAGE_TARNAME='audacity'
PACKAGE_VERSION='2.0.6' PACKAGE_VERSION='2.1.3'
PACKAGE_STRING='audacity 2.0.6' PACKAGE_STRING='audacity 2.1.3'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
@ -1575,7 +1575,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures audacity 2.0.6 to adapt to many kinds of systems. \`configure' configures audacity 2.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1645,7 +1645,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of audacity 2.0.6:";; short | recursive ) echo "Configuration of audacity 2.1.3:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1866,7 +1866,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
audacity configure 2.0.6 audacity configure 2.1.3
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2504,7 +2504,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by audacity $as_me 2.0.6, which was It was created by audacity $as_me 2.1.3, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -3059,8 +3059,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# Expand $ac_aux_dir to an absolute path. # expand $ac_aux_dir to an absolute path
am_aux_dir=`cd "$ac_aux_dir" && pwd` am_aux_dir=`cd $ac_aux_dir && pwd`
if test x"${MISSING+set}" != xset; then if test x"${MISSING+set}" != xset; then
case $am_aux_dir in case $am_aux_dir in
@ -3373,7 +3373,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='audacity' PACKAGE='audacity'
VERSION='2.0.6' VERSION='2.1.3'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -3582,7 +3582,6 @@ END
fi fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given. # Check whether --enable-maintainer-mode was given.
@ -22643,6 +22642,9 @@ $as_echo "$as_me: libwidgetextra library is NOT available in the local tree" >&6
fi fi
FFMPEG_ARGUMENT=local
LIBFLAC_ARGUMENT=local
{ $as_echo "$as_me:${as_lineno-$LINENO}: Figuring out what libraries to enable" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Figuring out what libraries to enable" >&5
$as_echo "$as_me: Figuring out what libraries to enable" >&6;} $as_echo "$as_me: Figuring out what libraries to enable" >&6;}
@ -24703,7 +24705,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by audacity $as_me 2.0.6, which was This file was extended by audacity $as_me 2.1.3, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -24769,7 +24771,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
audacity config.status 2.0.6 audacity config.status 2.1.3
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

View File

@ -34,7 +34,7 @@ dnl Require autoconf >= 2.59
AC_PREREQ([2.59]) AC_PREREQ([2.59])
dnl Init autoconf dnl Init autoconf
AC_INIT([audacity], [2.1.2]) AC_INIT([audacity], [2.1.3])
dnl Check for existence of Audacity.h dnl Check for existence of Audacity.h
AC_CONFIG_SRCDIR([src/Audacity.h]) AC_CONFIG_SRCDIR([src/Audacity.h])
AC_CONFIG_AUX_DIR([autotools]) AC_CONFIG_AUX_DIR([autotools])
@ -360,6 +360,9 @@ AUDACITY_CHECKLIB_PORTAUDIO
AUDACITY_CHECKLIB_PORTSMF AUDACITY_CHECKLIB_PORTSMF
AUDACITY_CHECKLIB_WIDGETEXTRA AUDACITY_CHECKLIB_WIDGETEXTRA
FFMPEG_ARGUMENT=local
LIBFLAC_ARGUMENT=local
dnl Decide what libraries to build with, and whether to use system or local libraries dnl Decide what libraries to build with, and whether to use system or local libraries
dnl Set variables based on choices. dnl Set variables based on choices.