Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d7331621db4
Choose a base ref
...
head repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5bb251d28cb1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 7, 2015

  1. Enabling debug

    @hyades @mithro
    hyades authored and mithro committed Jan 7, 2015
    Copy the full SHA
    55b0518 View commit details

  2. Improve debug output.

    @mithro
    mithro committed Jan 7, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    455a334 View commit details

  3. Merge pull request #90 from mithro/enable-debug 

    Adding an --enable-debug option
    @hyades
    hyades committed Jan 7, 2015
    Copy the full SHA
    5bb251d View commit details
Showing with 20 additions and 2 deletions.
  1. +12 −0 configure.ac
  2. +8 −2 tools/Makefile.am
12 changes: 12 additions & 0 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -181,6 +181,18 @@ dnl FIXME: Add the Python-API as an option here

dnl === Output ================================================================

AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
[enable debugging, default: no]),
[case "${enableval}" in
yes) debug=true ;;
no) debug=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
esac],
[debug=false])

AM_CONDITIONAL(DEBUG, test x"$debug" = x"true")

AC_CONFIG_FILES(
Makefile
plugins/Makefile
10 changes: 8 additions & 2 deletions tools/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -15,19 +15,25 @@ GCOV_CFLAGS =
GCOV_LFLAGS =
endif

if DEBUG
AM_CFLAGS = -g3 -O0 -gdwarf-4 -fvar-tracking-assignments -fvar-tracking
else
AM_CFLAGS = -O2
endif

gst_switch_srv_SOURCES = gstworker.c gstswitchserver.c gstcase.c \
gstcomposite.c gstswitchcontroller.c gstrecorder.c \
gio/gsocketinputstream.c
gst_switch_srv_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GCOV_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) -DLOG_PREFIX="\"./tools\""
$(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS) -DLOG_PREFIX="\"./tools\""
gst_switch_srv_LDFLAGS = $(GCOV_LFLAGS) $(GST_LIBS) $(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) $(GSTPB_BASE_LIBS)
gst_switch_srv_LDADD = $(GIO_LIBS) $(LIBM)

gst_switch_ui_SOURCES = gstworker.c gstswitchui.c gstvideodisp.c \
gstaudiovisual.c gstswitchclient.c
gst_switch_ui_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GCOV_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) $(AM_CFLAGS) \
-DLOG_PREFIX="\"./tools\""
gst_switch_ui_LDFLAGS = $(GCOV_LFLAGS) $(GST_LIBS) $(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) $(GSTPB_BASE_LIBS) -lm