Attachment #76412 for issue #117794

View | Details | Raw Unified | Return to issue 117794
Collapse All | Expand All

Line 0 Link Here

(-)workdir/librsvg/makefile.mk.orig (+4 lines)
		1	--- misc/librsvg-2.32.1/makefile.mk 2011-04-09 00:05:39.215750000 +0900
Lines 90-95 Link Here
90	.ELIF "$(OS)"=="WNT"	90	.ELIF "$(OS)"=="WNT"
91		91
92	PATCH_FILES=librsvg-2.32.1-win32.patch	92	PATCH_FILES=librsvg-2.32.1-win32.patch
		93	.IF "$(COM)"=="GCC"
		94	PATCH_FILES+=librsvg-2.32.1-mingw.patch
		95	.ENDIF
93	ADDITIONAL_FILES=config.h makefile.mk	96	ADDITIONAL_FILES=config.h makefile.mk
94		97
95	BUILD_DIR=.	98	BUILD_DIR=.

Lines 39-44 Link Here

(-)workdir/pango/prj/d.lst.orig (+5 lines)
39	..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib%_EXT%\pangocairo-1.0.lib	39	..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib%_EXT%\pangocairo-1.0.lib
40	..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib%_EXT%\pangowin32-1.0.lib	40	..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib%_EXT%\pangowin32-1.0.lib
41		41
		42	..\%__SRC%\lib\libpango-1.0.dll.a %_DEST%\lib%_EXT%\libpango-1.0.dll.a
		43	..\%__SRC%\lib\libpangocairo-1.0.dll.a %_DEST%\lib%_EXT%\libpangocairo-1.0.dll.a
		44	..\%__SRC%\lib\libpangowin32-1.0.dll.a %_DEST%\lib%_EXT%\libpangowin32-1.0.dll.a
		45
42	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%	46	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
43	..\%__SRC%\bin\pango-querymodules %_DEST%\bin%_EXT%\pango-querymodules	47	..\%__SRC%\bin\pango-querymodules %_DEST%\bin%_EXT%\pango-querymodules
44	..\%__SRC%\bin\querymodules.exe %_DEST%\bin%_EXT%\pango-querymodules.exe	48	..\%__SRC%\bin\querymodules.exe %_DEST%\bin%_EXT%\pango-querymodules.exe
		49	..\%__SRC%\bin\pango-querymodules.exe %_DEST%\bin%_EXT%\pango-querymodules.exe




--- misc/pango-1.28.3/Makefile.in	2010-09-29 20:02:36.000000000 +0900


.ELIF "$(OS)"=="WNT"

.IF "$(COM)"=="GCC"

PATCH_FILES=pango-1.28.3-mingw.patch

CONFIGURE_CPPFLAGS=-nostdinc -I$(SOLARINCDIR)$/external$/glib-2.0

CONFIGURE_CPPFLAGS+=$(INCLUDE)

CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
CONFIGURE_CC=$(CC) -mthreads

CONFIGURE_LIBS=

.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
CONFIGURE_CC+=-shared-libgcc
.ENDIF
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
CONFIGURE_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF

CONFIGURE_DIR=
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                BASE_DEPENDENCIES_CFLAGS="$(CONFIGURE_CPPFLAGS)" \
                BASE_DEPENDENCIES_LIBS=" " \
                 .$/configure \
                 --build=i686-pc-cygwin --host=i686-pc-mingw32 \
                 CC="$(CONFIGURE_CC)" CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
                 LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" \
                 CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)$/cairo" \
                 CAIRO_LIBS="-lcairo" \
                 GLIB_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
                 GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl" \
                 --without-x --with-included-modules=yes

BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)

OUT2LIB+=pango/.libs/libpango-1.0.dll.a
OUT2LIB+=pango/.libs/libpangocairo-1.0.dll.a
OUT2LIB+=pango/.libs/libpangowin32-1.0.dll.a

OUT2BIN+=pango/.libs/libpango-1.0-0.dll
OUT2BIN+=pango/.libs/libpangocairo-1.0-0.dll
OUT2BIN+=pango/.libs/libpangowin32-1.0-0.dll
OUT2BIN+=pango/.libs/pango-querymodules.exe
                
.ELSE

PATCH_FILES=pango-1.28.3-win32.patch
ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h
CONFIGURE_DIR=

OUT2BIN+=pango/libpangowin32-1.0-0.dll
OUT2BIN+=pango/querymodules.exe

.ENDIF

OUT2INC+=pango/pango.h
OUT2INC+=pango/pangocairo.h
OUT2INC+=pango/pango-attributes.h

Lines 19-21 Link Here

(-)workdir/gdk-pixbuf/prj/d.lst.orig (+1 lines)
19	..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders	19	..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders
20	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%	20	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
21	..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib	21	..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib
		22	..\%__SRC%\lib\libgdk_pixbuf-2.0.dll.a %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dll.a




--- misc/gdk-pixbuf-2.23.0/configure	2011-04-08 23:09:51.936125000 +0900


.ELIF "$(OS)"=="WNT"

.IF "$(COM)"=="GCC"

PATCH_FILES=gdk-pixbuf-2.23.0-mingw.patch

CONFIGURE_CPPFLAGS=-nostdinc -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg

CONFIGURE_CPPFLAGS+=$(INCLUDE)

CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
CONFIGURE_CC=$(CC) -mthreads

CONFIGURE_LIBS=-lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl

.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
CONFIGURE_CC+=-shared-libgcc
.ENDIF
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
CONFIGURE_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF

CONFIGURE_DIR=
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                BASE_DEPENDENCIES_CFLAGS="$(CONFIGURE_CPPFLAGS)" \
                BASE_DEPENDENCIES_LIBS=" " \
                 .$/configure \
                 --build=i686-pc-cygwin --host=i686-pc-mingw32 \
                 CC="$(CONFIGURE_CC)" CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
                 LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" \
                 --disable-glibtest --without-libtiff LIBPNG="-lpng -lzlib"

BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
                
OUT2LIB+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0.dll.a

OUT2BIN+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0-0.dll

.ELSE

PATCH_FILES=gdk-pixbuf-2.23.0-win32.patch
ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h 
CONFIGURE_DIR=


OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll

.ENDIF

OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h
OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h
OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h

Line 0 Link Here

(-)workdir/libgsf/makefile.mk.orig (+4 lines)
		1	--- misc/libgsf-1.14.19/gsf/gsf-config.h 2011-03-23 16:18:27.163747600 +0100
Lines 52-57 Link Here
52		52
53	.IF "$(OS)" == "WNT"	53	.IF "$(OS)" == "WNT"
54	PATCH_FILES=libgsf-1.14.19.windows.patch	54	PATCH_FILES=libgsf-1.14.19.windows.patch
		55	.IF "$(COM)"=="GCC"
		56	PATCH_FILES+=libgsf-1.14.19.mingw.patch
		57	.ENDIF
55		58
56	BUILD_DIR=gsf	59	BUILD_DIR=gsf
57	BUILD_ACTION=dmake	60	BUILD_ACTION=dmake

Line 0 Link Here

(-)workdir/libcroco/makefile.mk.orig (+4 lines)
		1	--- misc/libcroco-0.6.2/src/makefile.mk Wed Aug 20 14:33:55 2008
Lines 103-108 Link Here
103	BUILD_ACTION=dmake	103	BUILD_ACTION=dmake
104	BUILD_DIR=$(CONFIGURE_DIR)$/src	104	BUILD_DIR=$(CONFIGURE_DIR)$/src
105	PATCH_FILES=libcroco-0.6.2.patch	105	PATCH_FILES=libcroco-0.6.2.patch
		106	.IF "$(COM)"=="GCC"
		107	PATCH_FILES+=libcroco-0.6.2-mingw.patch
		108	.ENDIF
106	ADDITIONAL_FILES=\	109	ADDITIONAL_FILES=\
107	src$/makefile.mk	110	src$/makefile.mk
108		111

Lines 17-22 Link Here

(-)workdir/glib/prj/d.lst.orig (+5 lines)
17	..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib	17	..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib
18	..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib%_EXT%\glib-2.0.lib	18	..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib%_EXT%\glib-2.0.lib
19	..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib%_EXT%\gobject-2.0.lib	19	..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib%_EXT%\gobject-2.0.lib
		20	..\%__SRC%\lib\libgio-2.0.dll.a %_DEST%\lib%_EXT%\libgio-2.0.dll.a
		21	..\%__SRC%\lib\libgmodule-2.0.dll.a %_DEST%\lib%_EXT%\libgmodule-2.0.dll.a
		22	..\%__SRC%\lib\libgthread-2.0.dll.a %_DEST%\lib%_EXT%\libgthread-2.0.dll.a
		23	..\%__SRC%\lib\libglib-2.0.dll.a %_DEST%\lib%_EXT%\libglib-2.0.dll.a
		24	..\%__SRC%\lib\libgobject-2.0.dll.a %_DEST%\lib%_EXT%\libgobject-2.0.dll.a
20		25
21	mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0	26	mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0
22	mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio	27	mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio




--- misc/glib-2.28.1/Makefile.in	2011-02-19 00:22:03.000000000 +0900

OUT2INC+=gobject/gvaluearray.h

.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
PATCH_FILES=glib-2.28.1-mingw.patch

CONFIGURE_CPPFLAGS=-nostdinc

.IF "$(SYSTEM_ZLIB)"!="YES"
CONFIGURE_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib
.ENDIF
CONFIGURE_CPPFLAGS+=$(INCLUDE)

CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
CONFIGURE_CC=$(CC) -mthreads

CONFIGURE_LIBS=

.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
CONFIGURE_CC+=-shared-libgcc
.ENDIF
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
CONFIGURE_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF

CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
CONFIGURE_FLAGS=--disable-fam --build=i686-pc-cygwin --host=i686-pc-mingw32 CC="$(CONFIGURE_CC)" CPPFLAGS="$(CONFIGURE_CPPFLAGS)" LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
BUILD_ACTION=PATH=BUILD_ACTION=: && $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(P_BUILD_DIR)/glib/.libs):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)

OUT2BIN+=gio/.libs/libgio-2.0-0.dll
OUT2BIN+=glib/.libs/libglib-2.0-0.dll
OUT2BIN+=gmodule/.libs/libgmodule-2.0-0.dll
OUT2BIN+=gobject/.libs/libgobject-2.0-0.dll
OUT2BIN+=gthread/.libs/libgthread-2.0-0.dll
OUT2BIN+=gobject$/glib-mkenums
OUT2BIN+=gobject$/.libs$/glib-genmarshal.exe

OUT2LIB+=gio/.libs/libgio-2.0.dll.a
OUT2LIB+=glib/.libs/libglib-2.0.dll.a
OUT2LIB+=gmodule/.libs/libgmodule-2.0.dll.a
OUT2LIB+=gobject/.libs/libgobject-2.0.dll.a
OUT2LIB+=gthread/.libs/libgthread-2.0.dll.a

.ELSE
CONVERTFILES=gobject/gmarshal.c

PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch

OUT2LIB+=gobject/glib-genmarshal.lib
OUT2LIB+=gobject/gobject-2.0.lib
OUT2LIB+=gthread/gthread-2.0.lib
.ENDIF

OUT2INC+=build$/win32$/make.msc
OUT2INC+=build$/win32$/module.defs

Lines 28-30 Link Here

(-)workdir/gettext/prj/d.lst.orig (+1 lines)
28	..\%__SRC%\bin\urlget %_DEST%\bin%_EXT%\urlget	28	..\%__SRC%\bin\urlget %_DEST%\bin%_EXT%\urlget
29	..\%__SRC%\bin\xgettext %_DEST%\bin%_EXT%\xgettext	29	..\%__SRC%\bin\xgettext %_DEST%\bin%_EXT%\xgettext
30	..\%__SRC%\lib\iintl_t1.lib %_DEST%\lib%_EXT%\intl.lib	30	..\%__SRC%\lib\iintl_t1.lib %_DEST%\lib%_EXT%\intl.lib
		31	..\%__SRC%\lib\libintl.a %_DEST%\lib%_EXT%\libintl.a

Line 0 Link Here

(-)workdir/gettext/makefile.mk.orig (+5 lines)
		1	--- misc/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk Wed Aug 20 14:33:55 2008
Lines 88-94 Link Here
88	.ELIF "$(OS)"=="WNT"	88	.ELIF "$(OS)"=="WNT"
89	BUILD_DIR=gettext-runtime$/intl	89	BUILD_DIR=gettext-runtime$/intl
90	BUILD_ACTION=dmake	90	BUILD_ACTION=dmake
		91	.IF "$(COM)"=="GCC"
		92	PATCH_FILES=gettext-0.18.1.1-mingw.patch
		93	.ELSE
91	PATCH_FILES=gettext-0.18.1.1.patch	94	PATCH_FILES=gettext-0.18.1.1.patch
		95	.ENDIF
92	ADDITIONAL_FILES=\	96	ADDITIONAL_FILES=\
93	gettext-runtime/intl/makefile.mk \	97	gettext-runtime/intl/makefile.mk \
94	gettext-runtime/intl/libgnuintl.h \	98	gettext-runtime/intl/libgnuintl.h \

Return to issue 117794

Line 0 Link Here

(-)workdir/glib/makefile.mk.orig (+46 lines)
		1	--- misc/glib-2.28.1/Makefile.in 2011-02-19 00:22:03.000000000 +0900
Lines 287-292 Link Here
287	OUT2INC+=gobject/gvaluearray.h	287	OUT2INC+=gobject/gvaluearray.h
288		288
289	.ELIF "$(OS)"=="WNT"	289	.ELIF "$(OS)"=="WNT"
		290	.IF "$(COM)"=="GCC"
		291	PATCH_FILES=glib-2.28.1-mingw.patch
		292
		293	CONFIGURE_CPPFLAGS=-nostdinc
		294
		295	.IF "$(SYSTEM_ZLIB)"!="YES"
		296	CONFIGURE_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib
		297	.ENDIF
		298	CONFIGURE_CPPFLAGS+=$(INCLUDE)
		299
		300	CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
		301	CONFIGURE_CC=$(CC) -mthreads
		302
		303	CONFIGURE_LIBS=
		304
		305	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
		306	CONFIGURE_CC+=-shared-libgcc
		307	.ENDIF
		308	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
		309	CONFIGURE_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
		310	.ENDIF
		311
		312	CONFIGURE_DIR=
		313	CONFIGURE_ACTION=.$/configure
		314	CONFIGURE_FLAGS=--disable-fam --build=i686-pc-cygwin --host=i686-pc-mingw32 CC="$(CONFIGURE_CC)" CPPFLAGS="$(CONFIGURE_CPPFLAGS)" LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
		315	BUILD_ACTION=PATH=BUILD_ACTION=: && $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(P_BUILD_DIR)/glib/.libs):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} $(GNUMAKE)
		316	BUILD_FLAGS+= -j$(EXTMAXPROCESS)
		317	BUILD_DIR=$(CONFIGURE_DIR)
		318
		319	OUT2BIN+=gio/.libs/libgio-2.0-0.dll
		320	OUT2BIN+=glib/.libs/libglib-2.0-0.dll
		321	OUT2BIN+=gmodule/.libs/libgmodule-2.0-0.dll
		322	OUT2BIN+=gobject/.libs/libgobject-2.0-0.dll
		323	OUT2BIN+=gthread/.libs/libgthread-2.0-0.dll
		324	OUT2BIN+=gobject$/glib-mkenums
		325	OUT2BIN+=gobject$/.libs$/glib-genmarshal.exe
		326
		327	OUT2LIB+=gio/.libs/libgio-2.0.dll.a
		328	OUT2LIB+=glib/.libs/libglib-2.0.dll.a
		329	OUT2LIB+=gmodule/.libs/libgmodule-2.0.dll.a
		330	OUT2LIB+=gobject/.libs/libgobject-2.0.dll.a
		331	OUT2LIB+=gthread/.libs/libgthread-2.0.dll.a
		332
		333	.ELSE
290	CONVERTFILES=gobject/gmarshal.c	334	CONVERTFILES=gobject/gmarshal.c
291		335
292	PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch	336	PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch
Lines 320-325 Link Here
320	OUT2LIB+=gobject/glib-genmarshal.lib	364	OUT2LIB+=gobject/glib-genmarshal.lib
321	OUT2LIB+=gobject/gobject-2.0.lib	365	OUT2LIB+=gobject/gobject-2.0.lib
322	OUT2LIB+=gthread/gthread-2.0.lib	366	OUT2LIB+=gthread/gthread-2.0.lib
		367	.ENDIF
323		368
324	OUT2INC+=build$/win32$/make.msc	369	OUT2INC+=build$/win32$/make.msc
325	OUT2INC+=build$/win32$/module.defs	370	OUT2INC+=build$/win32$/module.defs

Line 0 Link Here

(-)workdir/pango/makefile.mk.orig (+51 lines)
		1	--- misc/pango-1.28.3/Makefile.in 2010-09-29 20:02:36.000000000 +0900
Lines 107-112 Link Here
107		107
108	.ELIF "$(OS)"=="WNT"	108	.ELIF "$(OS)"=="WNT"
109		109
		110	.IF "$(COM)"=="GCC"
		111
		112	PATCH_FILES=pango-1.28.3-mingw.patch
		113
		114	CONFIGURE_CPPFLAGS=-nostdinc -I$(SOLARINCDIR)$/external$/glib-2.0
		115
		116	CONFIGURE_CPPFLAGS+=$(INCLUDE)
		117
		118	CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
		119	CONFIGURE_CC=$(CC) -mthreads
		120
		121	CONFIGURE_LIBS=
		122
		123	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
		124	CONFIGURE_CC+=-shared-libgcc
		125	.ENDIF
		126	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
		127	CONFIGURE_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
		128	.ENDIF
		129
		130	CONFIGURE_DIR=
		131	CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
		132	BASE_DEPENDENCIES_CFLAGS="$(CONFIGURE_CPPFLAGS)" \
		133	BASE_DEPENDENCIES_LIBS=" " \
		134	.$/configure \
		135	--build=i686-pc-cygwin --host=i686-pc-mingw32 \
		136	CC="$(CONFIGURE_CC)" CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
		137	LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" \
		138	CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)$/cairo" \
		139	CAIRO_LIBS="-lcairo" \
		140	GLIB_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
		141	GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl" \
		142	--without-x --with-included-modules=yes
		143
		144	BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
		145	BUILD_DIR=$(CONFIGURE_DIR)
		146
		147	OUT2LIB+=pango/.libs/libpango-1.0.dll.a
		148	OUT2LIB+=pango/.libs/libpangocairo-1.0.dll.a
		149	OUT2LIB+=pango/.libs/libpangowin32-1.0.dll.a
		150
		151	OUT2BIN+=pango/.libs/libpango-1.0-0.dll
		152	OUT2BIN+=pango/.libs/libpangocairo-1.0-0.dll
		153	OUT2BIN+=pango/.libs/libpangowin32-1.0-0.dll
		154	OUT2BIN+=pango/.libs/pango-querymodules.exe
		155
		156	.ELSE
		157
110	PATCH_FILES=pango-1.28.3-win32.patch	158	PATCH_FILES=pango-1.28.3-win32.patch
111	ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h	159	ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h
112	CONFIGURE_DIR=	160	CONFIGURE_DIR=
Lines 123-128 Link Here
123	OUT2BIN+=pango/libpangowin32-1.0-0.dll	171	OUT2BIN+=pango/libpangowin32-1.0-0.dll
124	OUT2BIN+=pango/querymodules.exe	172	OUT2BIN+=pango/querymodules.exe
125		173
		174	.ENDIF
		175
126	OUT2INC+=pango/pango.h	176	OUT2INC+=pango/pango.h
127	OUT2INC+=pango/pangocairo.h	177	OUT2INC+=pango/pangocairo.h
128	OUT2INC+=pango/pango-attributes.h	178	OUT2INC+=pango/pango-attributes.h

Line 0 Link Here

(-)workdir/gdk-pixbuf/makefile.mk.orig (+42 lines)
		1	--- misc/gdk-pixbuf-2.23.0/configure 2011-04-08 23:09:51.936125000 +0900
Lines 82-87 Link Here
82		82
83	.ELIF "$(OS)"=="WNT"	83	.ELIF "$(OS)"=="WNT"
84		84
		85	.IF "$(COM)"=="GCC"
		86
		87	PATCH_FILES=gdk-pixbuf-2.23.0-mingw.patch
		88
		89	CONFIGURE_CPPFLAGS=-nostdinc -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg
		90
		91	CONFIGURE_CPPFLAGS+=$(INCLUDE)
		92
		93	CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
		94	CONFIGURE_CC=$(CC) -mthreads
		95
		96	CONFIGURE_LIBS=-lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl
		97
		98	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
		99	CONFIGURE_CC+=-shared-libgcc
		100	.ENDIF
		101	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
		102	CONFIGURE_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
		103	.ENDIF
		104
		105	CONFIGURE_DIR=
		106	CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
		107	BASE_DEPENDENCIES_CFLAGS="$(CONFIGURE_CPPFLAGS)" \
		108	BASE_DEPENDENCIES_LIBS=" " \
		109	.$/configure \
		110	--build=i686-pc-cygwin --host=i686-pc-mingw32 \
		111	CC="$(CONFIGURE_CC)" CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
		112	LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" \
		113	--disable-glibtest --without-libtiff LIBPNG="-lpng -lzlib"
		114
		115	BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
		116	BUILD_DIR=$(CONFIGURE_DIR)
		117
		118	OUT2LIB+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0.dll.a
		119
		120	OUT2BIN+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0-0.dll
		121
		122	.ELSE
		123
85	PATCH_FILES=gdk-pixbuf-2.23.0-win32.patch	124	PATCH_FILES=gdk-pixbuf-2.23.0-win32.patch
86	ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h	125	ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h
87	CONFIGURE_DIR=	126	CONFIGURE_DIR=
Lines 93-98 Link Here
93		132
94	OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll	133	OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll
95		134
		135	.ENDIF
		136
96	OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h	137	OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h
97	OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h	138	OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h
98	OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h	139	OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h