eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-22 15:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix resource loading when install prefix is used, fix enable-debug configure option

Browse Source
This commit is contained in:
niels
2013-09-09 21:56:26 +02:00
parent 42a7aa73ec
commit a778cba1be
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
veejay-current/veejay-client/configure.ac
View File

@@ -219,6 +219,8 @@ dnl Look for X
AC_PATH_XTRA AC_PATH_XTRA
AM_CONDITIONAL(HAVE_X, test x$have_x = xyes) AM_CONDITIONAL(HAVE_X, test x$have_x = xyes)
debugCFLAGS=-g
AC_MSG_CHECKING(whether to compile in profiling information) AC_MSG_CHECKING(whether to compile in profiling information)
if test "x$enable_profiling" = "xyes" ; then if test "x$enable_profiling" = "xyes" ; then
debugCFLAGS="$debugCFLAGS -fprofile-arcs -ftest-coverage" debugCFLAGS="$debugCFLAGS -fprofile-arcs -ftest-coverage"
@@ -230,7 +232,7 @@ else
fi fi
AC_MSG_CHECKING(whether to compile in assertion checking) AC_MSG_CHECKING(whether to compile in assertion checking)
if test "x$enable_strict" = "xyes" ; then if test "x$enable_strict" = "xyes" ; then
debugCFLAGS="$debugCFLAGS -g -DSTRICT_CHECKING" debugCFLAGS="$debugCFLAGS -DSTRICT_CHECKING"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
@@ -507,7 +509,6 @@ then
AC_MSG_NOTICE([enable_debug = $enable_debug]) AC_MSG_NOTICE([enable_debug = $enable_debug])
if test "x$enable_debug" != "xyes" ; if test "x$enable_debug" != "xyes" ;
then then
AC_MSG_NOTICE([debug koekje])
if test $ac_cv_flag_sse = yes; then if test $ac_cv_flag_sse = yes; then
CFLAGS="$CFLAGS -msse -mfpmath=sse" CFLAGS="$CFLAGS -msse -mfpmath=sse"
AC_MSG_NOTICE([cflags aangepast]) AC_MSG_NOTICE([cflags aangepast])
@@ -595,7 +596,7 @@ if test x"$with_extra_cflags" != "x"; then
CXXFLAGS="$CXXFLAGS $with_extra_cflags" CXXFLAGS="$CXXFLAGS $with_extra_cflags"
fi fi
reloaded_datadir="${datadir}/reloaded" reloaded_datadir="${datarootdir}/reloaded"
AC_SUBST(reloaded_datadir) AC_SUBST(reloaded_datadir)
sh gveejay-paths.sh > gveejay-paths.h sh gveejay-paths.sh > gveejay-paths.h
@@ -670,3 +671,4 @@ AC_MSG_NOTICE([ - Veejay 1.5.28 : ${have_veejay}])
AC_MSG_NOTICE([ - POSIX Threads (pthread) : ${have_pthread}]) AC_MSG_NOTICE([ - POSIX Threads (pthread) : ${have_pthread}])
AC_MSG_NOTICE([ - GDK Pixbuf support : ${have_pixbuf}]) AC_MSG_NOTICE([ - GDK Pixbuf support : ${have_pixbuf}])
AC_MSG_NOTICE([ - Alsa support (midi sequencer) : ${have_alsa}]) AC_MSG_NOTICE([ - Alsa support (midi sequencer) : ${have_alsa}])
AC_MSG_NOTICE([])

6
veejay-current/veejay-client/gveejay-paths.sh.in
View File

@@ -1,10 +1,4 @@
#!/bin/sh -e #!/bin/sh -e
prefix="@prefix@"
datadir="@datadir@"
DATADIRNAME="@DATADIRNAME@"
reloaded_datadir="@reloaded_datadir@" reloaded_datadir="@reloaded_datadir@"
cat << EOF cat << EOF

5
veejay-current/veejay-client/src/vj-api.c
View File

@@ -6828,7 +6828,6 @@ void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num,
} }
snprintf( glade_path, sizeof(glade_path), "%s/%s",RELOADED_DATADIR,glade_file); snprintf( glade_path, sizeof(glade_path), "%s/%s",RELOADED_DATADIR,glade_file);
veejay_memset( gui->status_tokens, 0, sizeof(int) * STATUS_TOKENS ); veejay_memset( gui->status_tokens, 0, sizeof(int) * STATUS_TOKENS );
veejay_memset( gui->sample, 0, 2 ); veejay_memset( gui->sample, 0, 2 );
veejay_memset( gui->selection, 0, 3 ); veejay_memset( gui->selection, 0, 3 );
@@ -6849,9 +6848,11 @@ void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num,
gui->client = NULL; gui->client = NULL;
gui->main_window = glade_xml_new(glade_path,NULL,NULL); gui->main_window = glade_xml_new(glade_path,NULL,NULL);
if(!gui->main_window) if(gui->main_window == NULL)
{ {
free(gui); free(gui);
veejay_msg( 0, "Cannot find '%s'", glade_path );
return;
} }
info = gui; info = gui;