[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Patches for MSVC
From: |
John W. Eaton |
Subject: |
Re: Patches for MSVC |
Date: |
Sun, 21 Feb 2010 11:41:59 -0500 |
On 21-Feb-2010, Michael Goffioul wrote:
| It tells libtool where binaries should be installed. AFAIK This should also
| be required by MinGW or cygwin. Under Win32 systems, the libtool
| library that is installed is the import library. But you also need to install
| the actual DLL in the bin directory. This is done by libtool in a postinstall
| step. By default (if no -bindir flag is given), the target bin dir is computed
| relatively to the target install lib dir as "../bin/". But as octave
| libs are not
| installed in the standard ".../lib/" directory, the DLL's get installed
| incorrectly in ".../lib/octave-3-3-50+/../bin/" == ".../lib/bin/".
|
| If this change is not required by cygwin or MinGW, then I'm ok to not
| apply this change to the octave source tree. I'll let Benjamin and Marco
| comment on this.
I think it should be OK to apply it.
| > | diff -r f0ac2fa91733 libcruft/misc/quit.h
| > | --- a/libcruft/misc/quit.h Thu Feb 11 14:13:28 2010 -0500
| > | +++ b/libcruft/misc/quit.h Sun Feb 21 14:31:37 2010 +0000
| > | @@ -35,9 +35,8 @@
| > |
| > | #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
| > |
| > | +#define WIN32_LEAN_AND_MEAN
| > | #include <windows.h>
| > | -#undef min
| > | -#undef max
| > |
| > | CRUFT_API extern void w32_sigint_init (void); /* setup */
| > | CRUFT_API extern void w32_raise_final (void); /* tear down */
| >
| > Please check in all the WIN32_LEAN_AND_MEAN changes as a separate
| > changeset.
|
| Is it ok to also include the '#undef' and the -DNOMINMAX addition
| (see above)? Those usually appears at the same location, so separating
| them will make it more difficult for me to do.
Yes, I misunderstood the earlier change. But you have
| > | +## Avoid #define of min/max from windows.h header
| > | +if test "$have_msvc" = "yes"; then
| > | + AC_DEFINE(NOMINMAX, 1, [Define if you want to avoid min/max macro
definition in Windows headers])
| > | +fi
Isn't windows.h included when using MinGW so that this would also be
required for MinGW?
jwe
- Patches for MSVC, Michael Goffioul, 2010/02/21
- Patches for MSVC, John W. Eaton, 2010/02/21
- Re: Patches for MSVC, Michael Goffioul, 2010/02/21
- Re: Patches for MSVC, Michael Goffioul, 2010/02/21
- Re: Patches for MSVC,
John W. Eaton <=
- Re: Patches for MSVC, Michael Goffioul, 2010/02/21
- Re: Patches for MSVC, Benjamin Lindner, 2010/02/22
- Re: Patches for MSVC, Michael Goffioul, 2010/02/22
- Re: Patches for MSVC, Benjamin Lindner, 2010/02/22
- Re: Patches for MSVC, John W. Eaton, 2010/02/22