X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-if.c;h=939d734a9c990875ce7ee2f9511440b71db0c134;hb=4baeafb95f6fe4523d5854778bce639dae5a3a9f;hp=3298c795d397ef84754da5ceecfbb79f15b5e5fc;hpb=583f9aec7dff8c4d5456f053ef53279cc2261574;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-if.c b/libchimara/chimara-if.c
index 3298c79..939d734 100644
--- a/libchimara/chimara-if.c
+++ b/libchimara/chimara-if.c
@@ -533,11 +533,17 @@ chimara_if_run_game(ChimaraIF *self, gchar *gamefile, GError **error)
 	ChimaraIFInterpreter interpreter = priv->preferred_interpreter[format];
 	gchar *pluginfile = g_strconcat(plugin_names[interpreter], "." G_MODULE_SUFFIX, NULL);
 
+	gchar *pluginpath;
+#ifdef DEBUG
+#ifndef LT_OBJDIR
+#define LT_OBJDIR ".libs" /* Pre-2.2 libtool, so take a wild guess */
+#endif /* LT_OBJDIR */
 	/* If there is a plugin in the source tree, use that */
-	gchar *pluginpath = g_build_filename("..", "interpreters", plugin_names[interpreter], LT_OBJDIR, pluginfile, NULL);
+	pluginpath = g_build_filename(PLUGINSOURCEDIR, plugin_names[interpreter], LT_OBJDIR, pluginfile, NULL);
 	if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
 	{
 		g_free(pluginpath);
+#endif /* DEBUG */
 		pluginpath = g_build_filename(PLUGINDIR, pluginfile, NULL);
 		if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
 		{
@@ -546,7 +552,9 @@ chimara_if_run_game(ChimaraIF *self, gchar *gamefile, GError **error)
 			g_set_error(error, CHIMARA_ERROR, CHIMARA_PLUGIN_NOT_FOUND, _("No appropriate %s interpreter plugin was found"), interpreter_names[interpreter]);
 			return FALSE;
 		}
+#ifdef DEBUG
 	}
+#endif
 	g_free(pluginfile);
 
 	/* Decide what arguments to pass to the interpreters; currently only the