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

(-)makefile.mk (-31 / +33 lines)
Lines 72-88 Link Here
72
# --- Files --------------------------------------------------------
72
# --- Files --------------------------------------------------------
73
.EXPORT : CC CXX
73
.EXPORT : CC CXX
74
.IF "$(COMID)"=="gcc3"
74
.IF "$(COMID)"=="gcc3"
75
TARFILE_NAME=STLport-4.5
75
	TARFILE_NAME=STLport-4.5
76
PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
76
	PATCH_FILE_NAME=STLport-4.5.patch
77
.ELSE			# "$(COMID)"=="gcc3"
77
.ELSE			# "$(COMID)"=="gcc3"
78
.IF "$(OS)"=="MACOSX"
78
	.IF "$(OS)"=="MACOSX"
79
# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
79
		# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
80
TARFILE_NAME=STLport-4.0
80
		TARFILE_NAME=STLport-4.0
81
PATCH_FILE_NAME=STLport-4.0.macosx.patch
81
		PATCH_FILE_NAME=STLport-4.0.macosx.patch
82
.ELSE
82
	.ELSE
83
TARFILE_NAME=STLport-4.0
83
		TARFILE_NAME=STLport-4.0
84
PATCH_FILE_NAME=STLport-4.0.patch
84
		PATCH_FILE_NAME=STLport-4.0.patch
85
.ENDIF			# "$(OS)"=="MACOSX"
85
	.ENDIF			# "$(OS)"=="MACOSX"
86
.ENDIF			# "$(COMID)"=="gcc3"
86
.ENDIF			# "$(COMID)"=="gcc3"
87
87
88
.IF "$(GUI)"=="WNT"
88
.IF "$(GUI)"=="WNT"
Lines 99-105 Link Here
99
TAR_EXCLUDES=*/SC5/*
99
TAR_EXCLUDES=*/SC5/*
100
.ENDIF          # "$(USE_SHELL)"=="4nt"
100
.ENDIF          # "$(USE_SHELL)"=="4nt"
101
101
102
ADDITIONAL_FILES=src$/gcc-3.0.mak
102
ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak
103
103
104
104
105
CONFIGURE_ACTION=none
105
CONFIGURE_ACTION=none
Lines 117-142 Link Here
117
.ENDIF
117
.ENDIF
118
118
119
.IF "$(COM)"=="GCC"
119
.IF "$(COM)"=="GCC"
120
.IF "$(COMID)"=="gcc3"
120
	.IF "$(COMID)"=="gcc3"
121
# FreeBSD needs a special makefile
121
		# FreeBSD needs a special makefile
122
.IF "$(OS)"=="FREEBSD"
122
		.IF "$(OS)"=="FREEBSD"
123
BUILD_FLAGS=-f gcc-3.0-freebsd.mak
123
			BUILD_FLAGS=-f gcc-3.0-freebsd.mak
124
.ELSE
124
		.ELIF "$(OS)"=="MACOSX"
125
BUILD_FLAGS=-f gcc-3.0.mak
125
			BUILD_FLAGS=-f gcc-3.0-macosx.mak
126
.ENDIF
126
		.ELSE
127
.ELSE # "$(COMID)"=="gcc3"
127
			BUILD_FLAGS=-f gcc-3.0.mak
128
# MacOS X/Darwin need a special makefile
128
		.ENDIF
129
.IF "$(OS)"=="MACOSX"
129
	.ELSE # "$(COMID)"=="gcc3"
130
    BUILD_FLAGS=-f gcc-apple-macosx.mak
130
		# MacOS X/Darwin need a special makefile
131
.ELIF "$(OS)"=="FREEBSD"
131
		.IF "$(OS)"=="MACOSX"
132
    BUILD_FLAGS=-f gcc-freebsd.mak
132
			BUILD_FLAGS=-f gcc-apple-macosx.mak
133
.ELSE # "$(OS)"=="MACOSX"
133
		.ELIF "$(OS)"=="FREEBSD"
134
    BUILD_FLAGS=-f gcc.mak
134
			BUILD_FLAGS=-f gcc-freebsd.mak
135
.ENDIF # "$(OS)"=="MACOSX"
135
		.ELSE # "$(OS)"=="MACOSX"
136
.ENDIF # "$(COMID)"=="gcc3"
136
			BUILD_FLAGS=-f gcc.mak
137
BUILD_ACTION=$(GNUMAKE)
137
		.ENDIF # "$(OS)"=="MACOSX"
138
# build in parallel
138
	.ENDIF # "$(COMID)"=="gcc3"
139
BUILD_FLAGS+= -j$(MAXPROCESS)
139
	BUILD_ACTION=$(GNUMAKE)
140
	# build in parallel
141
	BUILD_FLAGS+= -j$(MAXPROCESS)
140
.ENDIF
142
.ENDIF
141
143
142
.IF "$(COM)"=="C52"
144
.IF "$(COM)"=="C52"
(-)prj/d.lst (+1 lines)
Lines 20-24 Link Here
20
..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%\lib*.so*
20
..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%\lib*.so*
21
..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
21
..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
22
..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
22
..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
23
..\%__SRC%\lib\lib*.dylib* %_DEST%\lib%_EXT%\lib*.dylib*
23
..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
24
..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
24
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
25
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll

Return to issue 16417