[Libreoffice-commits] core.git: cppunit/ExternalProject_cppunit.mk python3/ExternalProject_python3.mk
Tor Lillqvist
tml at iki.fi
Fri May 31 03:49:58 PDT 2013
cppunit/ExternalProject_cppunit.mk | 9 ---------
python3/ExternalProject_python3.mk | 7 -------
2 files changed, 16 deletions(-)
New commits:
commit 10f458388c1096cccd6797bfd56bc9fd052eab00
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri May 31 13:38:34 2013 +0300
Bin VS2008 bits
Change-Id: I96979f61eac5cc48721e3733d90822406bcb49cc
diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
index e4a3cb1..cc4b9ad 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -15,14 +15,6 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
ifeq ($(OS)$(COM),WNTMSC)
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,cppunit,build) :
- $(call gb_ExternalProject_run,build,\
- $(COMPATH)/vcpackages/vcbuild.exe cppunit_dll.vcproj "$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)|Win32" \
- && cd ../DllPlugInTester \
- && $(COMPATH)/vcpackages/vcbuild.exe DllPlugInTester.vcproj "$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)|Win32" \
- ,src/cppunit)
-else
$(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe cppunit_dll.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
@@ -31,7 +23,6 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
&& msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
,src/cppunit)
-endif
else
cppunit_CXXFLAGS=$(CXXFLAGS)
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index f672d71..0db0df8 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -49,13 +49,6 @@ else ifeq ($(VCVER),100)
&& cd $(EXTERNAL_WORKDIR) \
&& ln -s PCbuild LO_lib \
,PCBuild)
-else ifeq ($(VCVER),90)
- $(call gb_ExternalProject_run,build,\
- MAKEFLAGS= $(COMPATH)/vcpackages/vcbuild.exe pcbuild.sln \
- "$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)|$(if $(filter INTEL,$(CPUNAME)),Win32,x64)" \
- && cd $(EXTERNAL_WORKDIR) \
- && ln -s PC/VS9.0 LO_lib \
- ,PC/VS9.0)
endif
else
More information about the Libreoffice-commits
mailing list