Anonymous avatar Anonymous committed fdd21e3

rsvglibs: adjusted makefiles to build external rsvglib dependencies

Comments (0)

Files changed (11)

fontconfig/makefile.mk

 TARFILE_NAME=fontconfig-2.8.0
 TARFILE_MD5=77e15a92006ddc2adbb06f840d591c0e
 
+.IF "$(OS)"=="WNT"
+
 CONFIGURE_DIR=
 .IF "$(OS)"=="WNT"
 ADDITIONAL_FILES=\
 BUILD_ACTION=$(GNUMAKE)
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk

freetype/makefile.mk

 TARFILE_NAME=freetype-2.4.4
 TARFILE_MD5=9273efacffb683483e58a9e113efae9f
 
+.IF "$(OS)"=="WNT"
+
 CONFIGURE_DIR=
 .IF "$(OS)"=="WNT"
 CONFIGURE_ACTION=
 
 BUILD_ACTION=$(GNUMAKE)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk

gdk-pixbuf/prj/build.lst

-gp	gdk-pixbuf	: glib libjpeg libpng soltools NULL
+gp	gdk-pixbuf	: glib jpeg libpng soltools NULL
 gp	gdk-pixbuf			    usr1	-	all	gp_mkout NULL
 gp	gdk-pixbuf			    nmake	-	all	gp_gdk-pixbuf NULL
 mkdir: %_DEST%\inc%_EXT%\external
 mkdir: %_DEST%\inc%_EXT%\external\jpeg
 
+..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib
 ..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeg.lib
+..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a
 ..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeg.a
 
 ..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jpeg\jerror.h

libgsf/makefile.mk

 #
 #*************************************************************************
 
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
 
 PRJ=.
 
 TARFILE_NAME=$(PRJNAME)-$(LIBGSFVERSION)
 TARFILE_MD5=3a84ac2da37cae5bf7ce616228c6fbde
 
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
+
 .IF "$(OS)" == "WNT"
 PATCH_FILES=libgsf-1.14.19.windows.patch
 
 OUT2INC+=gsf$/gsf-outfile-zip.h
 OUT2INC+=gsf$/gsf.h
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
-.ENDIF
 

libgsf/prj/build.lst

-gs	libgsf	: soltools NULL
+gs	libgsf	: glib soltools NULL
 gs	libgsf			    usr1	-	all	gs_mkout NULL
 gs	libgsf			    nmake	-	all	gs_libgsf NULL

librsvg/makefile.mk

 TARFILE_NAME=$(PRJNAME)-$(LIBRSVGVERSION)
 TARFILE_MD5=d7a242ca43e33e1b63d3073f9d46a6a8
 
+.IF "$(OS)" == "MACOSX" || "$(OS)" == "WNT"
+
 PATCH_FILES=librsvg-2.32.1.patch
 
 .IF "$(LIBXML_LIBS)" == ""
 .ELIF "$(OS)"=="WNT"
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk

librsvg/prj/build.lst

-rg	librsvg	: libcroco libgsf cairo gdk-pixbuf soltools NULL
+rg	librsvg	: pango libcroco libgsf cairo gdk-pixbuf soltools NULL
 rg	librsvg			    usr1	-	all	rg_mkout NULL
 rg	librsvg			    nmake	-	all	rg_gettext NULL

package/source/zipapi/Deflater.cxx

 		pStream->avail_in  = nLength;
 		pStream->avail_out = nNewLength;
 
-#ifdef SYSTEM_ZLIB
+#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
 		nResult = deflateParams(pStream, nLevel, nStrategy);
 #else
 		nResult = z_deflateParams(pStream, nLevel, nStrategy);
 		pStream->avail_in  = nLength;
 		pStream->avail_out = nNewLength;
 
-#ifdef SYSTEM_ZLIB
+#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
 		nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
 #else
 		nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
 }
 void SAL_CALL Deflater::reset(  ) 
 {
-#ifdef SYSTEM_ZLIB
+#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIXB
 	deflateReset(pStream);
 #else
 	z_deflateReset(pStream);
 {
 	if (pStream != NULL)
 	{
-#ifdef SYSTEM_ZLIB
+#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
 		deflateEnd(pStream);
 #else
 		z_deflateEnd(pStream);

package/source/zipapi/Inflater.cxx

 {
 	if (pStream != NULL)
 	{
-#ifdef SYSTEM_ZLIB
+#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
 		inflateEnd(pStream);
 #else
 		z_inflateEnd(pStream);
 	pStream->next_out  = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset );
 	pStream->avail_out = nNewLength;
 
-#ifdef SYSTEM_ZLIB
+#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
 	sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
 #else
 	sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);

pango/makefile.mk

 TARFILE_NAME=$(PRJNAME)-$(PANGOVERSION)
 TARFILE_MD5=22ad1c8d3fda7e73b0798035f3dd96bc
 
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
+
 PATCH_FILES=pango-1.28.3.patch
 
 CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)"
 .ELSE
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.