Kaydet (Commit) ab6f96f0 authored tarafından Petr Mladek's avatar Petr Mladek

[mono] fix build in gbuildised unoil

Change-Id: I9c717b067e067338160a38c88d935187db8cc04d
üst 10fb45c7
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
......
......@@ -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:
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment