From aaad2ff18f079d6a2b762010e39219ada1eb0e76 Mon Sep 17 00:00:00 2001 From: oetiker Date: Fri, 23 Nov 2007 18:18:10 +0000 Subject: [PATCH] updates for netware and mingw32 ... allows for crosscompilation git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@1246 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/netware/Makefile | 26 ++++++++++++++++++-------- program/src/rrd_update.c | 10 +++++----- program/win32/Makefile | 33 +++++++++++++++++++++------------ 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/program/netware/Makefile b/program/netware/Makefile index c138dfa0..e8d6a473 100644 --- a/program/netware/Makefile +++ b/program/netware/Makefile @@ -42,11 +42,11 @@ endif # All library code is statically linked to avoid problems with other lib NLMs. # 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)/freetype-2.3.5 endif # Edit the path below to point to your libart sources or set environment var. ifndef LIBART @@ -61,13 +61,17 @@ endif ifndef DISTDIR DISTDIR = rrdtool-$(RRD_VERSION_STR)-nw 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-nw endif -DEVLARC = $(DEVLDIR).zip +ifndef DEVLARC +DEVLARC = $(DEVLDIR).$(ARCEXT) +endif # whatever... # NO_NULL_REALLOC = 1 @@ -98,8 +102,14 @@ FIXNLMN = fixnlmname #-q # 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 MV = mv -fv +ifndef ARCBIN +ARCBIN = zip -qzr9 +ARCEXT = zip +#ARCBIN = 7za a +#ARCEXT = 7z +endif + # must be equal to DEBUG or NDEBUG DB = NDEBUG @@ -281,7 +291,7 @@ OBJS := $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS) OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o OBJTOOL := $(OBJS) $(OBJDIR)/rrd_tool.o -LDLIBS += $(LIBFT2)/builds/netware/libc/libft2.$(LIBEXT) +LDLIBS += $(LIBFT2)/builds/netware/LIBC/libft2.$(LIBEXT) all: rrdtool rrdcgi @@ -302,7 +312,7 @@ dist: all $(DISTDIR) $(DISTDIR)/readme.txt @-$(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 @@ -318,7 +328,7 @@ dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt @-$(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) diff --git a/program/src/rrd_update.c b/program/src/rrd_update.c index 7ed95d48..352e043d 100644 --- a/program/src/rrd_update.c +++ b/program/src/rrd_update.c @@ -29,15 +29,15 @@ */ #include -#ifndef __MINGW32__ +#if (defined(__MINGW32__) && \ + ((__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 12) || __MINGW32_MAJOR_VERSION > 3)) +#include +#else + struct timeval { time_t tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; -#endif - -#if !(defined(__MINGW32__) && \ - ((__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 12) || __MINGW32_MAJOR_VERSION > 3)) struct __timezone { int tz_minuteswest; /* minutes W of Greenwich */ diff --git a/program/win32/Makefile b/program/win32/Makefile index 8c392d55..6e3dc2c7 100644 --- a/program/win32/Makefile +++ b/program/win32/Makefile @@ -33,12 +33,12 @@ endif # 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 @@ -53,13 +53,17 @@ endif 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 @@ -68,14 +72,19 @@ 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 @@ -125,7 +134,7 @@ CFLAGS += -fno-strict-aliasing CFLAGS += -Wall -Wno-unused # -pedantic endif -ifeq ($(findstring msys,$(OSTYPE)),msys) +ifdef __MSYS__ DL = ' DS = / else @@ -253,7 +262,7 @@ dist: all $(DISTDIR) $(DISTDIR)/readme.txt @-$(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 @@ -269,7 +278,7 @@ dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt @-$(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) -- 2.30.2