[Libreoffice-commits] .: lcms2/makefile.mk
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Mar 13 06:27:13 PDT 2012
lcms2/makefile.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 073ea37399a3b9b44e5780c1cf2a6b76e44d8359
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Mar 13 14:15:20 2012 +0100
Revert "Pass /useenv to vcbuild so that rc and link find SDK headers and libs"
It breaks on a clean installs of Windows, and registration of SDK with Visual
Studio seems to be the answer.
This reverts commit f3f6c9be9864088b94f874c6ef2ce8ab1dd45f2a.
Conflicts:
lcms2/makefile.mk
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 83458ca..0c7f5d5 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -55,7 +55,7 @@ BUILD_DIR=Projects/VC2010/lcms2_DLL
.IF "$(CCNUMVER)" >= "001600000000"
BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32
.ELSE
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe /useenv lcms2_DLL.vcproj "Release|Win32"
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32"
.ENDIF
.ELSE #"$(GUI)$(COM)"!="WNTMSC"
More information about the Libreoffice-commits
mailing list