Kaydet (Commit) 636564d9 authored tarafından Matúš Kukan's avatar Matúš Kukan

fix ILIB: don't ask cygpath for directory which does not exist yet

By removing WinPath. The paths already have good format.
üst fa9b5b18
...@@ -41,14 +41,6 @@ PathFormat() ...@@ -41,14 +41,6 @@ PathFormat()
fi fi
} }
WinPath()
{
formatted_path="$1"
if test "$build_os" = "cygwin" ; then
formatted_path=`cygpath -d "$formatted_path"`
fi
}
echo "********************************************************************" echo "********************************************************************"
echo "*" echo "*"
echo "* Running ${PACKAGE_NAME} build configuration." echo "* Running ${PACKAGE_NAME} build configuration."
...@@ -10661,30 +10653,21 @@ AC_SUBST(BUILD_NCPUS) ...@@ -10661,30 +10653,21 @@ AC_SUBST(BUILD_NCPUS)
# Set up ILIB for windows build # Set up ILIB for windows build
# #
if test "$build_os" = "cygwin"; then if test "$build_os" = "cygwin"; then
ILIB="." ILIB=".;$SRC_ROOT/solver/$INPATH/lib"
WinPath "$SRC_ROOT/solver/$INPATH/lib"
ILIB="$ILIB;$formatted_path"
if test -n "$JAVA_HOME" -a "$JAVA_HOME" != "NO_JAVA_HOME" ; then if test -n "$JAVA_HOME" -a "$JAVA_HOME" != "NO_JAVA_HOME" ; then
WinPath "$JAVA_HOME/lib" ILIB="$ILIB;$JAVA_HOME/lib"
ILIB="$ILIB;$formatted_path"
fi fi
if test "$CL_X64" = "TRUE" ; then if test "$CL_X64" = "TRUE" ; then
WinPath "$COMPATH/lib/amd64" ILIB="$ILIB;$COMPATH/lib/amd64"
ILIB="$ILIB;$formatted_path" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib64"
WinPath "$WINDOWS_SDK_HOME/lib64"
ILIB="$ILIB;$formatted_path"
else else
WinPath "$COMPATH/lib" ILIB="$ILIB;$COMPATH/lib"
ILIB="$ILIB;$formatted_path" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib"
WinPath "$WINDOWS_SDK_HOME/lib"
ILIB="$ILIB;$formatted_path"
fi fi
WinPath "$DOTNET_FRAMEWORK_HOME/lib" ILIB="$ILIB;$DOTNET_FRAMEWORK_HOME/lib"
ILIB="$ILIB;$formatted_path"
if test "$ENABLE_DIRECTX" = "TRUE" ; then if test "$ENABLE_DIRECTX" = "TRUE" ; then
WinPath "$DIRECTXSDK_LIB" ILIB="$ILIB;$DIRECTXSDK_LIB"
ILIB="$ILIB;$formatted_path"
fi fi
AC_SUBST(ILIB) AC_SUBST(ILIB)
fi fi
......
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