diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-17 02:22:19 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@filifjonkan.site> | 2011-05-17 02:22:19 +0300 |
| commit | 84fbaed77de78c37ddae2da17f182aa148ef5776 (patch) | |
| tree | a14630c11e9306f074a4d8c9f42dd8f843b0a3aa /post_download.in | |
| parent | 85d44913abdca42d32bb98e435221227d447fe65 (diff) | |
More cross-compiling work
AC_SUBST also EXEEXT_FOR_BUILD and use that in Makefile.in.
As winemv.set.sh is now called WindowsMSVCEnv.Set.sh, with capital E
and S like all the others, we can simplify the glob pattern for the
Set.sh file.
Don't attempt to download and/or run unpackers for dependencies
relevant only when using MSVC if using MinGW.
Misc other Windows host vs. build fixes.
Diffstat (limited to 'post_download.in')
| -rwxr-xr-x | post_download.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/post_download.in b/post_download.in index ff639f801633..fc4207e709fa 100755 --- a/post_download.in +++ b/post_download.in @@ -21,7 +21,7 @@ case "$host_os" in gnu) _os=GNU ;; - cygwin*) # Windows + cygwin*|mingw32*) # Windows _os=WINNT ;; darwin*) # Mac OS X or iOS @@ -69,7 +69,7 @@ fi dnl =================================================================== dnl Windows builds - use oowintool to copy CRT dlls and manifest dnl =================================================================== -if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then +if test "$COM" = "MSC"; then if ./oowintool --msvc-copy-dlls ./external/msvcp ; then : else @@ -95,7 +95,7 @@ fi dnl =================================================================== dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/ dnl =================================================================== -if test "$_os" = "WINNT"; then +if test "$COM" = "MSC"; then AC_MSG_CHECKING([for vcredist_x86.exe]) if test -e ./external/vcredist/vcredist_x86.exe; then AC_MSG_RESULT([found]) |