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
fdcd8508
Kaydet (Commit)
fdcd8508
authored
Agu 16, 2012
tarafından
Peter Foley
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
enable build with Visual Studio 2012
Change-Id: I95e5974e4f109eb8882f7260d19c439a86931e64
üst
baf5c7fb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
7 deletions
+29
-7
configure.in
configure.in
+13
-5
README_msvcX110.dll
external/msvcp110/README_msvcX110.dll
+2
-0
oowintool
oowintool
+14
-2
No files found.
configure.in
Dosyayı görüntüle @
fdcd8508
...
...
@@ -2969,13 +2969,13 @@ if test "$_os" = "WINNT"; then
AC_MSG_RESULT([$with_cl_home])
dnl ===========================================================
dnl Check for mspdb80.dll/mspdb100.dll
dnl Check for mspdb80.dll/mspdb100.dll
/mspdb110.dll
dnl ===========================================================
dnl MSVS 2008/10 Compiler
dnl MSVS 2008/10
/12
Compiler
if test -n "$with_mspdb_path";then
with_mspdb_path=`cygpath -u "$with_mspdb_path"`
fi
if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"; then
if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"
-o -e "$with_mspdb_path/mspdb110.dll"
; then
MSPDB_PATH="$with_mspdb_path"
fi
dnl MSVS 2008 case
...
...
@@ -2990,16 +2990,21 @@ if test "$_os" = "WINNT"; then
if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb100.dll"; then
MSPDB_PATH="$with_cl_home/../Common7/IDE"
fi
dnl MSVS 2012 case
if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb110.dll"; then
MSPDB_PATH="$with_cl_home/../Common7/IDE"
fi
if test -z "$MSPDB_PATH";then
dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
AC_PATH_PROG(MSPDB_PATH, mspdb110.dll)
MSPDB_PATH=`dirname "$MSPDB_PATH"`
fi
if test -z "$MSPDB_PATH"; then
AC_MSG_ERROR([You need a mspdb80.dll
or mspdb10
0.dll, make sure it is in the path or use --with-mspdb-path])
AC_MSG_ERROR([You need a mspdb80.dll
or mspdb100.dll or mspdb11
0.dll, make sure it is in the path or use --with-mspdb-path])
fi
MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
...
...
@@ -3047,7 +3052,10 @@ if test "$_os" = "WINNT"; then
printf (\"%04d\",vertoken[[i]] )
}
}"`
if test "$CCNUMVER" -ge "001600000000"; then
if test "$CCNUMVER" -ge "001700000000"; then
COMEX=14
MSVSVER=2012
elif test "$CCNUMVER" -ge "001600000000"; then
COMEX=13
MSVSVER=2010
elif test "$CCNUMVER" -ge "001500000000"; then
...
...
external/msvcp110/README_msvcX110.dll
0 → 100755
Dosyayı görüntüle @
fdcd8508
Put msvcp110.dll, msvcr110.dll in this directory for Windows builds using a
VS 2012 / VC 11.0 compiler.
oowintool
Dosyayı görüntüle @
fdcd8508
...
...
@@ -151,10 +151,22 @@ my %msvc_2010 = (
'dll_path'
=>
'redist/x86/Microsoft.VC100.CRT'
,
'dll_suffix'
=>
'100'
);
my
%
msvs
_2012
=
(
'ver'
=>
'11.0'
,
'key'
=>
'Microsoft/VisualStudio/11.0/Setup/VS/ProductDir'
,
'dll_path'
=>
'VC/redist/x86/Microsoft.VC110.CRT'
,
'dll_suffix'
=>
'110'
);
my
%
msvc_2012
=
(
'ver'
=>
'11.0'
,
'key'
=>
'Microsoft/VisualStudio/11.0/Setup/VC/ProductDir'
,
'dll_path'
=>
'redist/x86/Microsoft.VC110.CRT'
,
'dll_suffix'
=>
'110'
);
sub
find_msvs
()
{
my
@ms_versions
=
(
\%
msvs_2008, \%msvs_express_2008, \%msvs
_2010
);
my
@ms_versions
=
(
\%
msvs_2008, \%msvs_express_2008, \%msvs_201
2, \%msvs
_201
0
);
for
$ver
(
@ms_versions
)
{
my
$install
=
reg_get_value
(
"HKEY_LOCAL_MACHINE/SOFTWARE/"
.
$ver
->
{
'key'
});
...
...
@@ -168,7 +180,7 @@ sub find_msvs()
sub
find_msvc
()
{
my
@ms_versions
=
(
\%
msvc_2008, \%msvc_express_2008, \%ms
vc_2010
);
my
@ms_versions
=
(
\%
msvc_2008, \%msvc_express_2008, \%msvc_201
2, \%ms
vc_201
0
);
for
$ver
(
@ms_versions
)
{
my
$install
=
reg_get_value
(
"HKEY_LOCAL_MACHINE/SOFTWARE/"
.
$ver
->
{
'key'
});
...
...
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