summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorka <kai.ahrens@oracle.com>2011-03-28 23:47:32 +0200
committerka <kai.ahrens@oracle.com>2011-03-28 23:47:32 +0200
commit3d15673188d62ca570342df76497032036cddc67 (patch)
treeb172751fff651d7cd9cf05236653e42383951f7a /pango
parentfebd402ce3877e88a0b67b04323ff8bd633d2075 (diff)
rsvglibs: adjustments for external library patches
Diffstat (limited to 'pango')
-rw-r--r--pango/makefile.mk8
-rwxr-xr-xpango/prj/d.lst6
2 files changed, 6 insertions, 8 deletions
diff --git a/pango/makefile.mk b/pango/makefile.mk
index e653d25d61ec..c7f9d036a545 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -52,7 +52,6 @@ TARFILE_MD5=22ad1c8d3fda7e73b0798035f3dd96bc
.IF "$(OS)" == "MACOSX"
PATCH_FILES=pango-1.28.3.patch
-ADDITIONAL_FILES=pango/glib-mkenums
CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)"
CONFIGURE_DIR=
@@ -112,15 +111,12 @@ PATCH_FILES=pango-1.28.3-win32.patch
ADDITIONAL_FILES=config.h module.defs make.msc glib-mkenums.pl msvc_recommended_pragmas.h
CONFIGURE_DIR=
CONFIGURE_ACTION=
-BUILD_DIR=./pango
+BUILD_DIR=./pango
BUILD_ACTION=nmake -f makefile.msc
OUT2LIB+=pango/pango-1.0.lib
-OUT2LIB+=pango/pango-1.0s.lib
OUT2LIB+=pango/pangocairo-1.0.lib
-OUT2LIB+=pango/pangocairo-1.0s.lib
OUT2LIB+=pango/pangowin32-1.0.lib
-OUT2LIB+=pango/pangowin32-1.0s.lib
OUT2BIN+=pango/libpango-1.0-0.dll
OUT2BIN+=pango/libpangocairo-1.0-0.dll
@@ -128,6 +124,7 @@ OUT2BIN+=pango/libpangowin32-1.0-0.dll
OUT2BIN+=pango/querymodules.exe
OUT2INC+=pango/pango.h
+OUT2INC+=pango/pangocairo.h
OUT2INC+=pango/pango-attributes.h
OUT2INC+=pango/pango-bidi-type.h
OUT2INC+=pango/pango-break.h
@@ -143,6 +140,7 @@ OUT2INC+=pango/pango-glyph.h
OUT2INC+=pango/pango-glyph-item.h
OUT2INC+=pango/pango-gravity.h
OUT2INC+=pango/pango-item.h
+OUT2INC+=pango/pango-language.h
OUT2INC+=pango/pango-layout.h
OUT2INC+=pango/pango-matrix.h
OUT2INC+=pango/pango-renderer.h
diff --git a/pango/prj/d.lst b/pango/prj/d.lst
index ff7ba3340dce..c80568a0df01 100755
--- a/pango/prj/d.lst
+++ b/pango/prj/d.lst
@@ -35,9 +35,9 @@ symlink: %_DEST%\lib%_EXT%\libpango-1.0.0.dylib %_DEST%\lib%_EXT%\libpango-1.0.d
..\%__SRC%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib%_EXT%\libpangocairo-1.0.0.dylib
symlink: %_DEST%\lib%_EXT%\libpangocairo-1.0.0.dylib %_DEST%\lib%_EXT%\libpangocairo-1.0.dylib
-..\%__SRC%\lib\ pango-1.0.lib %_DEST%\lib%_EXT%\pango-1.0.lib
-..\%__SRC%\lib\ pangocairo-1.0.lib %_DEST%\lib%_EXT%\pangocairo-1.0.lib
-..\%__SRC%\lib\ pangowin32-1.0.lib %_DEST%\lib%_EXT%\pangowin32-1.0.lib
+..\%__SRC%\lib\pango-1.0.lib %_DEST%\lib%_EXT%\pango-1.0.lib
+..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib%_EXT%\pangocairo-1.0.lib
+..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib%_EXT%\pangowin32-1.0.lib
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
..\%__SRC%\bin\pango-querymodules %_DEST%\bin%_EXT%\pango-querymodules