diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-21 16:28:14 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-21 16:28:14 +0100 |
commit | ec6013c88a7fa59f61a928c2ee7aabed8cbb96c7 (patch) | |
tree | 1f2caf29b89193bc4c9e3996f913a6a39c2886d1 /vcl | |
parent | 024cf92581add62866544ae604ff53c89a764ace (diff) |
Revert "Xlib import via generic pkg-config"
It breaks our baseline Linux release builds where x11_extensions
headers are actually used.
This reverts commit 3f00bc6717964c2d4db26093b64a68f93c7de906.
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
-rw-r--r-- | vcl/prj/build.lst | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 30ac57e482d7..57fd4cfe083a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -502,6 +502,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ fontconfig \ freetype \ valgrind \ + x11extensions \ )) endif diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst index 5c3b46d22477..09bd494fb113 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,4 +1,4 @@ -vc vcl : apple_remote BOOST:boost officecfg DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar offapi basegfx basebmp tools DESKTOP:l10ntools cpputools svl LCMS2:lcms2 LIBXSLT:libxslt CAIRO:cairo FREETYPE:freetype FONTCONFIG:fontconfig shell NSS:nss NULL +vc vcl : apple_remote BOOST:boost officecfg DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools cpputools svl LCMS2:lcms2 LIBXSLT:libxslt CAIRO:cairo FREETYPE:freetype FONTCONFIG:fontconfig shell NSS:nss NULL vc vcl usr1 - all vc_mkout NULL vc vcl\prj nmake - all vc_prj NULL |