diff --git a/.gitignore b/.gitignore index 85ad69e..ad62746 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ Makefile.in /missing .libs/ .deps/ -lib/ +/.run/ libmaigre/maigre-style.c Maigre/Maigre_Theme.cs diff --git a/Makefile.am b/Makefile.am index ce3d8b0..e677126 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,3 +18,15 @@ MAINTAINERCLEANFILES = \ ltmain.sh \ missing \ mkinstalldirs + +.PHONY: run + +RUNDIR=$(top_builddir)/.run + +run: + rm -rf $(RUNDIR) + mkdir -p $(RUNDIR)/engines + cp -a libmaigre/.libs/libmaigre.so Maigre/Maigre.dll $(RUNDIR)/engines + cp Maigre/gtkrc $(RUNDIR) + GTK_PATH=$(RUNDIR) GTK2_RC_FILES=$(RUNDIR)/gtkrc gtk-demo + diff --git a/libmaigre/Makefile.am b/libmaigre/Makefile.am index 1df795c..a6815a5 100644 --- a/libmaigre/Makefile.am +++ b/libmaigre/Makefile.am @@ -23,8 +23,8 @@ engine_LTLIBRARIES = libmaigre.la libmaigre_la_SOURCES = $(MAIGRE_SRC) nodist_libmaigre_la_SOURCES = maigre-style.c -libmurrine_la_LDFLAGS = -module -avoid-version -no-undefined -libmurrine_la_LIBADD = $(MONO_LIBS) $(GTK_LIBS) +libmaigre_la_LDFLAGS = -module -avoid-version -no-undefined +libmaigre_la_LIBADD = $(MONO_LIBS) $(GTK_LIBS) maigre-style.c: maigre-style.template.c @echo " GEN $@"; $(top_srcdir)/maigre-codegen/maigre-codegen.py $< $@ diff --git a/libmaigre/maigre-mono-bridge.c b/libmaigre/maigre-mono-bridge.c index fddb66e..be6340a 100644 --- a/libmaigre/maigre-mono-bridge.c +++ b/libmaigre/maigre-mono-bridge.c @@ -46,11 +46,11 @@ maigre_mono_bridge () if (bridge->domain == NULL) { mono_config_parse (NULL); - bridge->domain = mono_jit_init ("lib/engines/Maigre.dll"); + bridge->domain = mono_jit_init (".run/engines/Maigre.dll"); } if ((bridge->assembly = mono_domain_assembly_open ( - bridge->domain, "lib/engines/Maigre.dll")) == NULL || + bridge->domain, ".run/engines/Maigre.dll")) == NULL || (bridge->image = mono_assembly_get_image (bridge->assembly)) == NULL) { g_warning ("Could not load Maigre.dll assembly"); return bridge; @@ -77,4 +77,4 @@ maigre_mono_bridge () bridge->init_success = TRUE; return bridge; -} \ No newline at end of file +}