[Libreoffice-commits] .: 2 commits - configure.in Library_merged.mk

[Matus Kukan]

 Library_merged.mk |    1 +
 configure.in      |   33 ++++++++-------------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

New commits:
commit 484a5dcc0e0b749f58d631b957fb6f380160b7a3
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Feb 11 16:57:09 2012 +0100

    add missing library for windows

diff --git a/Library_merged.mk b/Library_merged.mk
index b2e49b0..742a6fb 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 	shell32 \
 	user32 \
 	uuid \
+	winmm \
 ))
 endif
 
commit 636564d9b069cb4bcad8d878b5fc11b68fcc13c1
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Feb 11 16:50:59 2012 +0100

    fix ILIB: don't ask cygpath for directory which does not exist yet
    
    By removing WinPath. The paths already have good format.

diff --git a/configure.in b/configure.in
index 5417c22..cdd09e3 100644
--- a/configure.in
+++ b/configure.in
@@ -41,14 +41,6 @@ PathFormat()
     fi
 }
 
-WinPath()
-{
-    formatted_path="$1"
-    if test "$build_os" = "cygwin" ; then
-        formatted_path=`cygpath -d "$formatted_path"`
-    fi
-}
-
 echo "********************************************************************"
 echo "*"
 echo "*   Running ${PACKAGE_NAME} build configuration."
@@ -10661,30 +10653,21 @@ AC_SUBST(BUILD_NCPUS)
 # Set up ILIB for windows build
 #
 if test "$build_os" = "cygwin"; then
-    ILIB="."
-    WinPath "$SRC_ROOT/solver/$INPATH/lib"
-    ILIB="$ILIB;$formatted_path"
+    ILIB=".;$SRC_ROOT/solver/$INPATH/lib"
     if test -n "$JAVA_HOME" -a "$JAVA_HOME" != "NO_JAVA_HOME" ; then
-        WinPath "$JAVA_HOME/lib"
-        ILIB="$ILIB;$formatted_path"
+        ILIB="$ILIB;$JAVA_HOME/lib"
     fi
     if test "$CL_X64" = "TRUE" ; then
-        WinPath "$COMPATH/lib/amd64"
-        ILIB="$ILIB;$formatted_path"
-        WinPath "$WINDOWS_SDK_HOME/lib64"
-        ILIB="$ILIB;$formatted_path"
+        ILIB="$ILIB;$COMPATH/lib/amd64"
+        ILIB="$ILIB;$WINDOWS_SDK_HOME/lib64"
     else
-        WinPath "$COMPATH/lib"
-        ILIB="$ILIB;$formatted_path"
-        WinPath "$WINDOWS_SDK_HOME/lib"
-        ILIB="$ILIB;$formatted_path"
+        ILIB="$ILIB;$COMPATH/lib"
+        ILIB="$ILIB;$WINDOWS_SDK_HOME/lib"
     fi
-    WinPath "$DOTNET_FRAMEWORK_HOME/lib"
-    ILIB="$ILIB;$formatted_path"
+    ILIB="$ILIB;$DOTNET_FRAMEWORK_HOME/lib"
 
     if test "$ENABLE_DIRECTX" = "TRUE" ; then
-        WinPath "$DIRECTXSDK_LIB"
-        ILIB="$ILIB;$formatted_path"
+        ILIB="$ILIB;$DIRECTXSDK_LIB"
     fi
     AC_SUBST(ILIB)
 fi