diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-20 18:24:37 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-20 18:26:27 -0400 |
| commit | 9084f6baf6ab2ce9942b69720dac8201fd5e86cc (patch) | |
| tree | e80310eaaa528116a1335612d11fd97f9fb5e596 /src/Makefile.win32 | |
| parent | 45609d840078288bf0fc096ee8bac642fed6674f (diff) | |
[Makefile.win32] Fix various issues reported by Damian Frank
We now compile cairo-system.c twice when building static library, but
that's fine because cairo-systemc. includes no other code. Indeed
that's why cairo-system.c was born in the first place.
Diffstat (limited to 'src/Makefile.win32')
| -rw-r--r-- | src/Makefile.win32 | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/Makefile.win32 b/src/Makefile.win32 index 09d56a2b..b57478db 100644 --- a/src/Makefile.win32 +++ b/src/Makefile.win32 @@ -3,24 +3,19 @@ SUBMAKEFILE = 1 include ../Makefile.win32 include Makefile.win32.config -SOURCES = \ - $(enabled_cairo_headers) \ - $(enabled_cairo_private) \ - $(enabled_cairo_sources) \ - $(NULL) +SOURCES = $(enabled_cairo_sources) -STATIC_SOURCES = cairo-win32-surface.c +STATIC_SOURCES = cairo-system.c OBJECTS = $(patsubst %.c, $(CFG)/%.obj, $(SOURCES)) -SHARED_OBJECTS = $(patsubst %.c, $(CFG)/%.obj, $(STATIC_SOURCES)) STATIC_OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(STATIC_SOURCES)) all: inform $(CFG)/cairo.dll $(CFG)/cairo-static.lib static: inform $(CFG)/cairo-static.lib dynamic: inform $(CFG)/cairo.dll -$(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.dll: $(OBJECTS) + $(CC) -MD -LD -Fe$@ $(PIXMAN_LIBS) $(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) |