Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build fixes : reloaded (gtk3) & sayVIMS #195

Merged
merged 2 commits into from
May 21, 2019
Merged

build fixes : reloaded (gtk3) & sayVIMS #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4c87a
GTK3 : fix gtk2 - gtk3 mixed lib
d-j-a-y May 21, 2019
526141a
sayVIMS : fix build
d-j-a-y May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions veejay-current/veejay-server/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ if test x$with_jpeg != xno ; then
fi
have_pixbuf=false
if test x$with_pixbuf != xno ; then
PKG_CHECK_MODULES(PIXBUF, [gtk+-2.0 >= 2.0 gdk-pixbuf-2.0],
PKG_CHECK_MODULES(PIXBUF, [gdk-pixbuf-2.0],
[
AC_SUBST(PIXBUF_CFLAGS)
AC_SUBST(PIXBUF_LIBS)
Expand All @@ -804,7 +804,7 @@ fi


if test x$have_pixbuf != xtrue ; then
AC_MSG_ERROR([Cannot find the gtk-2.0-dev / gdk pixbuf library.])
AC_MSG_ERROR([Cannot find the gdk pixbuf library.])
fi

dnl *********************************************************************
Expand Down
2 changes: 1 addition & 1 deletion veejay-current/veejay-server/veejay/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ AM_CPPFLAGS += -I /usr/X11R6/include \
-I$(top_srcdir)/libqrwrap \
-I$(top_srcdir)/libvjxml \
$(FFMPEG_CFLAGS) $(LIBQUICKTIME_CFLAGS) $(FT_CFLAGS) $(MJPEGTOOLS_CFLAGS) $(GLIB_CFLAGS) \
$(AVIPLAY_CFLAGS) $(XML2_CFLAGS) $(GTK_CFLAGS) $(DV_FLAGS) $(X_CFLAGS) $(LIBLO_CFLAGS) \
$(AVIPLAY_CFLAGS) $(XML2_CFLAGS) $(DV_FLAGS) $(X_CFLAGS) $(LIBLO_CFLAGS) \
$(DIRECTFB_CFLAGS) $(SDL_CFLAGS) $(SDL_TTF_CFLAGS) $(JPEG_CFLAGS) $(JACK_CFLAGS) $(LIBUNWIND_CFLAGS) $(PTHREAD_CFLAGS) $(LIBQRENCODE_CFLAGS)

pkginclude_HEADERS = vims.h
Expand Down
1 change: 1 addition & 0 deletions veejay-current/veejay-utils/src/sayVIMS.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <netinet/in.h>
#include <sys/socket.h>
#include <veejay/vims.h>
#include <veejay/vje.h>
#include <veejay/vj-client.h>
#include <veejay/vjmem.h>
#include <veejay/vj-msg.h>
Expand Down