Commit d2eb4f8a authored by Lynn Garren's avatar Lynn Garren
Browse files

fix test and work with drand48

parent be92c4c0
......@@ -56,8 +56,6 @@ AC_SUBST(Vector_LIBS)
AC_SUBST(Vector_LDFLAGS)
AC_SUBST(COPY_P)
AC_SUBST(SRCLIB)
AC_SUBST(LIBEXTENSION)
# ----------------------------------------------------------------------
# Supply boilerplate for Vector/defs.h source header:
......@@ -189,24 +187,6 @@ powerpc-apple-darwin*)
esac;;
esac
# deal with libraries
case "$target" in
*-*-win32*)
case "$CXX" in
cl) SRCLIB="src/.libs";LIBEXTENSION=".lib";;
g++) SRCLIB="src";LIBEXTENSION=".la";;
c++) SRCLIB="src";LIBEXTENSION=".la"
esac;;
*-*-cygwin*)
case "$CXX" in
cl) SRCLIB="src/.libs";LIBEXTENSION=".lib";;
g++) SRCLIB="src";LIBEXTENSION=".la";;
c++) SRCLIB="src";LIBEXTENSION=".la"
esac;;
*-*-*)
SRCLIB="src";LIBEXTENSION=".la";;
esac
# ----------------------------------------------------------------------
# Set system-dependent options:
......
# Applicable to each test program:
INCLUDES = -I../
# libraries to link, and whence
LDADD = $(top_builddir)/@SRCLIB@/libCLHEP-@PACKAGE@-@VERSION@@LIBEXTENSION@
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.la
# Identify executables needed during testing:
check_PROGRAMS = \
......
# Set up to find the VC71 compiler (assuming a standard
# installation) and the other tools used by it ...
export VSPATH="/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003"
export PATH="/cygdrive/c/WINNT/Microsoft.NET/Framework/v1.1.4322":${PATH}
export PATH="${VSPATH}/SDK/v1.1/bin":${PATH}
export PATH="${VSPATH}/Common7/Tools/bin":${PATH}
export PATH="${VSPATH}/Common7/Tools/bin/prerelease":${PATH}
export PATH="${VSPATH}/Common7/Tools/":${PATH}
export PATH="${VSPATH}/Vc7/bin":${PATH}
export PATH="${VSPATH}/Common7/IDE":${PATH}
# For clhep compilation, set the following as autoconf
# for clhep compilation, set the following as autoconf
# places the g++ _before_ cl and the other platform
# specific ones:
......@@ -24,10 +9,16 @@ export CXXCPP='cl -E'
export CXX='cl '
export LD='cl '
export PATH= "/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003":"/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7/bin":"/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Common7/Tools":"/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Common7/Tools/Bin":"/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/SDK/v1.1/bin":"/cygdrive/c/WINNT/Microsoft.NET/Framework/v1.1.4322":$PATH
# include and lib are interpreted by the compiler, so use win syntax
export INCLUDE="c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/include;C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\include"
export LIB="c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/lib;C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Lib"
export INCLUDE="c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/atlmfc/include;c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/include;c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/include;C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\include"
export LIB="c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/atlmfc/lib;c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/lib;c:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/lib;C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Lib"
# to avoid useless complaints from the compiler
export CXXFLAGS='-EHsc'
export CXXFLAGS='-EHsc -DWIN32'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment