From: Mattia Barbon Date: Sat, 15 Jun 2002 14:58:47 +0000 (+0000) Subject: Better detection for Cygwin; thanks to Oscar Fuentes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9954786be2821b93757dee38f51e1fbd9cc35a58 Better detection for Cygwin; thanks to Oscar Fuentes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t index f720c1d5ad..ea576f935b 100644 --- a/distrib/msw/tmake/g95.t +++ b/distrib/msw/tmake/g95.t @@ -318,20 +318,12 @@ ifeq ($(wxUSE_GUI),0) OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE) endif -# MBN: if anyone has a better solution for this kludge, step -# forward, *please* -# this tests is we are on cygwin or not ( will _not_ work if you are using -# ZSH on plain Win32, tought ); it uses the presence of "/" -# in the PATH variable - # how do you do "VAR=\" ? BLEAGH! BACKSLASH=$(subst a,\,a) -ifeq (,$(findstring /,$(PATH))) - IS_CYGWIN=0 +ifeq (,$(findstring $(OSTYPE),"cygwin!msys")) PATH_SEPARATOR:=$(BACKSLASH) PATH_SUBST=/ else - IS_CYGWIN=1 PATH_SEPARATOR=/ PATH_SUBST:=$(BACKSLASH) endif