diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-08-02 18:25:35 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-04-30 12:05:25 +0200 |
| commit | 5f25dc8a564d01829f3cf9f58ed80cc83ea0eb45 (patch) | |
| tree | cd9b8867f861167fe6bf50643199005e81ee50a1 /solenv/gbuild | |
| parent | 0f73faeb7cd83a8424e5d68c97bdba76cc82ab67 (diff) | |
[mono] mono-climaker.diff: add mono support
merged with buildfix-climaker-disabled.diff: add mono support
merged with climaker-csharp-win.diff: add mono support
merged with buildfix-use-climaker-in-unoil.diff: add mono support
Conflicts:
cli_ure/prj/d.lst
cli_ure/source/bootstrap/makefile.mk
cli_ure/source/climaker/makefile.mk
cli_ure/unotypes/makefile.mk
unoil/climaker/makefile.mk
Change-Id: I4c0ec75954df7a34ed6f4173f84190ab10e62c4b
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/CliUnoApi.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk index f0a27356d3f1..6d538d19c647 100644 --- a/solenv/gbuild/CliUnoApi.mk +++ b/solenv/gbuild/CliUnoApi.mk @@ -14,6 +14,12 @@ gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT) gb_CliUnoApiTarget_TARGET := $(call gb_Executable_get_target_for_build,climaker) gb_CliUnoApiTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_CliUnoApiTarget_TARGET) +ifeq ($(BUILD_CLI),YES) +ifneq ($(COM),MSC) +gb_CliUnoApiTarget_LIBCLIMAKER_DEP := $(call gb_Library_get_target,climaker) +endif +endif + define gb_CliUnoApiTarget__command $(call gb_Output_announce,$(2),$(true),CLI,4) $(call gb_Helper_abbreviate_dirs,\ @@ -39,6 +45,7 @@ $(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir : # Windows machine to debug it... $(call gb_CliUnoApiTarget_get_target,%) : \ $(gb_CliUnoApiTarget_TARGET) \ + $(gb_CliUnoApiTarget_LIBCLIMAKER_DEP) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target,ure/services) |