From: Mazet Laurent Date: Thu, 27 Nov 2025 17:14:15 +0000 (+0100) Subject: fix for windows X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=1683c4ac14318ceb2c0abf2797dd3cfece844c4f;p=libviterbi.git fix for windows --- diff --git a/Makerule.in b/Makerule.in index 9a70e4a..09f258e 100644 --- a/Makerule.in +++ b/Makerule.in @@ -112,7 +112,7 @@ endif prog_%$(EXECEXT): %.o @echo "Creating program $@" @rm -f $@ - @$(LINK) $< -lviterbi -o $(BIN_BUILD_DIR)/$@ + @$(LINK) $< $(LIBS) -o $(BIN_BUILD_DIR)/$@ ifneq (${DEBUG},true) @echo "Stripping program $@" @$(STRIP) $(BIN_BUILD_DIR)/$@ diff --git a/configure b/configure index ff47995..a1f7113 100755 --- a/configure +++ b/configure @@ -5039,7 +5039,7 @@ fi case "$host" in - *-*-cygwin*) + *-*-cygwin*|*-*-mingw*) SHARED_LIBS=false ;; esac @@ -5073,7 +5073,7 @@ case "$host" in SH_LD=ld SH_LDFLAGS=-Bshareable ;; - *-*-cygwin*) + *-*-cygwin*|*-*-mingw*) EXECEXT=".exe" ;; *-*-linux*) diff --git a/configure.ac b/configure.ac index 897ba51..486d512 100644 --- a/configure.ac +++ b/configure.ac @@ -174,10 +174,10 @@ AC_ARG_ENABLE(shared, SHARED_LIBS=true) AC_SUBST(SHARED_LIBS) -dnl Some check for cygwin +dnl Some check for cygwin/minwgw case "$host" in - *-*-cygwin*) + *-*-cygwin*|*-*-mingw*) SHARED_LIBS=false ;; esac @@ -208,7 +208,7 @@ case "$host" in SH_LD=ld SH_LDFLAGS=-Bshareable ;; - *-*-cygwin*) + *-*-cygwin*|*-*-mingw*) EXECEXT=".exe" ;; *-*-linux*) diff --git a/src/trellis.c b/src/trellis.c index e736710..69e2ef6 100644 --- a/src/trellis.c +++ b/src/trellis.c @@ -31,7 +31,6 @@ Open Source Initiative (www.opensource.org) #if !defined (__TRELLIS_C__) #define __TRELLIS_C__ 1 -#include #include #include diff --git a/src/trellis.h b/src/trellis.h index 69d6c09..f102bfa 100644 --- a/src/trellis.h +++ b/src/trellis.h @@ -39,9 +39,10 @@ extern const char *Viterbi_Version; const char *Viterbi_Version = VITERBIVERSION; #endif +#include /* metric type definition */ typedef double metric_t; -#define MAXMETRIC MAXDOUBLE +#define MAXMETRIC DBL_MAX /* Trellis definition: * ===================