diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-03 12:03:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-03 14:58:24 +0200 |
| commit | f922e65666d25fe29ce85ecf63091b62f1dfbe49 (patch) | |
| tree | 4d8bd9cde050ab7e2f5aa92b47f87278c8594600 | |
| parent | 2bd8cff7b2701d7a8f67cf97402e20aaad15d8e8 (diff) | |
64-bit Windows build modifications
Change-Id: I747e05ba7ad3e79f7e16d3a370a7b17dde04dfd7
| -rw-r--r-- | post_download.in | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/post_download.in b/post_download.in index 7685f56e1466..eef61aa8d199 100644 --- a/post_download.in +++ b/post_download.in @@ -21,7 +21,7 @@ esac dnl =================================================================== dnl Windows builds need dbghelp.dll in external/dbghelp/ dnl =================================================================== -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$CPUNAME" = INTEL; then AC_MSG_CHECKING([for dbghelp.dll]) if test -f ./external/dbghelp/dbghelp.dll; then AC_MSG_RESULT([found]) @@ -38,8 +38,14 @@ dnl =================================================================== dnl Windows builds - use oowintool to copy CRT dlls and manifest dnl =================================================================== if test "$COM" = "MSC"; then - if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then - AC_MSG_ERROR([oowintool failed to copy CRT]) + if test "$CPUNAME" = INTEL; then + if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then + AC_MSG_ERROR([oowintool failed to copy CRT]) + fi + else + if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then + AC_MSG_ERROR([oowintool failed to copy CRT]) + fi fi fi @@ -47,19 +53,25 @@ dnl =================================================================== dnl Windows builds - use oowintool to copy VC redist merge modules dnl =================================================================== if test "$COM" = "MSC"; then - if ! ./oowintool --msvc-copy-msms ./external/msm"$VCVER" ; then - AC_MSG_ERROR([oowintool failed to copy merge modules]) + if test "$CPUNAME" = INTEL; then + if ! ./oowintool --msvc-copy-msms ./external/msm"$VCVER" ; then + AC_MSG_ERROR([oowintool failed to copy merge modules]) + fi fi if ! ./oowintool --msvc-copy-msms-64 ./external/msm"$VCVER" ; then - AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation -will lack the 64-bit Explorer extension]) + if test "$CPUNAME" = INTEL; then + AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation + will lack the 64-bit Explorer extension]) + else + AC_MSG_ERROR([oowintool failed to copy CRT merge modules]) + fi fi fi dnl =================================================================== dnl Windows builds need gdiplus.dll in external/gdiplus/ dnl =================================================================== -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$CPUNAME" = INTEL; then AC_MSG_CHECKING([for gdiplus.dll]) if test -f ./external/gdiplus/gdiplus.dll; then AC_MSG_RESULT([found]) |