diff options
| author | Enrico Weigelt, metux ITS <metuxitservice@googlemail.com> | 2012-11-16 04:40:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-21 14:30:11 +0000 |
| commit | 3f00bc6717964c2d4db26093b64a68f93c7de906 (patch) | |
| tree | c06e2fc0a1cfdc2e43b60e36d066b8cdf9dabafd /vcl | |
| parent | 0f834124b11d9fe2485455937b8e668813914c69 (diff) | |
Xlib import via generic pkg-config
Generic importing Xlib+friends via pkg-config, instead of scanning
through a list of directories. This is very helpful for non-standard
installation pathes and crosscompiling, as the generic pkg-config
infrastructure will handle it all.
Also dropping the obsolete bundled Xext headers.
Conflicts:
vcl/prj/build.lst
Change-Id: I6ee381030ff9f1d2d83062a17ab55ad3d847a4c6
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/prj/build.lst | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 57fd4cfe083a..30ac57e482d7 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -502,7 +502,6 @@ $(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 09bd494fb113..5c3b46d22477 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 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 : 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 usr1 - all vc_mkout NULL vc vcl\prj nmake - all vc_prj NULL |