[Libreoffice-commits] .: connectivity/Library_macab1.mk setup_native/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Jan 26 16:53:23 PST 2013


 connectivity/Library_macab1.mk                                      |    2 ++
 setup_native/source/win32/customactions/shellextensions/makefile.mk |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 7bc44705c0974719b7a198bb5dbf8f9d782d55a8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Jan 27 01:50:56 2013 +0100

    still not enough boost_header
    
    Change-Id: Ic0ee933fbee7368f0af2573ea33a5ce33f4043c4

diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index cd2583a7..7126f3b 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,macab1))
 
 $(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
 
+$(eval $(call gb_Library_use_external,macab1,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,macab1))
 
 $(eval $(call gb_Library_use_libraries,macab1,\
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 5840a52..5309614 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -34,6 +34,7 @@ USE_DEFFILE=TRUE
 .IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
+CFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost
 
 SLOFILES = \
     $(SLO)$/startmenuicon.obj \


More information about the Libreoffice-commits mailing list