Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
09c0a96e
Kaydet (Commit)
09c0a96e
authored
May 26, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0
Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7
üst
a8417373
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
6 deletions
+9
-6
ExternalProject_coinmp.mk
external/coinmp/ExternalProject_coinmp.mk
+1
-1
ExternalProject_cppunit.mk
external/cppunit/ExternalProject_cppunit.mk
+3
-1
ExternalProject_freetype.mk
external/freetype/ExternalProject_freetype.mk
+1
-1
ExternalProject_glew.mk
external/glew/ExternalProject_glew.mk
+1
-1
ExternalProject_lcms2.mk
external/lcms2/ExternalProject_lcms2.mk
+1
-1
ExternalProject_python3.mk
external/python3/ExternalProject_python3.mk
+2
-1
No files found.
external/coinmp/ExternalProject_coinmp.mk
Dosyayı görüntüle @
09c0a96e
...
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
...
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 \
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 /p:VisualStudioVersion=10.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 /p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
v110_xp
/p:VisualStudioVersion=11.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp)
/p:VisualStudioVersion=11.0) \
,CoinMP/MSVisualStudio/v9)
,CoinMP/MSVisualStudio/v9)
else
else
...
...
external/cppunit/ExternalProject_cppunit.mk
Dosyayı görüntüle @
09c0a96e
...
@@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
...
@@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
ifeq ($(OS)$(COM),WNTMSC)
ifeq ($(OS)$(COM),WNTMSC)
$(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,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0)" \
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0)" \
&& msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \
&& msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \
&& cd ../DllPlugInTester \
&& cd ../DllPlugInTester \
&& msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \
&& msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \
...
...
external/freetype/ExternalProject_freetype.mk
Dosyayı görüntüle @
09c0a96e
...
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
...
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
$(call gb_ExternalProject_run,build,\
$(call gb_ExternalProject_run,build,\
cd ../builds/win32/vc2010/ && \
cd ../builds/win32/vc2010/ && \
msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
v110_xp
/p:VisualStudioVersion=11.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp)
/p:VisualStudioVersion=11.0) \
,objs)
,objs)
else
else
$(call gb_ExternalProject_get_state_target,freetype,build) :
$(call gb_ExternalProject_get_state_target,freetype,build) :
...
...
external/glew/ExternalProject_glew.mk
Dosyayı görüntüle @
09c0a96e
...
@@ -17,7 +17,7 @@ ifeq ($(COM),MSC)
...
@@ -17,7 +17,7 @@ ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
$(call gb_ExternalProject_run,build,\
msbuild.exe glew_shared.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
msbuild.exe glew_shared.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
v110_xp
/p:VisualStudioVersion=11.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp)
/p:VisualStudioVersion=11.0) \
,build/vc10)
,build/vc10)
else
else
...
...
external/lcms2/ExternalProject_lcms2.mk
Dosyayı görüntüle @
09c0a96e
...
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
...
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
MSBuild.exe lcms2_DLL.vcxproj \
MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 /p:TargetName=lcms2 \
/p:Platform=Win32 /p:TargetName=lcms2 \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
v110_xp
/p:VisualStudioVersion=11.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=
$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp)
/p:VisualStudioVersion=11.0) \
,Projects/VC2010/lcms2_DLL)
,Projects/VC2010/lcms2_DLL)
else
else
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_get_state_target,lcms2,build):
...
...
external/python3/ExternalProject_python3.mk
Dosyayı görüntüle @
09c0a96e
...
@@ -37,7 +37,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
...
@@ -37,7 +37,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 100,$(VCVER)), \
$(if $(filter 100,$(VCVER)), \
/ToolsVersion:4.0, \
/ToolsVersion:4.0, \
/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0) \
/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
&& cd $(EXTERNAL_WORKDIR) \
&& cd $(EXTERNAL_WORKDIR) \
&& ln -s PCbuild LO_lib \
&& ln -s PCbuild LO_lib \
,PCBuild)
,PCBuild)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment