diff --git a/programs/develop/libraries/cairo/Makefile b/programs/develop/libraries/cairo/Makefile index bbbb7489eb..6b9c8e5fe3 100644 --- a/programs/develop/libraries/cairo/Makefile +++ b/programs/develop/libraries/cairo/Makefile @@ -1,15 +1,22 @@ - LIBRARY = cairo CC = gcc CFLAGS = -c -O2 -fomit-frame-pointer +LDIMPORT:= -nostdlib --out-implib libcairoimp.a --exclude-libs libamz.a + +LDFLAGS:= -shared -s -T ../newlib/dll.lds -Map map --image-base 0 + DEFINES = -DHAVE_CONFIG_H -DCAIRO_NO_MUTEX -U_WIN32 -U_MSC_VER -U__WIN32__ INCLUDES = -I../newlib/include -I../pixman -I../zlib -I../libpng +LIBPATH:= -L../newlib -L../pixman -L../libpng + +LIBS:= -lamz -lgcc -lcimp -lpiximp -lpngimp + CAIRO_SOURCES = \ cairo-analysis-surface.c \ cairo-arc.c \ @@ -27,6 +34,7 @@ CAIRO_SOURCES = \ cairo-clip.c \ cairo-color.c \ cairo-composite-rectangles.c \ + cairo-debug.c \ cairo-device.c \ cairo-fixed.c \ cairo-font-face.c \ @@ -104,13 +112,16 @@ OBJECTS = $(patsubst %.c, src/%.o, $(SOURCES)) # targets -all:$(LIBRARY).a +all:$(LIBRARY).a $(LIBRARY).dll $(LIBRARY).a: $(OBJECTS) Makefile ar cvrs $(LIBRARY).a $(OBJECTS) +$(LIBRARY).dll: $(OBJECTS) Makefile + ld $(LDFLAGS) $(LDIMPORT) $(LIBPATH) -o $@ $(OBJECTS) $(LIBS) + %.o : %.c Makefile $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $< diff --git a/programs/develop/libraries/libpng/Makefile b/programs/develop/libraries/libpng/Makefile index ca2cf07f83..96d277058f 100644 --- a/programs/develop/libraries/libpng/Makefile +++ b/programs/develop/libraries/libpng/Makefile @@ -7,7 +7,11 @@ AR= ar rc CFLAGS = -c -O2 -fomit-frame-pointer -DEFS = -DHAVE_CONFIG_H +LDIMPORT:= -nostdlib --out-implib libpngimp.a --exclude-libs libamz.a + +LDFLAGS:= -shared -s -T../newlib/dll.lds -Map map --image-base 0 + +DEFS = -DHAVE_CONFIG_H -D__DYNAMIC_REENT__ LIBPNG_DEFINES = -DPNG_CONFIGURE_LIBPNG @@ -15,12 +19,14 @@ DEFINES= $(DEFS) $(LIBPNG_DEFINES) INCLUDES= -I../newlib/include -I../zlib +LIBPATH:= -L../newlib -L../zlib + +LIBS:= -lamz -lgcc -lzimp -lcimp SOURCES = png.c pngerror.c pngget.c pngmem.c pngpread.c \ pngread.c pngrio.c pngrtran.c pngrutil.c \ pngset.c pngtrans.c pngwio.c pngwrite.c \ - pngwtran.c pngwutil.c png.h pngconf.h \ - pngdebug.h pnginfo.h pngpriv.h pngstruct.h + pngwtran.c pngwutil.c @@ -30,12 +36,14 @@ OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) # targets -all:$(LIBRARY).a +all:$(LIBRARY).a $(LIBRARY).dll $(LIBRARY).a: $(OBJECTS) Makefile ar cvrs $(LIBRARY).a $(OBJECTS) +$(LIBRARY).dll: $(OBJECTS) Makefile + ld $(LDFLAGS) $(LDIMPORT) $(LIBPATH) -o $@ $(OBJECTS) $(LIBS) %.o : %.c Makefile $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $< diff --git a/programs/develop/libraries/pixman/Makefile b/programs/develop/libraries/pixman/Makefile index 5230a23b08..c940e775c6 100644 --- a/programs/develop/libraries/pixman/Makefile +++ b/programs/develop/libraries/pixman/Makefile @@ -5,10 +5,17 @@ CC = gcc CFLAGS = -c -O2 -mmmx -Winline -fomit-frame-pointer -DEFINES = -DHAVE_CONFIG_H -DPIXMAN_NO_TLS -DUSE_MMX +LDIMPORT:= -nostdlib --out-implib libpiximp.a --exclude-libs libamz.a +LDFLAGS:= -shared -s -T ../newlib/dll.lds -Map map --image-base 0 + +DEFINES = -DHAVE_CONFIG_H -DPIXMAN_NO_TLS -D__DYNAMIC_REENT__ -DUSE_MMX INCLUDES = -I../pixman -I../newlib/include +LIBPATH:= -L../newlib + +LIBS:= -lamz -lgcc -lcimp + SOURCES = \ pixman-image.c \ pixman-access.c \ @@ -40,12 +47,16 @@ OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) # targets -all:$(LIBRARY).a +all:$(LIBRARY).a $(LIBRARY).dll $(LIBRARY).a: $(OBJECTS) Makefile ar cvrs $(LIBRARY).a $(OBJECTS) +$(LIBRARY).dll: $(OBJECTS) Makefile + ld $(LDFLAGS) $(LDIMPORT) $(LIBPATH) -o $@ $(OBJECTS) $(LIBS) + + %.o: %.c $(SOURCES) Makefile $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $< diff --git a/programs/develop/libraries/zlib/Makefile b/programs/develop/libraries/zlib/Makefile index b0fe0a3e82..91b5ece5b4 100644 --- a/programs/develop/libraries/zlib/Makefile +++ b/programs/develop/libraries/zlib/Makefile @@ -2,17 +2,20 @@ # Copyright (C) 1995-2010 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h - CC=gcc CPP=gcc -E CFLAGS= -O3 -c -fomit-frame-pointer +LDIMPORT:= -nostdlib --out-implib libzimp.a + +LDFLAGS:= -shared -s -T ../newlib/dll.lds -Map map --image-base 0 + INCLUDES= -I../newlib/include +LIBPATH:= -L../newlib -STATICLIB=libz.a -LIBS=$(STATICLIB) $(SHAREDLIBV) +LIBS:= -lamz -lgcc -lcimp AR=ar rc @@ -27,11 +30,15 @@ OBJA = OBJS = $(OBJC) $(OBJA) -all: libz.a +all: libz.a libz.dll libz.a: $(OBJS) $(AR) $@ $(OBJS) +libz.dll: $(OBJECTS) Makefile + ld $(LDFLAGS) $(LDIMPORT) $(LIBPATH) -o $@ $(OBJS) $(LIBS) + + %.o: %.c Makefile $(CC) $(CFLAGS) $(INCLUDES) -o $@ $<