Merge branch 'master' of https://github.com/TASVideos/desmume
This commit is contained in:
commit
d556c99771
|
@ -174,7 +174,7 @@ if test "x$glade" = "xyes" ; then
|
||||||
AC_SUBST(LIBGLADE_LIBS)
|
AC_SUBST(LIBGLADE_LIBS)
|
||||||
|
|
||||||
dnl uninstalled glade ui dir
|
dnl uninstalled glade ui dir
|
||||||
AC_DEFINE_UNQUOTED(GLADEUI_UNINSTALLED_DIR,"`pwd`/src/gtk-glade/glade/",[path to glade ui dir])
|
AC_DEFINE_UNQUOTED(GLADEUI_UNINSTALLED_DIR,"`pwd`/gtk-glade/glade/",[path to glade ui dir])
|
||||||
AC_SUBST(GLADEUI_UNINSTALLED_DIR)
|
AC_SUBST(GLADEUI_UNINSTALLED_DIR)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GTKGLEXT,
|
PKG_CHECK_MODULES(GTKGLEXT,
|
||||||
|
|
|
@ -322,6 +322,8 @@ gchar * get_ui_file (const char *filename)
|
||||||
if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;
|
if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;
|
||||||
g_free (path);
|
g_free (path);
|
||||||
|
|
||||||
|
printf ("Failed to find ui file, \"%s\", in %s or %s\n",
|
||||||
|
filename ? filename : "", GLADEUI_UNINSTALLED_DIR, DATADIR);
|
||||||
/* not found */
|
/* not found */
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue