diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-20 15:18:24 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-20 15:20:00 +0100 |
| commit | fa604beee3e8ca26bba7c1d681bf83a44638b835 (patch) | |
| tree | 0688b57fdf334a5cdccb31c4651baa75334dc20c /solenv | |
| parent | 397af236af9a2263c042d675efcc041a20c92059 (diff) | |
gbuild: TARGETGUI variable must be set on all LinkTargets
... otherwise it will get inherited from Executables to StaticLibraries
and then mt.exe will be unhappy and complain.
Change-Id: Ic9cc32ea3d0fb5d1fe91c1e9efa354fdf30c8264
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/mingw.mk | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 4f71cf1db6cb..3d3ac6d231af 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -589,6 +589,7 @@ $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS := $(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX := $(call gb_LinkTarget_get_target,$(1)) : PCHOBJNOEX := $(call gb_LinkTarget_get_target,$(1)) : PDBFILE := +$(call gb_LinkTarget_get_target,$(1)) : TARGETGUI := $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS := $(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_LinkTarget_get_target,$(1)) : VISIBILITY := diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 372710389555..790ba16c3c58 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -376,7 +376,6 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ $(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE := $(call gb_LinkTarget_get_pdbfile_in,$(2)) -$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI := endef diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index fe0422336b93..ac5218c2429c 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -272,7 +272,7 @@ gb_Executable_TARGETTYPEFLAGS := gb_Executable_get_rpath := define gb_Executable_Executable_platform -$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI := + endef # CppunitTest class |