diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-01 13:50:16 +0100 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-03-02 16:02:39 +0000 |
| commit | ee0dd367156bbc7eac6047e9a772782e56496f59 (patch) | |
| tree | ad80da4dde4acaef738f5b67dcdb7f1630793d52 /solenv/gbuild | |
| parent | 5f985d3759f6d424426b04571da90cc02c717db1 (diff) | |
remove minor.mk
Hopefully all stays the same except for vcl/unx/gtk/a11y/atkutil.cxx.
Change-Id: I49108007ee6d045f045de86c8654efc7ca5fd3d0
Reviewed-on: https://gerrit.libreoffice.org/2491
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b0b6f92b7925..b65325466f4e 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -282,8 +282,6 @@ include $(GBUILDDIR)/Deliver.mk $(eval $(call gb_Deliver_init)) -include $(BUILDDIR)/solenv/inc/minor.mk - # We are using a set of scopes that we might as well call classes. # It is important to include them in the right order as that is diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 09606436c19d..5b5c21ec9113 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -275,7 +275,7 @@ define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) $(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) $(call gb_WinResTarget_add_defs,$(2),\ - -DVERVARIANT="$(BUILD)" \ + -DVERVARIANT="$(LIBO_VERSION_PATCH)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DADDITIONAL_VERINFO1="" \ -DADDITIONAL_VERINFO2="" \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index e2cfc4970fe7..7e003194afc4 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -321,7 +321,7 @@ define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) $(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) $(call gb_WinResTarget_add_defs,$(2),\ - -DVERVARIANT="$(BUILD)" \ + -DVERVARIANT="$(LIBO_VERSION_PATCH)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DORG_NAME="$(call gb_Library_get_dllname,$(1))"\ -DINTERNAL_NAME="$(subst $(gb_Library_DLLEXT),,$(call gb_Library_get_dllname,$(1)))" \ |