updates for netware and mingw32 ... allows for crosscompilation

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1246 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/netware/Makefile b/netware/Makefile
index c138dfa0b06d81b0df263291aac83e25b0837e40..e8d6a4730f6305865e6818bac49de5a436b30927 100644 (file)
--- a/netware/Makefile
+++ b/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/src/rrd_update.c b/src/rrd_update.c
index 7ed95d480f26395422692af47851bd91e0182c70..352e043d0aa76a5e3a104ad91b88dfd5b07f5281 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -29,15 +29,15 @@
  */
 #include <sys/timeb.h>
 
-#ifndef __MINGW32__
+#if (defined(__MINGW32__) && \
+       ((__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 12) || __MINGW32_MAJOR_VERSION > 3))
+#include <sys/time.h>
+#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/win32/Makefile b/win32/Makefile
index 8c392d55201ebbf044689c0a8043655b2feafd73..6e3dc2c7728d8f8110dd66614c4387e9d46df9de 100644 (file)
--- a/win32/Makefile
+++ b/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)