diff --git a/Makefile.windows b/Makefile.windows index 0770cbe..075e428 100644 --- a/Makefile.windows +++ b/Makefile.windows @@ -1,7 +1,7 @@ MAKE=mingw32-make all: config.make - $(MAKE) -C src\zlib all + $(MAKE) -C src\zlib -f Makefile.windows all $(MAKE) -C src\sdl-instead all $(MAKE) -C themes -f Makefile.windows all @@ -10,6 +10,7 @@ config.make: clean: $(MAKE) -C src\sdl-instead clean + $(MAKE) -C src\zlib -f Makefile.windows clean install: all if not exist bin mkdir bin @@ -20,5 +21,3 @@ install: all $(MAKE) -C icon -f Makefile.windows install $(MAKE) -C languages -f Makefile.windows install $(MAKE) -C doc -f Makefile.windows install - - diff --git a/Rules.windows b/Rules.windows index a10621a..1bb7b70 100644 --- a/Rules.windows +++ b/Rules.windows @@ -26,6 +26,8 @@ LDFLAGS += -liconv CC=gcc RM=del EXE=.exe +AR=ar -rc +RANLIB=ranlib INSTALLD=echo mkdir INSTALL=copy diff --git a/src/zlib/Makefile b/src/zlib/Makefile index 1c4a543..c5b3684 100644 --- a/src/zlib/Makefile +++ b/src/zlib/Makefile @@ -12,3 +12,6 @@ libz.a: $(OBJS) $(OBJA) clean: rm -f *.o *.a + +install: + diff --git a/src/zlib/Makefile.windows b/src/zlib/Makefile.windows index 7c0d5bb..1cd3a26 100644 --- a/src/zlib/Makefile.windows +++ b/src/zlib/Makefile.windows @@ -4,5 +4,14 @@ include ../../config.make OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o -all: +all: libz.a + +libz.a: $(OBJS) $(OBJA) + $(AR) $@ $(OBJS) $(OBJA) + $(RANLIB) $@ >null 2>&1 + +clean: + rm *.o *.a + +install: