diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-03-13 23:02:44 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-03-13 23:02:44 +0000 |
| commit | 8cec8aa8bcb3eff5bf7ab5f2d29e577c051d5d33 (patch) | |
| tree | 9a425c418ac2feacab933ebd6d9f8fabb1e37dca | |
| parent | 80eb47b2674815540b5de799e5ad9f82d170d8b8 (diff) | |
updated to be more tolerant of Windows/MinGW build vagaries
svn path=/trunk/externals/OSCx/; revision=4702
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 9 insertions, 10 deletions
@@ -4434,16 +4434,16 @@ else *-*-cygwin*) CFLAGS="$CFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " LDFLAGS="-Wl,-export_dynamic -shared" - INCLUDES="$INCLUDES -I../../../pd/bin" + INCLUDES="$INCLUDES -I../../../pd/src" pd_suffix=dll LIBS="-lc -lm" ;; *-*-mingw*) CFLAGS="$CFLAGS -mms-bitfields -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " LDFLAGS="-shared" - INCLUDES="$INCLUDES -I../../../pd/bin" + INCLUDES="$INCLUDES -I../../../pd/src" pd_suffix=dll - LIBS="-L../../../pd/bin -lpd -lm -lwsock32" + LIBS="-L../../../pd/bin -L../../../pd/obj -lpd -lm -lwsock32" ;; *-*-darwin*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " @@ -4727,10 +4727,9 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' done LIBOBJS=$ac_libobjs diff --git a/configure.ac b/configure.ac index 04009b3..ce5fed0 100644 --- a/configure.ac +++ b/configure.ac @@ -103,16 +103,16 @@ else *-*-cygwin*) CFLAGS="$CFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " LDFLAGS="-Wl,-export_dynamic -shared" - INCLUDES="$INCLUDES -I../../../pd/bin" + INCLUDES="$INCLUDES -I../../../pd/src" pd_suffix=dll LIBS="-lc -lm" ;; *-*-mingw*) CFLAGS="$CFLAGS -mms-bitfields -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " LDFLAGS="-shared" - INCLUDES="$INCLUDES -I../../../pd/bin" + INCLUDES="$INCLUDES -I../../../pd/src" pd_suffix=dll - LIBS="-L../../../pd/bin -lpd -lm -lwsock32" + LIBS="-L../../../pd/bin -L../../../pd/obj -lpd -lm -lwsock32" ;; *-*-darwin*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " |