external/prj/d.lst | 4 ++++
unoil/CustomTarget_climaker.mk | 24 ++++++++++++++++++++++++
unoil/Module_unoil.mk | 7 +++++++
3 files changed, 35 insertions(+)
New commits:
commit 3d3f371b2b8f13791653a9fc162643fb4a4ca32e
Author: Petr Mladek <pmla...@suse.cz>
Date: Tue Nov 6 16:03:54 2012 +0100
[mono] fix build in gbuildised unoil
Change-Id: I9c717b067e067338160a38c88d935187db8cc04d
diff --git a/external/prj/d.lst b/external/prj/d.lst
index fb1bd77..19cc051 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -1,4 +1,5 @@
mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\cli
mkdir: %_DEST%\inc\external\glibc
mkdir: %_DEST%\inc\external\mingw
mkdir: %_DEST%\inc\external\mingw\include
@@ -6,6 +7,9 @@ mkdir: %_DEST%\inc\external\mingw\include\atl
mkdir: %_DEST%\inc\external\mingw\include\sys
mkdir: %_DEST%\inc\external\wine
+..\cli\*.config %_DEST%\inc\external\cli\*.config
+..\cli\*.dll %_DEST%\inc\external\cli\*.dll
+
..\glibc\rtufiles\config.h %_DEST%\inc\external\glibc\config.h
..\glibc\rtufiles\getopt.h %_DEST%\inc\external\glibc\getopt.h
diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index a2c81c3..16db37e 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -36,6 +36,29 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \
$(unoil_CLIDIR)/cli_oootypes.config \
$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
+
+ifeq ($(ENABLE_MONO),YES)
+ifneq ($(ENABLE_MONO_CLIMAKER),YES)
+unoil_prebuilt_mono_dlls := YES
+endif
+endif
+
+ifeq ($(unoil_prebuilt_mono_dlls),YES)
+
+$(unoil_CLIDIR)/cli_oootypes.dll : $(OUTDIR)/inc/external/cli/cli_oootypes.dll
+ mkdir -p $(@D)
+ $(GNUCOPY) $? $@
+
+$(unoil_CLIDIR)/cli_oootypes.config :
$(OUTDIR)/inc/external/cli/cli_oootypes.config
+ mkdir -p $(@D)
+ $(GNUCOPY) $? $@
+
+$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll :
$(OUTDIR)/inc/external/cli/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
+ mkdir -p $(@D)
+ $(GNUCOPY) $< $@
+
+else
+
$(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
$(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
@@ -73,5 +96,6 @@ $(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : \
-keyfile:$(OUTDIR)/bin/cliuno.snk \
-link:cli_oootypes.config)
rm cli_oootypes.config
+endif
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index 40e7cdd..ae29c85 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -39,6 +39,13 @@ $(eval $(call gb_Module_add_targets,unoil,\
endif
ifeq ($(COM),MSC)
+unoil_climaker_build := YES
+endif
+ifeq ($(ENABLE_MONO),YES)
+unoil_climaker_build := YES
+endif
+
+ifeq ($(unoil_climaker_build),YES)
$(eval $(call gb_Module_add_targets,unoil,\
CustomTarget_climaker \
Package_climaker \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
