diff --git a/win32/Makefile b/win32/Makefile
index 8c392d55201ebbf044689c0a8043655b2feafd73..6e3dc2c7728d8f8110dd66614c4387e9d46df9de 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
# All library code is statically linked to avoid problems with other lib DLLs.
# Edit the path below to point to your libpng sources or set environment var.
ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.16
+LIBPNG = $(LIBBASE)/libpng-1.2.23
endif
# Edit the path below to point to your freetype sources or set environment var.
ifndef LIBFT2
-#LIBFT2 = $(LIBBASE)/freetype-2.3.4
-LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.4
+#LIBFT2 = $(LIBBASE)/freetype-2.3.5
+LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.5
endif
# Edit the path below to point to your libart sources or set environment var.
ifndef LIBART
ifndef DISTDIR
DISTDIR = rrdtool-$(RRD_VERSION_STR)-w32
endif
-DISTARC = $(DISTDIR).zip
+ifndef DISTARC
+DISTARC = $(DISTDIR).$(ARCEXT)
+endif
# Edit the path below to point to your distribution folder.
ifndef DEVLDIR
DEVLDIR = rrdtool-$(RRD_VERSION_STR)-sdk-w32
endif
-DEVLARC = $(DEVLDIR).zip
+ifndef DEVLARC
+DEVLARC = $(DEVLDIR).$(ARCEXT)
+endif
# whatever...
NO_NULL_REALLOC = 1
ifdef METROWERKS
CC = mwcc
else
- CC = gcc
+ CC = $(CRPREFIX)gcc
endif
# RM = rm -f
CP = cp -afv
# Here you can find a native Win32 binary of the original awk:
# http://www.gknw.net/development/prgtools/awk.zip
AWK = awk
-ZIP = zip -qzr9
+ifndef ARCBIN
+ARCBIN = zip -qzr9
+ARCEXT = zip
+#ARCBIN = 7za a
+#ARCEXT = 7z
+endif
# must be equal to DEBUG or NDEBUG
DB = NDEBUG
@@ -114,8 +123,8 @@ CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 58
CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"
CFLAGS += -w on,nounused,nounusedexpr # -ansi strict
else
-LD = gcc
-RC = windres
+LD = $(CRPREFIX)gcc
+RC = $(CRPREFIX)windres
LDFLAGS = -s
AR = ar
ARFLAGS = -cq
CFLAGS += -Wall -Wno-unused # -pedantic
endif
-ifeq ($(findstring msys,$(OSTYPE)),msys)
+ifdef __MSYS__
DL = '
DS = /
else
@-$(CP) $(PROOT)/NEWS $(DISTDIR)
@-$(CP) $(PROOT)/README $(DISTDIR)
@echo Creating $(DISTARC)
- @$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
+ @$(ARCBIN) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
@-mkdir $(DEVLDIR)$(DS)include
@-$(CP) $(PROOT)/NEWS $(DEVLDIR)
@-$(CP) $(PROOT)/README $(DEVLDIR)
@echo Creating $(DEVLARC)
- @$(ZIP) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
+ @$(ARCBIN) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
clean:
-$(RM) -r $(OBJDIR)