Added back the run target
This commit is contained in:
Родитель
94c0d9033d
Коммит
76b2ad0ca2
|
@ -20,7 +20,7 @@ Makefile.in
|
||||||
/missing
|
/missing
|
||||||
.libs/
|
.libs/
|
||||||
.deps/
|
.deps/
|
||||||
lib/
|
|
||||||
|
|
||||||
|
/.run/
|
||||||
libmaigre/maigre-style.c
|
libmaigre/maigre-style.c
|
||||||
Maigre/Maigre_Theme.cs
|
Maigre/Maigre_Theme.cs
|
||||||
|
|
12
Makefile.am
12
Makefile.am
|
@ -18,3 +18,15 @@ MAINTAINERCLEANFILES = \
|
||||||
ltmain.sh \
|
ltmain.sh \
|
||||||
missing \
|
missing \
|
||||||
mkinstalldirs
|
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
|
||||||
|
|
||||||
|
|
|
@ -23,8 +23,8 @@ engine_LTLIBRARIES = libmaigre.la
|
||||||
|
|
||||||
libmaigre_la_SOURCES = $(MAIGRE_SRC)
|
libmaigre_la_SOURCES = $(MAIGRE_SRC)
|
||||||
nodist_libmaigre_la_SOURCES = maigre-style.c
|
nodist_libmaigre_la_SOURCES = maigre-style.c
|
||||||
libmurrine_la_LDFLAGS = -module -avoid-version -no-undefined
|
libmaigre_la_LDFLAGS = -module -avoid-version -no-undefined
|
||||||
libmurrine_la_LIBADD = $(MONO_LIBS) $(GTK_LIBS)
|
libmaigre_la_LIBADD = $(MONO_LIBS) $(GTK_LIBS)
|
||||||
|
|
||||||
maigre-style.c: maigre-style.template.c
|
maigre-style.c: maigre-style.template.c
|
||||||
@echo " GEN $@"; $(top_srcdir)/maigre-codegen/maigre-codegen.py $< $@
|
@echo " GEN $@"; $(top_srcdir)/maigre-codegen/maigre-codegen.py $< $@
|
||||||
|
|
|
@ -46,11 +46,11 @@ maigre_mono_bridge ()
|
||||||
|
|
||||||
if (bridge->domain == NULL) {
|
if (bridge->domain == NULL) {
|
||||||
mono_config_parse (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 (
|
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) {
|
(bridge->image = mono_assembly_get_image (bridge->assembly)) == NULL) {
|
||||||
g_warning ("Could not load Maigre.dll assembly");
|
g_warning ("Could not load Maigre.dll assembly");
|
||||||
return bridge;
|
return bridge;
|
||||||
|
@ -77,4 +77,4 @@ maigre_mono_bridge ()
|
||||||
bridge->init_success = TRUE;
|
bridge->init_success = TRUE;
|
||||||
|
|
||||||
return bridge;
|
return bridge;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче