diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-13 17:16:56 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-15 09:37:41 +0100 |
| commit | 08df0ab05ee209f1198ee0879f97a63ffaf56d76 (patch) | |
| tree | 7c2dbed750070adaf2f6c3ab448803475a03dea8 | |
| parent | 726409167507aa20fb90882ceed3ca3e770d3d4b (diff) | |
gallery: use icerun for building, and tweak for windows use.
Change-Id: Ic9e30661f05506b3616eaf417f8e3deed7290830
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 0e3f84b1dd55..7b282382b109 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -59,7 +59,7 @@ $(call gb_Output_announce,$(2),$(true),GAL,1) $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_Gallery_get_workdir,$(2))/* && \ SAL_USE_VCLPLUGIN=svp \ - $(call gb_Executable_get_command,gengal.bin) \ + $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \ $(call gb_Gallery__make_env_args) \ --build-tree \ --destdir $(GALLERY_BASEDIR) \ @@ -78,7 +78,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_Gallery_get_target,%) : \ - $(call gb_Executable_get_runtime_dependencies,gengal.bin) \ + $(call gb_Executable_get_runtime_dependencies,$(gb_GENGAL)) \ $(gb_Gallery_EXTRA_DEPENCENCIES) $(call gb_Gallery__command,$@,$*) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 1757e84a82fd..a91e0b40846d 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -399,7 +399,7 @@ endef # # gb_Executable_get_command executable define gb_Executable_get_command -$(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,$(1)) +$(gb_Helper_set_ld_path) $(2) $(call gb_Executable_get_target_for_build,$(1)) endef gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT) diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index eea1bbb0f92e..51d8641671e9 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -7,6 +7,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # + +ifeq (,$(filter WNT,$(OS))) + gb_GENGAL = gengal.bin +else + gb_GENGAL = gengal.exe +endif + # Tools we need to build for cross-compiling gb_BUILD_TOOLS = \ $(foreach executable, \ @@ -38,7 +45,7 @@ gb_BUILD_TOOLS = \ ulfex \ xrmex \ $(call gb_Helper_optional_for_host,DESKTOP, \ - gengal.bin \ + $(gb_GENGAL) \ HelpIndexer \ HelpLinker \ ) \ |