From: andrewd AT axonet DOT com DOT au (Andrew Dalgleish)
Subject: Patch CDK makefiles to avoid Microsoft include files
2 Aug 1998 22:58:32 -0700
Message-ID: <01BDBEF4.1AA9DF80.cygnus.cygwin32.developers@ANDREW-NT.dev.axonet.com.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: "'cygwin32-developers AT cygnus DOT com'" <cygwin32-developers AT cygnus DOT com>

Here's a patch so the CDK makefiles ignore the Microsoft include directories.
(The build works ok if you don't have the directories, but if you do have them it can get confused.)

Regards,
Andrew Dalgleish


cat >src.diff <<end-of-patch
diff -ur old/src/tcl/win/Makefile.in src/tcl/win/Makefile.in
--- old/src/tcl/win/Makefile.in	Wed Jan 21 10:59:06 1998
+++ src/tcl/win/Makefile.in	Sun Aug 02 21:58:34 1998
@@ -190,12 +190,12 @@
 cc32		= \$(TOOLS32)\\bin\\cl.exe
 link32		= \$(TOOLS32)\\bin\\link.exe
 rc32		= \$(TOOLS32)\\bin\\rc.exe
-include32	= -I\$(TOOLS32)\\include
+include32	=
 
 cc16		= \$(TOOLS16)\\bin\\cl.exe
 link16		= \$(TOOLS16)\\bin\\link.exe
 rc16		= \$(TOOLS16)\\bin\\rc.exe
-include16	= -I\$(TOOLS16)\\include
+include16	=
 
 WINDIR          = \$(ROOT)/win
 GENERICDIR	= \$(ROOT)/generic
diff -ur old/src/tk/win/Makefile.in src/tk/win/Makefile.in
--- old/src/tk/win/Makefile.in	Wed Jan 14 08:37:30 1998
+++ src/tk/win/Makefile.in	Sun Aug 02 21:58:34 1998
@@ -227,7 +227,7 @@
 cc32		= \$(TOOLS32)\\bin\\cl.exe
 link32		= \$(TOOLS32)\\bin\\link.exe
 rc32		= \$(TOOLS32)\\bin\\rc.exe
-include32	= -I\$(TOOLS32)\\include
+include32	=
 
 WINDIR          = \$(ROOT)/win
 GENERICDIR	= \$(ROOT)/generic
end-of-patch