projects / packages / crossmingw32-gdk-pixbuf2.git / blame
| Commit | Line | Data |
|---|---|---|
| 33d5c746 JB |
1 | --- gdk-pixbuf-2.26.1/gdk-pixbuf/Makefile.am.orig 2012-04-14 20:11:34.000000000 +0200 |
| 2 | +++ gdk-pixbuf-2.26.1/gdk-pixbuf/Makefile.am 2012-04-15 18:03:52.776039347 +0200 | |
| 3 | @@ -208,7 +208,7 @@ | |
| 4 | # create a partial one that's enough for our use. | |
| 5 | ||
| 6 | libgdiplus = libgdiplus.dll.a | |
| 7 | -gdiplus_ldflag = -Wl,$(libgdiplus) | |
| 8 | +gdiplus_ldflag = -L. -lgdiplus # -Wl,$(libgdiplus) | |
| 9 | ||
| 10 | libgdiplus.dll.a: gdiplus.def | |
| 11 | $(DLLTOOL) --kill-at --dllname gdiplus.dll --input-def $(srcdir)/gdiplus.def --output-lib $@ | |
| 12 | @@ -265,7 +265,7 @@ | |
| 13 | libpixbufloader-gdip-jpeg.la \ | |
| 14 | libpixbufloader-gdip-tiff.la | |
| 15 | ||
| 16 | -libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag) | |
| 17 | +libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined | |
| 18 | libpixbufloader_gdip_ico_la_SOURCES = \ | |
| 19 | io-gdip-native.h \ | |
| 20 | io-gdip-propertytags.h \ | |
| 21 | @@ -274,9 +274,9 @@ | |
| 22 | io-gdip-animation.c \ | |
| 23 | io-gdip-animation.h \ | |
| 24 | io-gdip-ico.c | |
| 25 | -libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) | |
| 26 | +libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag) | |
| 27 | ||
| 28 | -libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag) | |
| 29 | +libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined | |
| 30 | libpixbufloader_gdip_wmf_la_SOURCES = \ | |
| 31 | io-gdip-native.h \ | |
| 32 | io-gdip-propertytags.h \ | |
| 33 | @@ -285,9 +285,9 @@ | |
| 34 | io-gdip-animation.c \ | |
| 35 | io-gdip-animation.h \ | |
| 36 | io-gdip-wmf.c | |
| 37 | -libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) | |
| 38 | +libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag) | |
| 39 | ||
| 40 | -libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag) | |
| 41 | +libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined | |
| 42 | libpixbufloader_gdip_emf_la_SOURCES = \ | |
| 43 | io-gdip-native.h \ | |
| 44 | io-gdip-propertytags.h \ | |
| 45 | @@ -296,9 +296,9 @@ | |
| 46 | io-gdip-animation.c \ | |
| 47 | io-gdip-animation.h \ | |
| 48 | io-gdip-emf.c | |
| 49 | -libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) | |
| 50 | +libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag) | |
| 51 | ||
| 52 | -libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag) | |
| 53 | +libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined | |
| 54 | libpixbufloader_gdip_bmp_la_SOURCES = \ | |
| 55 | io-gdip-native.h \ | |
| 56 | io-gdip-propertytags.h \ | |
| 57 | @@ -307,9 +307,9 @@ | |
| 58 | io-gdip-animation.c \ | |
| 59 | io-gdip-animation.h \ | |
| 60 | io-gdip-bmp.c | |
| 61 | -libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) | |
| 62 | +libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag) | |
| 63 | ||
| 64 | -libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag) | |
| 65 | +libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined | |
| 66 | libpixbufloader_gdip_gif_la_SOURCES = \ | |
| 67 | io-gdip-native.h \ | |
| 68 | io-gdip-propertytags.h \ | |
| 69 | @@ -318,9 +318,9 @@ | |
| 70 | io-gdip-animation.c \ | |
| 71 | io-gdip-animation.h \ | |
| 72 | io-gdip-gif.c | |
| 73 | -libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) | |
| 74 | +libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag) | |
| 75 | ||
| 76 | -libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag) | |
| 77 | +libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined | |
| 78 | libpixbufloader_gdip_jpeg_la_SOURCES = \ | |
| 79 | io-gdip-native.h \ | |
| 80 | io-gdip-propertytags.h \ | |
| 81 | @@ -329,9 +329,9 @@ | |
| 82 | io-gdip-animation.c \ | |
| 83 | io-gdip-animation.h \ | |
| 84 | io-gdip-jpeg.c | |
| 85 | -libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) | |
| 86 | +libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag) | |
| 87 | ||
| 88 | -libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag) | |
| 89 | +libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined | |
| 90 | libpixbufloader_gdip_tiff_la_SOURCES = \ | |
| 91 | io-gdip-native.h \ | |
| 92 | io-gdip-propertytags.h \ | |
| 93 | @@ -340,7 +340,7 @@ | |
| 94 | io-gdip-animation.c \ | |
| 95 | io-gdip-animation.h \ | |
| 96 | io-gdip-tiff.c | |
| 97 | -libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) | |
| 98 | +libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag) | |
| 99 | ||
| 100 | endif | |
| 101 |