author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | |
Thu, 8 Oct 2009 15:21:44 +0000 (16:21 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 9 Oct 2009 05:50:58 +0000 (22:50 -0700) | ||
commit | f2d50d937bd17eb413cb78ccb37c17c2d933f76d | |
tree | 7528fbecde99e0d5183f07e0438aa6c566e81091 | tree | snapshot |
parent | f5c3178151e3963cc8cf73fdc200831850b7a632 | commit | diff |
Fix MSVC build on cygwin
In the MSVC section of the Makefile, BASIC_CFLAGS is set to a
value which contains the string "-DWIN32-D_CONSOLE". This results
in a (single) malformed -Define being passed to the compiler.
At least on my cygwin installation, the msvc compiler seems to
ignore this parameter, without issuing an error or warning, and
results in the WIN32 and _CONSOLE macros being undefined. This
breaks the build.
In order to fix the build, we simply insert a space between the
two -Define parameters, "-DWIN32" and "-D_CONSOLE", as originally
intended.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In the MSVC section of the Makefile, BASIC_CFLAGS is set to a
value which contains the string "-DWIN32-D_CONSOLE". This results
in a (single) malformed -Define being passed to the compiler.
At least on my cygwin installation, the msvc compiler seems to
ignore this parameter, without issuing an error or warning, and
results in the WIN32 and _CONSOLE macros being undefined. This
breaks the build.
In order to fix the build, we simply insert a space between the
two -Define parameters, "-DWIN32" and "-D_CONSOLE", as originally
intended.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile | diff | blob | history |