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

(-)inc/unxmacxp.mk (+5 lines)
Lines 180-185 Link Here
180
INCGUI+= -I$(PRJ)$/unx/inc
180
INCGUI+= -I$(PRJ)$/unx/inc
181
.ENDIF
181
.ENDIF
182
182
183
# [ed] 9/1/02 Since we've removed the internal freetype, add the default X11R6 path onto the linkline
184
.IF "$(GUIBASE)" == "unx"
185
INCGUI+= -I/usr/X11R6/include/freetype2
186
.ENDIF
187
183
LINKFLAGSAPPGUI=
188
LINKFLAGSAPPGUI=
184
.IF "$(UNIXVERSIONNAMES)"!=""
189
.IF "$(UNIXVERSIONNAMES)"!=""
185
LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
190
LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
(-)unxmacxp/bin/init-static-template-data (-1 / +1 lines)
Lines 146-152 Link Here
146
	# instance that c++filt can process
146
	# instance that c++filt can process
147
	paramcount=`printf "$tokens" | awk '{print NF - 1}'`
147
	paramcount=`printf "$tokens" | awk '{print NF - 1}'`
148
	classtoken=`printf "$tokens" | awk '{print $1}' | sed 's/'"$paramcount"'$//'`
148
	classtoken=`printf "$tokens" | awk '{print $1}' | sed 's/'"$paramcount"'$//'`
149
	paramtoken=`print "$tokens" | awk '{print $2}'`
149
	paramtoken=`printf "$tokens" | awk '{print $2}'`
150
	datamembertoken=`printf "$tokens" | awk '{print $NF}' | sed 's/^.*\.//'`
150
	datamembertoken=`printf "$tokens" | awk '{print $NF}' | sed 's/^.*\.//'`
151
151
152
	# Unmangle name
152
	# Unmangle name

Return to issue 7458