diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:03:35 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:03:35 +0200 |
| commit | 31daa1bd60b3d2118393752cbc1a1d44d9a802f7 (patch) | |
| tree | 562a19ceda25e5f0c7412acd089081933f9d7ba0 /cairo/prj | |
| parent | e512adbb0a83012da7ca76c7725c2c532f31b0e7 (diff) | |
| parent | 1d84afcf346e374980259718e26f48622b76aa5d (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
cairo/cairo-1.8.0.patch
cairo/prj/build.lst
gdk-pixbuf/makefile.mk
libcroco/makefile.mk
Diffstat (limited to 'cairo/prj')
| -rw-r--r-- | cairo/prj/build.lst | 2 | ||||
| -rw-r--r-- | cairo/prj/d.lst | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst index c59a5c4bbdd8..a4d0da413fae 100644 --- a/cairo/prj/build.lst +++ b/cairo/prj/build.lst @@ -1,4 +1,4 @@ -lcairo cairo : ZLIB:zlib soltools stlport NULL +lcairo cairo : ZLIB:zlib libpng soltools stlport NULL lcairo cairo usr1 - all lcairo_mkout NULL lcairo cairo\pixman nmake - all lcairo_pixman NULL lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL diff --git a/cairo/prj/d.lst b/cairo/prj/d.lst index 6cd8613cf677..79ca424607a9 100644 --- a/cairo/prj/d.lst +++ b/cairo/prj/d.lst @@ -1,15 +1,15 @@ -mkdir: %_DEST%\inc%_EXT%\cairo -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\cairo -..\%__SRC%\inc\cairo*.h %_DEST%\inc%_EXT%\cairo\cairo*.h -..\%__SRC%\inc\cairo*.h %_DEST%\inc%_EXT%\external\cairo\cairo*.h +mkdir: %_DEST%\inc\cairo +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\cairo +..\%__SRC%\inc\cairo*.h %_DEST%\inc\cairo\cairo*.h +..\%__SRC%\inc\cairo*.h %_DEST%\inc\external\cairo\cairo*.h -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\lib\lib*.la %_DEST%\lib%_EXT%\lib*.la -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\bin\*.dll.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so +..\%__SRC%\lib\lib*.so.* %_DEST%\lib\lib*.so.* +..\%__SRC%\lib\lib*.dylib %_DEST%\lib\lib*.dylib +..\%__SRC%\lib\lib*.a %_DEST%\lib\lib*.a +..\%__SRC%\lib\lib*.la %_DEST%\lib\lib*.la +..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll +..\%__SRC%\lib\*.dll %_DEST%\bin\*.dll +..\%__SRC%\bin\*.dll.a %_DEST%\lib\*.a |