Skip to content

Commit

Permalink
GTK3 : fix gtk2 - gtk3 mixed lib
Browse files Browse the repository at this point in the history
Fix the following error :
Gtk-ERROR **: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported

game-stop#163
  • Loading branch information
d-j-a-y committed May 21, 2019
1 parent 23ed693 commit 3e4c87a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions veejay-current/veejay-server/configure.ac
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
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

0 comments on commit 3e4c87a

Please sign in to comment.