externals/OSCx configure,1.6,1.7 configure.ac,1.6,1.7 - Pd-cvs

14 Mar 2006


      Update of /cvsroot/pure-data/externals/OSCx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18732
Modified Files:
    configure configure.ac 
Log Message:
updated to be more tolerant of Windows/MinGW build vagaries
Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.ac	16 Jan 2006 05:56:14 -0000	1.6
--- configure.ac	13 Mar 2006 23:02:44 -0000	1.7
***************
*** 104,108 ****
                  CFLAGS="$CFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-Wl,-export_dynamic -shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/bin"
    				 pd_suffix=dll
    				 LIBS="-lc -lm"
--- 104,108 ----
                  CFLAGS="$CFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-Wl,-export_dynamic -shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/src"
    				 pd_suffix=dll
    				 LIBS="-lc -lm"
***************
*** 111,117 ****
                  CFLAGS="$CFLAGS -mms-bitfields -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/bin"
    				 pd_suffix=dll
! 					 LIBS="-L../../../pd/bin -lpd -lm -lwsock32"
    				 ;;
          *-*-darwin*)
--- 111,117 ----
                  CFLAGS="$CFLAGS -mms-bitfields -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/src"
    				 pd_suffix=dll
! 					 LIBS="-L../../../pd/bin -L../../../pd/obj -lpd -lm -lwsock32"
    				 ;;
          *-*-darwin*)
Index: configure
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure	16 Jan 2006 05:56:13 -0000	1.6
--- configure	13 Mar 2006 23:02:44 -0000	1.7
***************
*** 4435,4439 ****
                  CFLAGS="$CFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-Wl,-export_dynamic -shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/bin"
    				 pd_suffix=dll
    				 LIBS="-lc -lm"
--- 4435,4439 ----
                  CFLAGS="$CFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-Wl,-export_dynamic -shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/src"
    				 pd_suffix=dll
    				 LIBS="-lc -lm"
***************
*** 4442,4448 ****
                  CFLAGS="$CFLAGS -mms-bitfields -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/bin"
    				 pd_suffix=dll
! 					 LIBS="-L../../../pd/bin -lpd -lm -lwsock32"
    				 ;;
          *-*-darwin*)
--- 4442,4448 ----
                  CFLAGS="$CFLAGS -mms-bitfields -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
    				 LDFLAGS="-shared"
! 					 INCLUDES="$INCLUDES -I../../../pd/src"
    				 pd_suffix=dll
! 					 LIBS="-L../../../pd/bin -L../../../pd/obj -lpd -lm -lwsock32"
    				 ;;
          *-*-darwin*)
***************
*** 4728,4735 ****
    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'
  done
  LIBOBJS=$ac_libobjs
--- 4728,4734 ----
    ac_i=`echo "$ac_i" |
     sed 's/$U././;s/.o$//;s/.obj$//'`
!   # 2. Add them.
!   ac_libobjs="$ac_libobjs $ac_i$U.$ac_objext"
!   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs