diff options
| author | Vladimir Vukicevic <vladimir@pobox.com> | 2008-08-05 12:57:51 -0700 |
|---|---|---|
| committer | Vladimir Vukicevic <vladimir@sleet.vlad1.com> | 2008-08-05 12:57:51 -0700 |
| commit | 924a242f89ab1d86750512c8e4ee367c270ee07a (patch) | |
| tree | 720fd7ffbdbd2d01cd9e91369fd2033a04a0bd7a /src/Makefile.win32 | |
| parent | e1132d434e329c625667f6aff30634522108241e (diff) | |
[win32] Update win32 build, remove gcc dependency
Diffstat (limited to 'src/Makefile.win32')
| -rw-r--r-- | src/Makefile.win32 | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/Makefile.win32 b/src/Makefile.win32 index 3a5b916d..5c14add7 100644 --- a/src/Makefile.win32 +++ b/src/Makefile.win32 @@ -3,7 +3,6 @@ SUBMAKEFILE = 1 include ../Makefile.win32 -DEFFILE = cairo.def srcdir = `pwd` SOURCES = \ @@ -55,12 +54,13 @@ SOURCES = \ cairo-truetype-subset.c \ cairo-type1-fallback.c \ cairo-unicode.c \ + cairo-user-font.c \ + cairo-type3-glyph-surface.c \ cairo-wideint.c \ cairo-win32-font.c \ cairo.c \ cairo-svg-surface.c \ cairo-ps-surface.c \ - cairo-pdf-surface.c \ cairo-scaled-font-subsets.c \ cairo-paginated-surface.c \ cairo-analysis-surface.c \ @@ -91,20 +91,8 @@ all: inform $(CFG)/cairo.dll $(CFG)/cairo-static.lib static: inform $(CFG)/cairo-static.lib dynamic: inform $(CFG)/cairo.dll -$(DEFFILE): - (echo EXPORTS; \ - (cd $(srcdir); cat $(cairo_headers) || echo 'cairo_ERROR ()' ) | \ - grep -v -E '^# *include' | \ - ( gcc -include cairo-features.h -E - || echo 'cairo_ERROR ()' ) | \ - grep -E '^_?cairo_.* \(' | \ - sed -e 's/[ ].*//' | \ - sort; \ - echo LIBRARY cairo.dll; \ - ) >$@ - @ ! grep -q cairo_ERROR $@ || ($(RM) $@; false) - -$(CFG)/cairo.dll: $(OBJECTS) $(SHARED_OBJECTS) $(DEFFILE) - $(CC) -MD -LD -Fe$@ $(PIXMAN_LIBS) $(OBJECTS) $(SHARED_OBJECTS) -link -DEF:$(DEFFILE) user32.lib gdi32.lib libpng.lib zdll.lib msimg32.lib +$(CFG)/cairo.dll: $(OBJECTS) $(SHARED_OBJECTS) + $(CC) -MD -LD -Fe$@ $(PIXMAN_LIBS) $(OBJECTS) $(SHARED_OBJECTS) -link user32.lib gdi32.lib libpng.lib zdll.lib msimg32.lib $(CFG)/cairo-static.lib: $(OBJECTS) $(STATIC_OBJECTS) lib -NOLOGO -OUT:$@ $(PIXMAN_LIBS) $(OBJECTS) $(STATIC_OBJECTS) |