config_host.mk.in | 1 -
configure.ac | 1 -
extensions/test/ole/cpnt/makefile.mk | 9 ---------
lcms2/ExternalPackage_lcms2.mk | 2 +-
lcms2/ExternalProject_lcms2.mk | 10 +---------
5 files changed, 2 insertions(+), 21 deletions(-)
New commits:
commit 8120e95e2b8f685f5c951cd316ac443a14dba79a
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri May 31 14:32:03 2013 +0300
Bin more VS2008 bits
Change-Id: Ia52fdae1e386ea92f11185ce7cdac65baed10495
diff --git a/config_host.mk.in b/config_host.mk.in
index a3770a5..6174641 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -55,7 +55,6 @@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
export CMIS_CFLAGS=$(gb_SPACE)@CMIS_CFLAGS@
export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@
export COM=@COM@
-export COMEX=@COMEX@
export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@
diff --git a/configure.ac b/configure.ac
index 8dc7cd0..aee6047 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3210,7 +3210,6 @@ if test "$_os" = "WINNT"; then
fi
fi
fi
-AC_SUBST(COMEX)
AC_SUBST(VCVER)
PathFormat "$MSPDB_PATH"
MSPDB_PATH="$formatted_path"
diff --git a/extensions/test/ole/cpnt/makefile.mk
b/extensions/test/ole/cpnt/makefile.mk
index ee8a629..ad9d07b 100644
--- a/extensions/test/ole/cpnt/makefile.mk
+++ b/extensions/test/ole/cpnt/makefile.mk
@@ -39,15 +39,6 @@ SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB)
-.IF "$(COMEX)"=="8" || "$(COMEX)"=="10"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
- SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
- SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF
-
-
SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index b5cd180..30bf089 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -20,7 +20,7 @@ ifeq ($(COM),GCC)
$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a))
$(eval $(call
gb_ExternalPackage_add_library_for_install,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if
$(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),$(if
$(filter-out 13 14,$(COMEX)),d)).lib))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if
$(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2.lib))
# note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is
# actually called LCMS2D.DLL then
$(eval $(call
gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if
$(MSVC_USE_DEBUG_RUNTIME),d).dll))
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index 1689482..e128b24 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -15,24 +15,16 @@ $(eval $(call gb_ExternalProject_register_targets,lcms2,\
ifeq ($(COM),MSC)
-ifeq ($(filter-out 14 13,$(COMEX)),)
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 /p:TargetName=lcms2 \
- $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110
/p:VisualStudioVersion=11.0) \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110
/p:VisualStudioVersion=11.0) \
,Projects/VC2010/lcms2_DLL)
else
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
- $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj \
- "$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)|Win32" \
- ,Projects/VC2008/lcms2_DLL)
-endif
-else
-$(call gb_ExternalProject_get_state_target,lcms2,build):
- $(call gb_ExternalProject_run,build,\
./configure --without-jpeg --without-tiff --with-pic \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CPPFLAGS=" $(SOLARINC)" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
