diff options
| author | David Tardon <dtardon@redhat.com> | 2012-06-06 17:04:01 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-06-13 06:06:43 +0200 |
| commit | 0f6919cf551507f1cb04ff5cbb04d7d3cd707e5c (patch) | |
| tree | 12f27ba42bcde568c30f12fb5a4d9badf8e0d3de /scp2 | |
| parent | e659fbd2779d1f3e6f871a2405db173c5f70d320 (diff) | |
better test for system boost date_time lib
This reverts commit 4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22.
Change-Id: Iea84991ee689240fe6e6ddbc47f44b444f582dde
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index d56a666e7e11..b903a03963c8 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -48,6 +48,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_OPENGL \ ENABLE_XMLSEC \ MERGELIBS \ + SYSTEM_BOOST \ SYSTEM_CAIRO \ SYSTEM_CLUCENE \ SYSTEM_CURL \ @@ -90,6 +91,7 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ )) $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ + MINGW_BOOST_DATE_TIME_DLL \ MINGW_CAIRO_DLL \ MINGW_CRYPTO_DLL \ MINGW_CURL_DLL \ diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 6d50c324d8db..82a5dc1ad83e 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -223,6 +223,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblcms2, MINGW_LCMS2_DLL ) #endif #endif +#if defined SYSTEM_BOOST +#if defined NEEDS_MINGW_BOOST_DATE_TIME_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Libboost_date_time, MINGW_BOOST_DATE_TIME_DLL ) +#endif +#endif + #if defined(MINGW_GCCDLL) File gid_Brand_File_Lib_Mingw_GccS |