1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-24 23:13:42 +02:00

Add WXDEBUG_LEVEL=0 to non-debug builds

This commit is contained in:
Leland Lucius
2015-07-29 14:44:51 -05:00
parent f2d87803d3
commit e869099643
12 changed files with 590 additions and 124 deletions

View File

@@ -7,6 +7,6 @@ pkgconfig_DATA = libwidgetextra.pc
lib_LTLIBRARIES = libwidgetextra.la
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS)
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
libwidgetextra_la_LIBADD = $(WX_LIBS)
libwidgetextra_la_SOURCES = NonGuiThread.cpp NonGuiThread.h

View File

@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/libwidgetextra.pc.in $(top_srcdir)/autotools/depcomp \
INSTALL autotools/ar-lib autotools/compile \
autotools/config.guess autotools/config.sub autotools/depcomp \
autotools/install-sh autotools/missing autotools/ltmain.sh \
$(top_srcdir)/autotools/ar-lib $(top_srcdir)/autotools/compile \
$(top_srcdir)/autotools/config.guess \
$(top_srcdir)/autotools/config.sub \
$(top_srcdir)/autotools/install-sh \
$(top_srcdir)/autotools/ltmain.sh \
$(top_srcdir)/autotools/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_strict_prototypes.m4 \
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
@@ -102,6 +100,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_strict_prototypes.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -225,6 +225,17 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libwidgetextra.pc.in \
$(top_srcdir)/autotools/ar-lib $(top_srcdir)/autotools/compile \
$(top_srcdir)/autotools/config.guess \
$(top_srcdir)/autotools/config.sub \
$(top_srcdir)/autotools/depcomp \
$(top_srcdir)/autotools/install-sh \
$(top_srcdir)/autotools/ltmain.sh \
$(top_srcdir)/autotools/missing INSTALL autotools/ar-lib \
autotools/compile autotools/config.guess autotools/config.sub \
autotools/depcomp autotools/install-sh autotools/ltmain.sh \
autotools/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -370,7 +381,7 @@ EXTRA_DIST = libwidgetextra.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libwidgetextra.pc
lib_LTLIBRARIES = libwidgetextra.la
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS)
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
libwidgetextra_la_LIBADD = $(WX_LIBS)
libwidgetextra_la_SOURCES = NonGuiThread.cpp NonGuiThread.h
all: all-am
@@ -392,7 +403,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -632,15 +642,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -676,17 +686,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -870,6 +880,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
uninstall-pkgconfigDATA
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

View File

@@ -771,8 +771,6 @@ enable_fast_install
with_gnu_ld
with_sysroot
enable_libtool_lock
enable_static_wx
enable_unicode
enable_debug
with_wx_version
'
@@ -1421,8 +1419,6 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-static-wx link wx statically [default=no]
--enable-unicode enable unicode support [default=yes]
--enable-debug enable debug support [default=no]
Optional Packages:
@@ -16210,22 +16206,6 @@ CPPFLAGS="$cppflags_save"
CXXFLAGS="$cxxflags_save"
# Check whether --enable-static-wx was given.
if test "${enable_static_wx+set}" = set; then :
enableval=$enable_static_wx; static_wx_preference="--static=$enableval"
else
static_wx_preference=""
fi
# Check whether --enable-unicode was given.
if test "${enable_unicode+set}" = set; then :
enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
else
unicode_preference="--unicode=yes"
fi
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; debug_preference="$enableval"
@@ -16244,11 +16224,14 @@ fi
if test "$debug_preference" = "yes"; then
if test x"$debug_preference" = "xyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
CFLAGS="${CFLAGS} -g "
CXXFLAGS="${CXXFLAGS} -g "
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
else
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
fi

View File

@@ -45,18 +45,6 @@ CXXFLAGS="$cxxflags_save"
dnl Build Options
AC_ARG_ENABLE(static-wx,
[AS_HELP_STRING([--enable-static-wx],
[link wx statically [default=no]])],
static_wx_preference="--static=$enableval",
static_wx_preference="")
AC_ARG_ENABLE(unicode,
[AS_HELP_STRING([--enable-unicode],
[enable unicode support [default=yes]])],
unicode_preference="--unicode=$enableval",
unicode_preference="--unicode=yes")
AC_ARG_ENABLE(debug,
[AS_HELP_STRING([--enable-debug],
[enable debug support [default=no]])],
@@ -68,17 +56,20 @@ AC_ARG_WITH(wx-version,
[select wxWidgets version (if both installed) [2.8,]])],
wx_preference="--version=$withval",
wx_preference="")
dnl Right now only support wx 2.8
dnl Right now only support wx 3.0
dnl ----------------------------------------------------
dnl If user asked for debug, put debug in compiler flags
dnl ----------------------------------------------------
if test "$debug_preference" = "yes"; then
if test x"$debug_preference" = "xyes" ; then
dnl we want debuging on
AC_MSG_NOTICE([Adding -g for debugging to CFLAGS and CXXFLAGS ...])
CFLAGS="${CFLAGS} -g "
CXXFLAGS="${CXXFLAGS} -g "
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
else
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
fi
dnl --------------------------------------------------------------------------