mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmwaw: drop dep. on boost

Browse Source 
Change-Id: If3bce409a98b9593920c41f8e18b82e8daa36fb1
This commit is contained in:
David Tardon 2015-08-30 13:23:02 +02:00
parent 41680ccd05
commit ee0f5944fb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/libmwaw/ExternalProject_libmwaw.mk vendored
View File

@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libmwaw,\
)) ))
$(eval $(call gb_ExternalProject_use_externals,libmwaw,\ $(eval $(call gb_ExternalProject_use_externals,libmwaw,\
boost_headers \
revenge \ revenge \
)) ))
@ -30,15 +29,14 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
, \ , \
--enable-shared --disable-static \ --enable-shared --disable-static \
) \ ) \
--with-sharedptr=c++11 \
--without-docs \ --without-docs \
--disable-tools \ --disable-tools \
--disable-zip \ --disable-zip \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \ --disable-werror \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ CXXFLAGS="$(CXXFLAGS_CXX11)" \
$(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \
-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \

3
external/libmwaw/Library_mwaw.mk vendored
View File

@ -13,7 +13,6 @@ $(eval $(call gb_Library_use_unpacked,mwaw,libmwaw))
$(eval $(call gb_Library_use_externals,mwaw,\ $(eval $(call gb_Library_use_externals,mwaw,\
revenge \ revenge \
boost_headers \
)) ))
$(eval $(call gb_Library_set_warnings_not_errors,mwaw)) $(eval $(call gb_Library_set_warnings_not_errors,mwaw))
@ -24,10 +23,10 @@ $(eval $(call gb_Library_set_include,mwaw,\
)) ))
$(eval $(call gb_Library_add_defs,mwaw,\ $(eval $(call gb_Library_add_defs,mwaw,\
-DBOOST_ALL_NO_LIB \
-DBUILD_MWAW \ -DBUILD_MWAW \
-DNDEBUG \ -DNDEBUG \
-D_WINDLL \ -D_WINDLL \
-DSHAREDPTR_STD \
)) ))
$(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\