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
This commit is contained in:
parent
3bc1a8e6f0
commit
9954786be2
@ -318,20 +318,12 @@ ifeq ($(wxUSE_GUI),0)
|
|||||||
OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
|
OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
|
||||||
endif
|
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!
|
# how do you do "VAR=\" ? BLEAGH!
|
||||||
BACKSLASH=$(subst a,\,a)
|
BACKSLASH=$(subst a,\,a)
|
||||||
ifeq (,$(findstring /,$(PATH)))
|
ifeq (,$(findstring $(OSTYPE),"cygwin!msys"))
|
||||||
IS_CYGWIN=0
|
|
||||||
PATH_SEPARATOR:=$(BACKSLASH)
|
PATH_SEPARATOR:=$(BACKSLASH)
|
||||||
PATH_SUBST=/
|
PATH_SUBST=/
|
||||||
else
|
else
|
||||||
IS_CYGWIN=1
|
|
||||||
PATH_SEPARATOR=/
|
PATH_SEPARATOR=/
|
||||||
PATH_SUBST:=$(BACKSLASH)
|
PATH_SUBST:=$(BACKSLASH)
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user