Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sources.redhat.com/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com
Message-Id: <5.2.0.9.0.20030305173002.0263c068@irispavp.igb.umontreal.ca>
X-Sender: bleau2 AT irispavp DOT igb DOT umontreal DOT ca (Unverified)
Date: Wed, 05 Mar 2003 17:42:06 -0500
To: cygwin AT cygwin DOT com
From: Andre Bleau <cygwin-apps AT cygwin DOT com>
Subject: [Improved PATCH] corrects search order of directories for
  include files for gcc 3.2
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"; format=flowed
X-MDRemoteIP: 10.52.50.2
X-Return-Path: cygwin-apps AT cygwin DOT com
X-MDaemon-Deliver-To: cygwin AT cygwin DOT com
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from quoted-printable to 8bit by delorie.com id h25Mf3O30295

This is a follow up to: http://cygwin.com/ml/cygwin/2003-03/msg00271.html

I improved my patch so that /usr/include/w32api is not searched at all if 
-mno-win32 is specified. Search list would now be:

gcc -mno-cygwin : (same as now)
  /usr/i686-pc-mingw32/lib/../../include/w32api
  /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
  /usr/include/mingw

gcc -mwin32 : (same as now)
  /usr/i686-pc-mingw32/lib/../../include/w32api
  /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
  /usr/include

gcc -mno-win32 : (same as now)
  /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
  /usr/include

"plain" gcc or gcc -mcygwin : (/usr/i686-pc-cygwin/lib/../../include/w32api 
moved from first to last position)
  /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
  /usr/include
  /usr/i686-pc-cygwin/lib/../../include/w32api

I tested the patch by modifying the specs file by hand.

The patch is for /usr/src/gcc-3.2-3/gcc/config/i386/cygwin.h
----------------------------------------------------------------
$ diff -up cygwin.h.orig cygwin.h
--- cygwin.h.orig       2003-03-04 15:08:38.000000000 -0500
+++ cygwin.h    2003-03-05 17:29:07.000000000 -0500
@@ -44,7 +44,8 @@ Boston, MA 02111-1307, USA.  */
    %{mno-cygwin:-D__MSVCRT__ -D__MINGW32__ %{!ansi:%{mthreads:-D_MT}}}\
    %{!mno-cygwin:-D__CYGWIN32__ -D__CYGWIN__ %{!ansi:-Dunix} -D__unix__ 
-D__unix }\
    %{mwin32|mno-cygwin:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ 
%{!ansi:-DWINNT}}\

-  %{!nostdinc:%{!mno-win32|mno-cygwin:-isystem ../include/w32api%s 
-isystem ../../include/w32api%s}}\
+  %{!nostdinc:%{mwin32|mno-cygwin:-isystem ../../include/w32api%s}}\
+  %{!nostdinc:%{!mno-win32:%{!mwin32:%{!mno-cygwin:-idirafter 
../../include/w32api%s}}}}\
  "

  #undef STARTFILE_SPEC
----------------------------------------------------------------




André Bleau, Cygwin's OpenGL package maintainer.

email: bleau at igb dot umontreal dot ca
(Fight SPAM: encode your email-address)

Please address all questions and problem reports about Cygwin's OpenGL 
package to cygwin AT cygwin DOT com . 


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/