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
65a03924
Kaydet (Commit)
65a03924
authored
Agu 17, 2011
tarafından
Jan Holesovsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Check for amd64/atls.lib, and disable ActiveX 64bit component if not present.
üst
1641f08f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
configure.in
configure.in
+8
-9
No files found.
configure.in
Dosyayı görüntüle @
65a03924
...
@@ -2674,9 +2674,8 @@ if test "$_os" = "WINNT"; then
...
@@ -2674,9 +2674,8 @@ if test "$_os" = "WINNT"; then
LINK_X64_BINARY=
LINK_X64_BINARY=
LIBMGR_X64_BINARY=
LIBMGR_X64_BINARY=
if test "$CL_X64" = ""; then
AC_MSG_CHECKING([for a x64 compiler and libraries for 64bit ActiveX component])
AC_MSG_CHECKING([for a x64 compiler])
if test "$CL_X64" = "" -a -f "$with_cl_home/atlmfc/lib/amd64/atls.lib"; then
# Prefer native x64 compiler to cross-compiler, in case we are running
# Prefer native x64 compiler to cross-compiler, in case we are running
# the build on a 64-bit OS.
# the build on a 64-bit OS.
if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
...
@@ -2692,12 +2691,12 @@ if test "$_os" = "WINNT"; then
...
@@ -2692,12 +2691,12 @@ if test "$_os" = "WINNT"; then
LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
fi
fi
if test "$BUILD_X64" = TRUE; then
fi
AC_MSG_RESULT([found])
if test "$BUILD_X64" = TRUE; then
else
AC_MSG_RESULT([found])
AC_MSG_RESULT([not found])
else
AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension
])
AC_MSG_RESULT([not found
])
fi
AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
fi
fi
AC_SUBST(BUILD_X64)
AC_SUBST(BUILD_X64)
...
...
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