diff options
| -rwxr-xr-x | RepositoryFixes.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/linux.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index a94605eacbd2..b501e8509ce8 100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -137,6 +137,9 @@ gb_Library_NOILIBFILENAMES:=\ d3d9 \ d3dx \ ddraw \ + expat \ + expat_xmltok\ + expat_xmlparse \ gdi32 \ gdiplus \ graphite_dll \ @@ -212,9 +215,4 @@ gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS)) gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS)) endif -ifeq ($(SYSTEM_EXPAT),YES) -gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS)) -endif - - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 8b27cc45ecbd..20a7d6d4ee08 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -278,6 +278,8 @@ endif gb_Library_PLAINLIBS_NONE += \ cairo \ expat \ + expat_xmltok \ + expat_xmlparse \ fontconfig \ Xrender \ pixman-1 \ diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 472f08009a92..ab1059b09dad 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -453,6 +453,8 @@ gb_Library_PLAINLIBS_NONE += \ d3dx \ ddraw \ expat \ + expat_xmltok \ + expat_xmlparse \ gdi32 \ gdiplus \ gnu_getopt \ |