diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-22 22:34:57 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-22 22:46:05 -0400 |
| commit | 0bedbe78fe236cc9dabec87dea0f71714acfb76a (patch) | |
| tree | 1dd569bc4091388b320199730b2ab4e49aae76af /src/Makefile.win32 | |
| parent | ebb5eb57b7cab7e5fc4b3215969a459f49d95fbb (diff) | |
[Makefile.win32] Misc cleanup
Diffstat (limited to 'src/Makefile.win32')
| -rw-r--r-- | src/Makefile.win32 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.win32 b/src/Makefile.win32 index 6f4e89d8..26988869 100644 --- a/src/Makefile.win32 +++ b/src/Makefile.win32 @@ -7,14 +7,14 @@ SOURCES = $(enabled_cairo_sources) STATIC_SOURCES = cairo-system.c OBJECTS = $(patsubst %.c, $(CFG)/%.obj, $(SOURCES)) -STATIC_OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(STATIC_SOURCES)) +OBJECTS_STATIC = $(patsubst %cairo-system.obj, %cairo-system-static.obj, $(OBJECTS)) all: inform $(CFG)/cairo.dll $(CFG)/cairo-static.lib static: inform $(CFG)/cairo-static.lib dynamic: inform $(CFG)/cairo.dll $(CFG)/cairo.dll: $(OBJECTS) - $(CC) -MD -LD -Fe$@ $(PIXMAN_LIBS) $(OBJECTS) -link user32.lib gdi32.lib libpng.lib zdll.lib msimg32.lib + $(CC) -MD -LD -Fe$@ $(PIXMAN_LIBS) $(OBJECTS) -link $(CAIRO_LIBS) -$(CFG)/cairo-static.lib: $(OBJECTS) $(STATIC_OBJECTS) - lib -NOLOGO -OUT:$@ $(PIXMAN_LIBS) $(OBJECTS) $(STATIC_OBJECTS) +$(CFG)/cairo-static.lib: $(OBJECTS_STATIC) + lib -NOLOGO -OUT:$@ $(PIXMAN_LIBS) $(OBJECTS_STATIC) |