Changeset 946


Ignore:
Timestamp:
Feb 25, 2008 9:32:34 AM (12 years ago)
Author:
andreasw
Message:

added a few things for building of loadable libraries

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r937 r946  
    16781678AC_DEFUN([AC_COIN_DISABLE_STATIC],
    16791679[
    1680 # On Cygwin and AIX, building DLLs doesn't work
    1681 case $build in
    1682   *-cygwin*)
    1683     coin_disable_shared=yes
    1684     platform=Cygwin
    1685   ;;
    1686   *-aix*)
    1687     coin_disable_shared=yes
    1688     platform=AIX
    1689   ;;
    1690   *-mingw*)
    1691     coin_disable_shared=yes
    1692     platform="Msys"
    1693 #    case "$CXX" in
    1694 #      cl*)
    1695 #        coin_disable_shared=yes
    1696 #        platform="Msys with cl"
    1697 #    ;;
    1698 #    esac
    1699   ;;
    1700 esac
     1680# Test if force_shared has been set
     1681if test "x$1" = xforce_shared; then
     1682  if test x$enable_shared = xno; then
     1683    AC_MSG_ERROR([Shared libraries are disabled by user, but this is not feasible with the given options])
     1684  fi
     1685  enable_shared=yes;
     1686else
     1687  # On Cygwin and AIX, building DLLs doesn't work
     1688  case $build in
     1689    *-cygwin*)
     1690      coin_disable_shared=yes
     1691      platform=Cygwin
     1692    ;;
     1693    *-aix*)
     1694      coin_disable_shared=yes
     1695      platform=AIX
     1696    ;;
     1697    *-mingw*)
     1698      coin_disable_shared=yes
     1699      platform="Msys"
     1700#      case "$CXX" in
     1701#        cl*)
     1702#          coin_disable_shared=yes
     1703#          platform="Msys with cl"
     1704#      ;;
     1705#      esac
     1706    ;;
     1707  esac
     1708fi
    17011709if test x"$coin_disable_shared" = xyes; then
    17021710  if test x"$enable_shared" = xyes; then
     
    17151723
    17161724# START
    1717 AC_COIN_DISABLE_STATIC
     1725AC_COIN_DISABLE_STATIC([$1])
    17181726
    17191727# Initialize automake
  • trunk/compile_f2c/compile_f2c

    r332 r946  
    4747
    4848options=
     49makedll=
     50linkflags=
    4951incs=
    5052fsrc=
     
    7476        f2clib=
    7577        mainobj=
     78        ;;
     79      -shared)
     80        makedll=yes
     81        linkflags="$linkflags -dll"
     82        ;;
     83      -def:*)
     84        linkflags="$linkflags $arg"
    7685        ;;
    7786      -*)
     
    114123fi
    115124
    116 echo $F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
     125if test x$makedll = xyes; then
     126  echo $F2C_CC $options $cincs $csrc $objs $cout $f2clib -link $linkflags
    117127
    118 $F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
     128  $F2C_CC $options $cincs $csrc $objs $cout $f2clib -link $linkflags
     129else
     130  echo $F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
     131
     132  $F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
     133fi
    119134cl_status=$?
    120135
Note: See TracChangeset for help on using the changeset viewer.