Kaydet (Commit) 10f45838 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Bin VS2008 bits

Change-Id: I96979f61eac5cc48721e3733d90822406bcb49cc
üst f5e8f5b0
...@@ -15,14 +15,6 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\ ...@@ -15,14 +15,6 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
ifeq ($(OS)$(COM),WNTMSC) 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_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
msbuild.exe cppunit_dll.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ 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) : ...@@ -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) \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
,src/cppunit) ,src/cppunit)
endif
else else
cppunit_CXXFLAGS=$(CXXFLAGS) cppunit_CXXFLAGS=$(CXXFLAGS)
......
...@@ -49,13 +49,6 @@ else ifeq ($(VCVER),100) ...@@ -49,13 +49,6 @@ else ifeq ($(VCVER),100)
&& cd $(EXTERNAL_WORKDIR) \ && cd $(EXTERNAL_WORKDIR) \
&& ln -s PCbuild LO_lib \ && ln -s PCbuild LO_lib \
,PCBuild) ,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 endif
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment