Attachment #16890 for issue #32110

View | Details | Raw Unified | Return to issue 32110
Collapse All | Expand All

Lines 67-75 Link Here

(-)solenv/inc/tg_ext.mk (-2 / +2 lines)
67	# setup INCLUDE variable for use by VC++	67	# setup INCLUDE variable for use by VC++
68	.IF "$(GUI)$(COM)"=="WNTMSC"	68	.IF "$(GUI)$(COM)"=="WNTMSC"
69	.IF "$(EXT_USE_STLPORT)"==""	69	.IF "$(EXT_USE_STLPORT)"==""
70	INCLUDE!:=$(shell $(WRAPCMD) echo $(SOLARINC) \| sed 's/\\stl//g;s/[ \t]*-I/;/g' )	70	INCLUDE!:=$(shell $(WRAPCMD) echo $(SOLARINC) \| sed 's/$(EES)\$(EES)\stl//g;s/[ $(EES)\t]*-I/;/g' )
71	.ELSE # "$(EXT_USE_STLPORT)"==""	71	.ELSE # "$(EXT_USE_STLPORT)"==""
72	INCLUDE!:=$(shell $(WRAPCMD) echo $(SOLARINC) \| sed "s/[ \t]*-I/;/g" )	72	INCLUDE!:=$(shell $(WRAPCMD) echo $(SOLARINC) \| sed 's/[ $(EES)\t]*-I/;/g' )
73	.ENDIF # "$(EXT_USE_STLPORT)"==""	73	.ENDIF # "$(EXT_USE_STLPORT)"==""
74	.EXPORT : INCLUDE	74	.EXPORT : INCLUDE
75	.ENDIF # "$(GUI)$(COM)"=="WNTMSC"	75	.ENDIF # "$(GUI)$(COM)"=="WNTMSC"




#
#
#*************************************************************************

# Not 4nt means $(GUI)==UNX or $(GUI)==WNT with tcsh
.IF "$(USE_SHELL)"!="4nt"
# iz32110: Calling a cygwin application from a non-cygwin shell requires
# backslashes to be escaped by another backslash: EES .. extra escape slash
EES=
NULLDEV=/dev/null
.ELSE
EES=\
NULLDEV=nul
.ENDIF

.IF "$(GUI)"=="WNT"
AWK*=awk
SORT*=sort


.IF "$(GUI)"=="UNX"
SCP_CHECK_TOOL=checkscp
NULLDEV=/dev/null
.ELIF "$(GUI)"=="WNT"
.IF "$(USE_SHELL)"!="4nt"
NULLDEV=/dev/null
.ELSE
NULLDEV=nul
.ENDIF
.ENDIF


Return to issue 32110

Lines 59-64 Link Here

(-)solenv/inc/unitools.mk (-7 / +12 lines)
59	#	59	#
60	#	60	#
61	#*************************************************************************	61	#*************************************************************************
		62
		63	# Not 4nt means $(GUI)==UNX or $(GUI)==WNT with tcsh
		64	.IF "$(USE_SHELL)"!="4nt"
		65	# iz32110: Calling a cygwin application from a non-cygwin shell requires
		66	# backslashes to be escaped by another backslash: EES .. extra escape slash
		67	EES=
		68	NULLDEV=/dev/null
		69	.ELSE
		70	EES=\
		71	NULLDEV=nul
		72	.ENDIF
		73
62	.IF "$(GUI)"=="WNT"	74	.IF "$(GUI)"=="WNT"
63	AWK*=awk	75	AWK*=awk
64	SORT*=sort	76	SORT*=sort
Lines 139-150 Link Here
139		151
140	.IF "$(GUI)"=="UNX"	152	.IF "$(GUI)"=="UNX"
141	SCP_CHECK_TOOL=checkscp	153	SCP_CHECK_TOOL=checkscp
142	NULLDEV=/dev/null
143	.ELIF "$(GUI)"=="WNT"
144	.IF "$(USE_SHELL)"!="4nt"
145	NULLDEV=/dev/null
146	.ELSE
147	NULLDEV=nul
148	.ENDIF
149	.ENDIF	154	.ENDIF
150		155