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
e7f8b9f8
Kaydet (Commit)
e7f8b9f8
authored
Eyl 17, 2014
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Bye bye VS2010
Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785
üst
6ee5be0e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
41 deletions
+12
-41
configure.ac
configure.ac
+10
-23
ExternalProject_coinmp.mk
external/coinmp/ExternalProject_coinmp.mk
+0
-1
ExternalProject_libgltf.mk
external/libgltf/ExternalProject_libgltf.mk
+0
-2
ExternalProject_python3.mk
external/python3/ExternalProject_python3.mk
+0
-2
com_MSC_defs.mk
solenv/gbuild/platform/com_MSC_defs.mk
+2
-13
No files found.
configure.ac
Dosyayı görüntüle @
e7f8b9f8
...
...
@@ -2010,12 +2010,13 @@ AC_ARG_WITH(
[with_doxygen=yes])
AC_ARG_WITH(visual-studio,
AS_HELP_STRING([--with-visual-studio=<2013/2012
/2010
>],
AS_HELP_STRING([--with-visual-studio=<2013/2012>],
[Specify which Visual Studio version to use in case several are
are installed. If not specified, the order of preference is
2013, 2012, 2010 (including Express editions).])
2013, 2012 (including Express editions). Note that it is
unclear whether using 2013 actually works as intended.])
[
Usage: --with-visual-studio=<2013/2012
/2010
>
Usage: --with-visual-studio=<2013/2012>
],
,)
...
...
@@ -3381,8 +3382,6 @@ map_vs_year_to_version()
unset vsversion
case $1 in
2010)
vsversion=10.0;;
2012)
vsversion=11.0;;
2013)
...
...
@@ -3403,14 +3402,14 @@ vs_versions_to_check()
map_vs_year_to_version "$1"
vsversions=$vsversion
else
# By default we prefer 2013,
2012, then 2010
vsversions="12.0 11.0
10.0
"
# By default we prefer 2013,
then 2012
vsversions="12.0 11.0"
fi
}
find_msvs()
{
# Find Visual Studio 2013/2012
/2010
# Find Visual Studio 2013/2012
# Args: $1 (optional) : versions to check, in the order of preference
# Return value: $vstest
...
...
@@ -3434,7 +3433,7 @@ find_msvs()
find_msvc()
{
# Find Visual C++ 2013/2012
/2010
# Find Visual C++ 2013/2012
# Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
...
...
@@ -3457,10 +3456,6 @@ find_msvc()
if test -n "$vctest"; then
vcnumwithdot=$ver
case "$vcnumwithdot" in
10.0)
vcyear=2010
vcnum=100
;;
11.0)
vcyear=2012
vcnum=110
...
...
@@ -3484,7 +3479,7 @@ if test "$_os" = "WINNT"; then
if test -n "$with_visual_studio"; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio installation found])
else
AC_MSG_ERROR([No Visual Studio 2012
, 2010
or 2013 installation found])
AC_MSG_ERROR([No Visual Studio 2012 or 2013 installation found])
fi
fi
...
...
@@ -3566,7 +3561,7 @@ if test "$_os" = "WINNT"; then
COMPATH=`echo $VC_PRODUCT_DIR`
fi
fi
if test "$BITNESS_OVERRIDE" = ""
-a "$vcnum" != "100"
; then
if test "$BITNESS_OVERRIDE" = ""; then
CC="$CC -arch:SSE" # MSVC 2012 default for x86 is -arch:SSE2
fi
export INCLUDE=`cygpath -d "$COMPATH/Include"`
...
...
@@ -3581,14 +3576,6 @@ if test "$_os" = "WINNT"; then
# are always "better", we list them in reverse chronological order.
case $vcnum in
100)
COMEX=13
WINDOWS_SDK_ACCEPTABLE_VERSIONS="7.1A 7.1 7.0A 6.0A"
if test "$ENABLE_LTO" = TRUE; then
AC_MSG_WARN([LTO is known to cause problems with MSVC 2010])
add_warning "LTO is known to cause problems with MSVC 2010"
fi
;;
110)
COMEX=14
WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.0 7.1A"
...
...
external/coinmp/ExternalProject_coinmp.mk
Dosyayı görüntüle @
e7f8b9f8
...
...
@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 /p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
...
...
external/libgltf/ExternalProject_libgltf.mk
Dosyayı görüntüle @
e7f8b9f8
...
...
@@ -46,8 +46,6 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
'/p:AdditionalIncludeDirectories=$(subst $(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
/p:AdditionalLibraryDirectories=$(if $(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32)
...
...
external/python3/ExternalProject_python3.mk
Dosyayı görüntüle @
e7f8b9f8
...
...
@@ -35,8 +35,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \
...
...
solenv/gbuild/platform/com_MSC_defs.mk
Dosyayı görüntüle @
e7f8b9f8
...
...
@@ -202,9 +202,9 @@ ifneq ($(ENABLE_LTO),)
# the dbaccess dbu library. Let's try globally disabling C4702.
# Might be fixed in VS2013 though?
# VCVER=1
00 for VS2010 and VCVER=1
10 for VS2012
# VCVER=110 for VS2012
ifneq ($(filter 1
00 1
10,$(VCVER)),)
ifneq ($(filter 110,$(VCVER)),)
gb_CXXFLAGS += \
-wd4702 \
...
...
@@ -212,15 +212,6 @@ endif
endif
# New warning(s) in Visual Studio 2010, let's try disabling these only
# for that specific compiler version, in case a later one will not
# need them disabled.
ifeq ($(VCVER),100)
# (none currently)
endif
ifeq ($(CPUNAME),X86_64)
gb_CXXFLAGS += \
...
...
@@ -228,10 +219,8 @@ gb_CXXFLAGS += \
endif
ifneq ($(VCVER),100)
# rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A
gb_RCFLAGS += -nologo
endif
# C4005: 'identifier' : macro redefinition
...
...
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