[Libreoffice-commits] .: solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Wed Sep 28 00:04:42 PDT 2011
solenv/gbuild/platform/winmingw.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 05bee2028291190e3413fa5815897f54b6060fd6
Author: David Tardon <dtardon at redhat.com>
Date: Wed Sep 28 08:54:31 2011 +0200
we want these macros to be emtpy strings, not 1s
The substituted 1s cause i686-pc-mingw32-windres to bail out with syntax
error in solenv/inc/shlinfo.rc at line 67.
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index d4f475c..bf81120 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -525,9 +525,9 @@ $(call gb_WinResTarget_WinResTarget_init,$(2))
$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
$(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \
- -DADDITIONAL_VERINFO1 \
- -DADDITIONAL_VERINFO2 \
- -DADDITIONAL_VERINFO3 \
+ -DADDITIONAL_VERINFO1="" \
+ -DADDITIONAL_VERINFO2="" \
+ -DADDITIONAL_VERINFO3="" \
)
$(call gb_Library_add_nativeres,$(1),$(2))
$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))
More information about the Libreoffice-commits
mailing list