[Libreoffice-commits] .: 2 commits - lcms2/makefile.mk

[Tor Lillqvist]

 lcms2/makefile.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f3f6c9be9864088b94f874c6ef2ce8ab1dd45f2a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Mar 9 12:36:15 2012 +0200

    Pass /useenv to vcbuild so that rc and link find SDK headers and libs

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 028a3f6..10ba736 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -54,7 +54,7 @@ BUILD_DIR=Projects/VC2010/lcms2_DLL
 BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32
 .ELSE
 BUILD_DIR=Projects/VC2008/lcms2_DLL
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32"
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe /useenv lcms2_DLL.vcproj "Release|Win32"
 .ENDIF
 
 .ELSE #"$(GUI)$(COM)"!="WNTMSC"
commit 4839f974925a6da50be9cd0dc7ab907182abbb93
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Mar 9 12:07:35 2012 +0200

    VC2008 and 2010 were swapped

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 68b939f..028a3f6 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -46,14 +46,14 @@ TARFILE_MD5=327348d67c979c88c2dec59a23a17d85
 
 .IF "$(GUI)$(COM)"=="WNTMSC"
 CONFIGURE_DIR=.
-BUILD_DIR=Projects/VC2010/lcms2_DLL
 
 CONFIGURE_ACTION =
 
 .IF "$(CCNUMVER)" >= "001600000000"
-BUILD_DIR=Projects/VC2008/lcms2_DLL
+BUILD_DIR=Projects/VC2010/lcms2_DLL
 BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32
 .ELSE
+BUILD_DIR=Projects/VC2008/lcms2_DLL
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32"
 .ENDIF