[Libreoffice-commits] .: configure.in oowintool RepositoryFixes.mk set_soenv.in solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Mon May 16 06:09:03 PDT 2011
RepositoryFixes.mk | 2 -
configure.in | 93 ++++++++++++++++++++++-------------------------
oowintool | 14 +++----
set_soenv.in | 35 ++++++++---------
solenv/inc/set_wntx64.mk | 3 -
solenv/inc/wntgcci.mk | 17 ++++----
solenv/inc/wntmsc.mk | 1
7 files changed, 78 insertions(+), 87 deletions(-)
New commits:
commit 66d26a9a1346247c6d462e8b483f3f19853c2a66
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon May 16 15:52:26 2011 +0300
Use current terminology and socket library
It's called the Windows SDK, not the Platform SDK. Link only with the
ws2_32 library, not the wsock32 one.
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 76aca51..f563138 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -79,7 +79,7 @@ gb_Library_ILIBFILENAMES:=\
uuid \
gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
diff --git a/configure.in b/configure.in
index a1e3551..71e6b14 100755
--- a/configure.in
+++ b/configure.in
@@ -1097,7 +1097,7 @@ AC_ARG_WITH(midl-path,
AC_ARG_WITH(csc-path,
AS_HELP_STRING([--with-csc-path],
[For Windows builds, please supply the path pointing to the csc.exe.
- Usually found automatically.])
+ Usually found automatically when building on Windows.])
[
Usage: --with-csc-path=<abs. path to csc.exe>
],
@@ -1128,12 +1128,12 @@ AC_ARG_WITH(dotnet-framework-home,
],
,)
-AC_ARG_WITH(psdk-home,
- AS_HELP_STRING([--with-psdk-home],
- [For Windows users, please supply the path to the Windnows SDK.
- Usually found automatically.])
+AC_ARG_WITH(windows-sdk-home,
+ AS_HELP_STRING([--with-windows-sdk-home],
+ [For Windows builds, please supply the path to the Windows SDK.
+ Usually found automatically when building on Windows.])
[
- Usage: --with-psdk-home=<abs. path to Windows SDK>
+ Usage: --with-windows-sdk-home=<absolute path to Windows SDK>
],
,)
@@ -2359,13 +2359,13 @@ if test "$build_os" = "cygwin"; then
fi
fi
if test -z "$MIDL_PATH" ; then
- psdktest=`./oowintool --psdk-home`
- if test -x "$psdktest/Bin/midl.exe" ; then
- MIDL_PATH="$psdktest/Bin"
+ winsdktest=`./oowintool --windows-sdk-home`
+ if test -x "$winsdktest/Bin/midl.exe" ; then
+ MIDL_PATH="$winsdktest/Bin"
fi
fi
if test ! -x "$MIDL_PATH/midl.exe"; then
- AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
+ AC_MSG_ERROR([midl.exe not found. Make sure it's in PATH or use --with-midl-path])
fi
# Convert to posix path with 8.3 filename restrictions ( No spaces )
MIDL_PATH=`cygpath -d "$MIDL_PATH"`
@@ -2407,7 +2407,7 @@ if test "$build_os" = "cygwin"; then
if test -f "$frametest/lib/mscoree.lib"; then
DOTNET_FRAMEWORK_HOME="$frametest"
else
- frametest=`./oowintool --psdk-home`
+ frametest=`./oowintool --windows-sdk-home`
if test -f "$frametest/lib/mscoree.lib"; then
DOTNET_FRAMEWORK_HOME="$frametest"
fi
@@ -5782,79 +5782,74 @@ AC_SUBST(HAVE_READDIR_R)
AC_SUBST(SYSTEM_LIBC)
dnl =========================================
-dnl Check for the Microsoft Platform SDK.
+dnl Check for the Windows SDK.
dnl =========================================
-dnl FIXME: I don't know yet if PSDK works with MinGW, keep it until I know better,
+dnl FIXME: I don't know yet if the Windows SDK works with MinGW, keep it until I know better,
dnl and add "-a \( "$WITH_MINGW" != "yes" \)" then
if test \( "$_os" = "WINNT" \) ; then
- AC_MSG_CHECKING([for PSDK files])
- if test -z "$with_psdk_home"; then
+ AC_MSG_CHECKING([for Windows SDK])
+ if test -z "$with_windows_sdk_home"; then
# This first line will detect a February 2003 Microsoft Platform SDK
- PSDK_HOME=`./oowintool --psdk-home`
+ WINDOWS_SDK_HOME=`./oowintool --windows-sdk-home`
# But there might be also an April 2005 PSDK, unfortunately MS changed
# the registry entry. (we prefer the old version!?)
- if test -z "$PSDK_HOME"; then
- PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
+ if test -z "$WINDOWS_SDK_HOME"; then
+ WINDOWS_SDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
fi
# normalize if found
- if test -n "$PSDK_HOME"; then
- PSDK_HOME=`cygpath -d "$PSDK_HOME"`
- PSDK_HOME=`cygpath -u "$PSDK_HOME"`
+ if test -n "$WINDOWS_SDK_HOME"; then
+ WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
+ WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
fi
else
- PSDK_HOME=`cygpath -u "$with_psdk_home"`
+ WINDOWS_SDK_HOME=`cygpath -u "$with_windows_sdk_home"`
fi
# Remove a possible trailing backslash
- PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
+ WINDOWS_SDK_HOME=`echo $WINDOWS_SDK_HOME | $SED 's/\/$//'`
# Problem with current PSDK (iz 49865)
- if test -f "$PSDK_HOME/Lib/libcp.lib"; then
+ if test -f "$WINDOWS_SDK_HOME/Lib/libcp.lib"; then
AC_MSG_ERROR([
Some modules do not build correctly with MS Platform SDK - April 2005
-Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
+Edition if the library ($WINDOWS_SDK_HOME/Lib/libcp.lib) is found.
Remove/rename/backup that file and restart configure. Details about this
problem can be found in issue 49856.])
fi
-# WIndows SDK has different headers
- if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
- -a \( -f "$PSDK_HOME/Include/SqlUcode.h" \) \
- -a \( -f "$PSDK_HOME/Include/usp10.h" \); then
+# Windows SDK has different headers
+ if test \( -f "$WINDOWS_SDK_HOME/Include/adoint.h" \) \
+ -a \( -f "$WINDOWS_SDK_HOME/Include/SqlUcode.h" \) \
+ -a \( -f "$WINDOWS_SDK_HOME/Include/usp10.h" \); then
HAVE_PSDK_H="yes"
else
HAVE_PSDK_H="no"
fi
- if test -f "$PSDK_HOME/lib/user32.lib"; then
+ if test -f "$WINDOWS_SDK_HOME/lib/user32.lib"; then
HAVE_PSDK_LIB="yes"
else
HAVE_PSDK_LIB="no"
fi
if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
- AC_MSG_ERROR([Some (all?) PSDK files not found, please check if all needed Platform SDKs
-are installed or use --with-psdk-home .])
+ AC_MSG_ERROR([Some (all?) Windows SDK files not found, please check if all needed Winows SDKs
+are installed or use --with-windows-sdk-home .])
fi
- if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
- -o ! -x "$PSDK_HOME/bin/msidb.exe" \
- -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
- -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
+ if test ! -x "$WINDOWS_SDK_HOME/bin/msiinfo.exe" \
+ -o ! -x "$WINDOWS_SDK_HOME/bin/msidb.exe" \
+ -o ! -x "$WINDOWS_SDK_HOME/bin/uuidgen.exe" \
+ -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe" ; then
AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
fi
- AC_MSG_RESULT([SDK files found ...)])
dnl Check if this is the right SDK.
- if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([Found Windows SDK 6.1 ($PSDK_HOME)])
- WINDOWS_VISTA_PSDK=TRUE
- elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
- WINDOWS_VISTA_PSDK=TRUE
- elif echo $PSDK_HOME | grep "v7" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([Found Windows SDK 7 ($PSDK_HOME)])
- WINDOWS_VISTA_PSDK=TRUE
+ if echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)])
+ elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)])
+ elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)])
else
- AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
+ AC_MSG_ERROR([Found Legacy Windows Platform SDK ($WINDOWS_SDK_HOME)])
fi
fi
-AC_SUBST(PSDK_HOME)
-AC_SUBST(WINDOWS_VISTA_PSDK)
+AC_SUBST(WINDOWS_SDK_HOME)
dnl =========================================
dnl Check for the Microsoft DirectX SDK.
diff --git a/oowintool b/oowintool
index 70c73b7..fc18a8d 100755
--- a/oowintool
+++ b/oowintool
@@ -48,9 +48,9 @@ sub print_syntax()
print " --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
print " --msvc-productdir - dump productdir\n";
print " --msvs-productdir - dump productdir\n";
- print " --dotnetsdk-dir - dump .Net SDK path\n";
- print " --csc-compilerdir - dump .Net SDK compiler path\n";
- print " --psdk-home - dump psdk install dir\n";
+ print " --dotnetsdk-dir - dump .NET SDK path\n";
+ print " --csc-compilerdir - dump .NET SDK compiler path\n";
+ print " --windows-sdk-home - dump Windows SDK install dir\n";
print " --jdk-home - dump the jdk install dir\n";
print " --nsis-dir - dump NSIS path\n";
print " --help - this message\n";
@@ -91,7 +91,7 @@ sub print_path($$)
print $path;
}
-sub print_psdk_home()
+sub print_windows_sdk_home()
{
my ($value, $key);
$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v6.1/InstallationFolder');
@@ -114,7 +114,7 @@ sub print_psdk_home()
$value = `/bin/find "$dir" -iname platformsdk | head -n 1`;
}
- defined $value || die "psdk not found";
+ defined $value || die "Windows Sdk not found";
print cygpath ($value, 'w', $output_format);
}
@@ -319,8 +319,8 @@ while (@commands) {
print_dotnetsdk_dir();
} elsif ($opt eq '--csc-compilerdir') {
print_csc_compiler_dir();
- } elsif ($opt eq '--psdk-home') {
- print_psdk_home();
+ } elsif ($opt eq '--windows-sdk-home') {
+ print_windows_sdk_home();
} elsif ($opt eq '--jdk-home') {
print_jdk_dir();
} elsif ($opt eq '--nsis-dir') {
diff --git a/set_soenv.in b/set_soenv.in
index 069aa5f..ee06418 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -80,7 +80,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
$SOLARINC, $FRAMEWORKSHOME, $COMEX, $PERL,
- $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
+ $COMP_ENV, $ILIB, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
@@ -645,7 +645,7 @@ elsif ( $platform =~ m/cygwin/ )
$MSPDB_PATH = PathFormat('@MSPDB_PATH@');
$MIDL_PATH = PathFormat('@MIDL_PATH@');
$CSC_PATH = PathFormat('@CSC_PATH@');
- $PSDK_HOME = PathFormat('@PSDK_HOME@');
+ $WINDOWS_SDK_HOME = PathFormat('@WINDOWS_SDK_HOME@');
$DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
$USE_DIRECTX5 = "";
$DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
@@ -671,7 +671,7 @@ elsif ( $platform =~ m/cygwin/ )
$COM = "GCC";
$OUTPATH = "wntgcci";
$INPATH = $OUTPATH.$PROEXT;
- $ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$PSDK_HOME'.$ds."include".$ds."atl";
+ $ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$WINDOWS_SDK_HOME'.$ds."include".$ds."atl";
}
else # The MSVC section starts here
{ $outfile = "WindowsMSVCEnv.Set.sh";
@@ -682,15 +682,15 @@ elsif ( $platform =~ m/cygwin/ )
$INPATH = $OUTPATH.$PROEXT;
$COMEX = '@COMEX@';
if ( "@DISABLE_ACTIVEX@" ) {
- $ATL_LIB = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
- $ATL_INCLUDE = $PSDK_HOME.$ds."include".$ds."atl";
- $MFC_LIB = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
- $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
+ $ATL_LIB = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
+ $ATL_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."atl";
+ $MFC_LIB = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
+ $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
} else {
$ATL_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
$ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
$MFC_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
- $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
+ $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
}
if ($CL_X64) {
$ATL_LIB .= $ds."amd64";
@@ -1045,10 +1045,10 @@ if ($platform =~ m/cygwin/)
}
if ( $CL_X64 ne "TRUE" ) {
$ILIB .= $wps.$COMPATH.$LIB.
- $wps.$PSDK_HOME.$LIB;
+ $wps.$WINDOWS_SDK_HOME.$LIB;
} else {
$ILIB .= $wps.$COMPATH.$LIB.$ds."amd64".
- $wps.$PSDK_HOME.$LIB64;
+ $wps.$WINDOWS_SDK_HOME.$LIB64;
}
$ILIB .= $wps.$DOTNET_FRAMEWORK_HOME.$LIB;
if ( '@ENABLE_DIRECTX@' ne "" ) {
@@ -1069,7 +1069,7 @@ if ($platform =~ m/cygwin/)
{ $ILIB .= $wps.$COMPATH.$LIB;
}
$ILIB .= $wps.PathFormat("@MINGW_CLIB_DIR@").
- $wps.$PSDK_HOME.$LIB;
+ $wps.$WINDOWS_SDK_HOME.$LIB;
if ( '@ENABLE_DIRETX@' )
{ $ILIB .= $wps.PathFormat("@DIRECTXSDK_LIB@");
}
@@ -1155,13 +1155,13 @@ elsif ($platform =~ m/cygwin/)
$PATH .= $ps.$tmppath;
}
# Installer needs some files if the Windows Installer SDK
- $tmppath = CygFormat($PSDK_HOME);
+ $tmppath = CygFormat($WINDOWS_SDK_HOME);
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
$PATH .= $ps.$tmppath.$BIN;
}
} else { # Mingw is different
# Native installer needs some files if the Windows Installer SDK
- $tmppath = CygFormat($PSDK_HOME);
+ $tmppath = CygFormat($WINDOWS_SDK_HOME);
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
$PATH .= $ps.$tmppath.$BIN;
}
@@ -1383,7 +1383,7 @@ elsif ($platform =~ m/cygwin/)
}
# Mingw is different
if ( $COM eq "MSC" )
- { $SOLARINC .= $I.'$PSDK_HOME'.$INCLUDE.
+ { $SOLARINC .= $I.'$WINDOWS_SDK_HOME'.$INCLUDE.
$I.'$COMPATH'.$INCLUDE;
if ( '@ENABLE_DIRECTX@' ne "" ) {
$SOLARINC .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
@@ -1407,7 +1407,7 @@ elsif ($platform =~ m/cygwin/)
}
}
$SOLARINC .= $I.PathFormat("@GXX_INCLUDE_PATH@").$I.PathFormat("@GXX_INCLUDE_PATH@".$ds."mingw32").
- $I.'$PSDK_HOME'.$INCLUDE;
+ $I.'$WINDOWS_SDK_HOME'.$INCLUDE;
}
if ( $COM ne "MSC" && '@ENABLE_DIRECTX@' ne "" ) {
$SOLARINC .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
@@ -1630,11 +1630,10 @@ if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
ToFile( "Variable values.", $empty, "c" );
if ( $platform =~ m/cygwin/ )
{ ToFile( "CYGWIN_PATH", $CYGWIN_PATH, "e" );
- ToFile( "PSDK_HOME", $PSDK_HOME, "e" );
- ToFile( "WINDOWS_VISTA_PSDK","@WINDOWS_VISTA_PSDK@","e" );
+ ToFile( "WINDOWS_SDK_HOME", $WINDOWS_SDK_HOME, "e" );
ToFile( "DIRECTXSDK_LIB", $DIRECTXSDK_LIB, "e" );
ToFile( "USE_DIRECTX5", $USE_DIRECTX5, "e" );
- ToFile( "ATL_LIB", $ATL_LIB, "e" );
+ ToFile( "ATL_LIB", $ATL_LIB, "e" );
if ( $MINGW ne "yes" )
{ ToFile( "ATL_INCLUDE", $ATL_INCLUDE, "e" );
}
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 971dd65..bc8fb74 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -114,7 +114,7 @@ STDSLOCUI_X64=
IMPLIBFLAGS_X64=-machine:X64
-LIBPATH_X64=$(PSDK_HOME)/lib/x64
+LIBPATH_X64=$(WINDOWS_SDK_HOME)/lib/x64
LIBPATH_VC_X64=$(COMPATH)/lib/amd64
ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
@@ -127,7 +127,6 @@ WINSPOOLLIB_X64=$(LIBPATH_X64)/winspool.lib
IMM32LIB_X64=$(LIBPATH_X64)/imm32.lib
VERSIONLIB_X64=$(LIBPATH_X64)/version.lib
WINMMLIB_X64=$(LIBPATH_X64)/winmm.lib
-WSOCK32LIB_X64=$(LIBPATH_X64)/wsock32.lib
MPRLIB_X64=$(LIBPATH_X64)/mpr.lib
WS2_32LIB_X64=$(LIBPATH_X64)/ws2_32.lib
KERNEL32LIB_X64=$(LIBPATH_X64)/kernel32.lib
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
old mode 100755
new mode 100644
index 531b4ba..b008dd8
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -186,12 +186,11 @@ SHELL32LIB=-lshell32
GDI32LIB=-lgdi32
OLE32LIB=-lole32
OLEAUT32LIB=-loleaut32
-UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib
+UUIDLIB=$(WINDOWS_SDK_HOME)$/lib$/uuid.lib
WINSPOOLLIB=-lwinspool
IMM32LIB=-limm32
VERSIONLIB=-lversion
WINMMLIB=-lwinmm
-WSOCK32LIB=-lwsock32
MPRLIB=-lmpr
WS2_32LIB=-lws2_32
KERNEL32LIB=-lkernel32
@@ -199,14 +198,14 @@ USER32LIB=-luser32
LIBCMT=-lmsvcrt
COMDLG32LIB=-lcomdlg32
COMCTL32LIB=-lcomctl32
-CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib
-GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib
-DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib
-MSILIB=$(PSDK_HOME)$/lib$/msi.lib
+CRYPT32LIB=$(WINDOWS_SDK_HOME)$/lib$/crypt32.lib
+GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib
+DBGHELPLIB=$(WINDOWS_SDK_HOME)$/lib$/dbghelp.lib
+MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib
DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib
-SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib
-URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib
+SHLWAPILIB=$(WINDOWS_SDK_HOME)$/lib$/shlwapi.lib
+URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib
WININETLIB=-lwininet
OLDNAMESLIB=-lmoldname
-MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
+MSIMG32LIB=$(WINDOWS_SDK_HOME)$/lib$/msimg32.lib
PROPSYSLIB=-lpropsys
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
old mode 100755
new mode 100644
index 1276f77..7811d13
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -367,7 +367,6 @@ WINSPOOLLIB=winspool.lib
IMM32LIB=imm32.lib
VERSIONLIB=version.lib
WINMMLIB=winmm.lib
-WSOCK32LIB=wsock32.lib
MPRLIB=mpr.lib
WS2_32LIB=ws2_32.lib
KERNEL32LIB=kernel32.lib
More information about the Libreoffice-commits
mailing list