Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 113414 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile-orig (-130 / +99 lines)
Lines 151-169 Link Here
151
151
152
linux-devel:
152
linux-devel:
153
	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
153
	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
154
         LDFLAGS= \
154
	 LDFLAGS= \
155
        CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -g  \
155
	CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -g \
156
		-DOSS -funroll-all-loops \
156
		-DOSS \
157
		-finline-functions -ffast-math' \
157
		-ffast-math' \
158
        mpg123-make
158
	mpg123-make
159
159
160
linux-profile:
160
linux-profile:
161
	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
161
	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
162
         LDFLAGS='-pg' \
162
	 LDFLAGS='-pg' \
163
        CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -pg  \
163
	CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -pg \
164
		-DOSS -funroll-all-loops \
164
		-DOSS \
165
		-finline-functions -ffast-math' \
165
		-ffast-math' \
166
        mpg123-make
166
	mpg123-make
167
167
168
linux:
168
linux:
169
	$(MAKE)  LDFLAGS= \
169
	$(MAKE)  LDFLAGS= \
Lines 171-179 Link Here
171
			audio_oss.o term.o' \
171
			audio_oss.o term.o' \
172
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
172
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
173
			-DOSS -DTERM_CONTROL\
173
			-DOSS -DTERM_CONTROL\
174
			-Wall   \
174
			-Wall \
175
			-fomit-frame-pointer -funroll-all-loops \
175
			-ffast-math' \
176
			-finline-functions -ffast-math' \
177
		mpg123-make
176
		mpg123-make
178
177
179
linux-generic:
178
linux-generic:
Lines 181-188 Link Here
181
		OBJECTS='decode.o dct64.o audio_oss.o' \
180
		OBJECTS='decode.o dct64.o audio_oss.o' \
182
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall \
181
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall \
183
			-DOSS \
182
			-DOSS \
184
			-fomit-frame-pointer -funroll-all-loops \
183
			-ffast-math' \
185
			-finline-functions -ffast-math' \
186
		mpg123-make
184
		mpg123-make
187
185
188
linux-pentium:
186
linux-pentium:
Lines 191-199 Link Here
191
			audio_oss.o term.o' \
189
			audio_oss.o term.o' \
192
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
190
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
193
			-DOSS -DTERM_CONTROL\
191
			-DOSS -DTERM_CONTROL\
194
			-Wall  -mpentium \
192
			-Wall -mpentium \
195
			-fomit-frame-pointer -funroll-all-loops \
193
			-ffast-math' \
196
			-finline-functions -ffast-math' \
197
		mpg123-make
194
		mpg123-make
198
195
199
linux-mmx:
196
linux-mmx:
Lines 202-210 Link Here
202
			audio_oss.o term.o' \
199
			audio_oss.o term.o' \
203
		CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
200
		CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
204
			-DLINUX -DOSS -DTERM_CONTROL\
201
			-DLINUX -DOSS -DTERM_CONTROL\
205
			-Wall   \
202
			-Wall \
206
			-fomit-frame-pointer -funroll-all-loops \
203
			-ffast-math' \
207
			-finline-functions -ffast-math' \
208
		mpg123-make
204
		mpg123-make
209
205
210
linux-3dnow:
206
linux-3dnow:
Lines 214-222 Link Here
214
			equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \
210
			equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \
215
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
211
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
216
			-DUSE_3DNOW -DOSS -DTERM_CONTROL\
212
			-DUSE_3DNOW -DOSS -DTERM_CONTROL\
217
			-Wall   \
213
			-Wall \
218
			-fomit-frame-pointer -funroll-all-loops \
214
			-ffast-math' \
219
			-finline-functions -ffast-math' \
220
		mpg123-make
215
		mpg123-make
221
216
222
217
Lines 227-235 Link Here
227
			dct64_i486-a.o dct64_i486-b.o ' \
222
			dct64_i486-a.o dct64_i486-b.o ' \
228
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
223
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
229
			-DOSS -DTERM_CONTROL\
224
			-DOSS -DTERM_CONTROL\
230
			-Wall   \
225
			-Wall \
231
			-fomit-frame-pointer -funroll-all-loops \
226
			-ffast-math' \
232
			-finline-functions -ffast-math' \
233
		mpg123-make
227
		mpg123-make
234
228
235
linux-esd:
229
linux-esd:
Lines 239-247 Link Here
239
			audio_esd.o' \
233
			audio_esd.o' \
240
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
234
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
241
			-DOSS -DUSE_ESD \
235
			-DOSS -DUSE_ESD \
242
			-Wall    \
236
			-Wall \
243
			-fomit-frame-pointer -funroll-all-loops \
237
			-ffast-math \
244
			-finline-functions -ffast-math \
245
			$(RPM_OPT_FLAGS)' \
238
			$(RPM_OPT_FLAGS)' \
246
		mpg123-make
239
		mpg123-make
247
240
Lines 252-260 Link Here
252
			audio_alsa.o term.o' \
245
			audio_alsa.o term.o' \
253
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
246
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
254
			-DALSA -DTERM_CONTROL\
247
			-DALSA -DTERM_CONTROL\
255
			-Wall    \
248
			-Wall \
256
			-fomit-frame-pointer -funroll-all-loops \
249
			-ffast-math \
257
			-finline-functions -ffast-math \
258
			$(RPM_OPT_FLAGS)' \
250
			$(RPM_OPT_FLAGS)' \
259
		mpg123-make
251
		mpg123-make
260
252
Lines 266-274 Link Here
266
			equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \
258
			equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \
267
		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
259
		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
268
			-DUSE_3DNOW -DALSA -DTERM_CONTROL\
260
			-DUSE_3DNOW -DALSA -DTERM_CONTROL\
269
			-Wall   \
261
			-Wall \
270
			-fomit-frame-pointer -funroll-all-loops \
262
			-ffast-math' \
271
			-finline-functions -ffast-math' \
272
		mpg123-make
263
		mpg123-make
273
264
274
linux-3dnow-esd:
265
linux-3dnow-esd:
Lines 279-287 Link Here
279
			equalizer_3dnow.o decode_i586.o audio_esd.o' \
270
			equalizer_3dnow.o decode_i586.o audio_esd.o' \
280
		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
271
		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
281
			-DUSE_3DNOW -DUSE_ESD \
272
			-DUSE_3DNOW -DUSE_ESD \
282
			-Wall   \
273
			-Wall \
283
			-fomit-frame-pointer -funroll-all-loops \
274
			-ffast-math' \
284
			-finline-functions -ffast-math' \
285
		mpg123-make
275
		mpg123-make
286
276
287
linux-mips-alsa:
277
linux-mips-alsa:
Lines 289-306 Link Here
289
		AUDIO_LIB='-lasound' \
279
		AUDIO_LIB='-lasound' \
290
		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
280
		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
291
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -DALSA \
281
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -DALSA \
292
			-DTERM_CONTROL -Wall   \
282
			-DTERM_CONTROL -Wall \
293
			-fomit-frame-pointer -funroll-all-loops \
283
			-ffast-math \
294
			-finline-functions -ffast-math \
295
			$(RPM_OPT_FLAGS)' \
284
			$(RPM_OPT_FLAGS)' \
296
		mpg123-make
285
		mpg123-make
297
286
298
linux-alpha:
287
linux-alpha:
299
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
288
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
300
		CFLAGS='$(CFLAGS) -DLINUX -DOSS -Wall  \
289
		CFLAGS='$(CFLAGS) -DLINUX -DOSS -Wall \
301
			-fomit-frame-pointer -funroll-all-loops \
290
			-ffast-math \
302
			-finline-functions -ffast-math \
291
			-Wall  -DUSE_MMAP \
303
			-Wall -O6 -DUSE_MMAP \
304
			$(RPM_OPT_FLAGS)' \
292
			$(RPM_OPT_FLAGS)' \
305
		mpg123-make
293
		mpg123-make
306
294
Lines 310-318 Link Here
310
		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
298
		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
311
		CFLAGS='-DLINUX \
299
		CFLAGS='-DLINUX \
312
			-DALSA -DTERM_CONTROL\
300
			-DALSA -DTERM_CONTROL\
313
			-DUSE_MMAP  -O6 \
301
			-DUSE_MMAP  \
314
			-fomit-frame-pointer -funroll-all-loops \
302
			-ffast-math \
315
			-finline-functions -ffast-math \
316
			$(RPM_OPT_FLAGS)' \
303
			$(RPM_OPT_FLAGS)' \
317
		mpg123-make
304
		mpg123-make
318
305
Lines 320-329 Link Here
320
	$(MAKE)  LDFLAGS= \
307
	$(MAKE)  LDFLAGS= \
321
		AUDIO_LIB='-lesd -laudiofile' \
308
		AUDIO_LIB='-lesd -laudiofile' \
322
		OBJECTS='decode.o dct64.o audio_esd.o' \
309
		OBJECTS='decode.o dct64.o audio_esd.o' \
323
		CFLAGS='$(CFLAGS) -DLINUX -DOSS -DUSE_ESD -Wall  \
310
		CFLAGS='$(CFLAGS) -DLINUX -DOSS -DUSE_ESD -Wall \
324
			-fomit-frame-pointer -funroll-all-loops \
311
			-ffast-math \
325
			-finline-functions -ffast-math \
312
			-Wall  -DUSE_MMAP \
326
			-Wall -O6 -DUSE_MMAP \
327
			$(RPM_OPT_FLAGS)' \
313
			$(RPM_OPT_FLAGS)' \
328
		mpg123-make
314
		mpg123-make
329
315
Lines 355-362 Link Here
355
		OBJECTS='decode.o dct64.o audio_oss.o' \
341
		OBJECTS='decode.o dct64.o audio_oss.o' \
356
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  \
342
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  \
357
			-DOSS \
343
			-DOSS \
358
			-fomit-frame-pointer -funroll-all-loops \
344
			-ffast-math' \
359
			-finline-functions -ffast-math' \
360
		mpg123-make
345
		mpg123-make
361
346
362
linux-ppc64-esd:
347
linux-ppc64-esd:
Lines 365-372 Link Here
365
		OBJECTS='decode.o dct64.o audio_esd.o' \
350
		OBJECTS='decode.o dct64.o audio_esd.o' \
366
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  \
351
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  \
367
			-DOSS \
352
			-DOSS \
368
			-fomit-frame-pointer -funroll-all-loops \
353
			-ffast-math' \
369
			-finline-functions -ffast-math' \
370
		mpg123-make
354
		mpg123-make
371
 
355
 
372
linux-ppc:
356
linux-ppc:
Lines 374-381 Link Here
374
		OBJECTS='decode.o dct64.o audio_oss.o' \
358
		OBJECTS='decode.o dct64.o audio_oss.o' \
375
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   \
359
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   \
376
			-DOSS \
360
			-DOSS \
377
			-fomit-frame-pointer -funroll-all-loops \
361
			-ffast-math' \
378
			-finline-functions -ffast-math' \
379
		mpg123-make
362
		mpg123-make
380
363
381
linux-ppc-esd:
364
linux-ppc-esd:
Lines 384-399 Link Here
384
		OBJECTS='decode.o dct64.o audio_esd.o' \
367
		OBJECTS='decode.o dct64.o audio_esd.o' \
385
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   \
368
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   \
386
			-DOSS -DUSE_ESD \
369
			-DOSS -DUSE_ESD \
387
			-fomit-frame-pointer -funroll-all-loops \
370
			-ffast-math' \
388
			-finline-functions -ffast-math' \
389
		mpg123-make
371
		mpg123-make
390
372
391
linux-sparc:
373
linux-sparc:
392
	$(MAKE)   LDFLAGS= \
374
	$(MAKE)   LDFLAGS= \
393
		OBJECTS='decode.o dct64.o audio_sun.o' \
375
		OBJECTS='decode.o dct64.o audio_sun.o' \
394
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall  \
376
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall  \
395
			-fomit-frame-pointer -funroll-all-loops \
377
			-ffast-math' \
396
			-finline-functions -ffast-math' \
397
		mpg123-make
378
		mpg123-make
398
379
399
linux-sparc-esd:
380
linux-sparc-esd:
Lines 401-425 Link Here
401
		AUDIO_LIB='-lesd -laudiofile' \
382
		AUDIO_LIB='-lesd -laudiofile' \
402
		OBJECTS='decode.o dct64.o audio_esd.o' \
383
		OBJECTS='decode.o dct64.o audio_esd.o' \
403
		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall  \
384
		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall  \
404
			-fomit-frame-pointer -funroll-all-loops \
385
			-ffast-math' \
405
			-finline-functions -ffast-math' \
406
		mpg123-make
386
		mpg123-make
407
387
408
388
409
linux-armv4l:
389
linux-armv4l:
410
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
390
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
411
		CFLAGS='-DLINUX -DOSS -Wall  \
391
		CFLAGS='-DLINUX -DOSS -Wall  \
412
			-fomit-frame-pointer -funroll-all-loops \
392
			-ffast-math \
413
			-finline-functions -ffast-math \
393
			-Wall  -DUSE_MMAP' \
414
			-Wall -O6 -DUSE_MMAP' \
394
		mpg123-make
415
                mpg123-make
416
395
417
linux-arm:
396
linux-arm:
418
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
397
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
419
		CFLAGS='-DREAL_IS_FIXED -DLINUX \
398
		CFLAGS='-DREAL_IS_FIXED -DLINUX \
420
			-DOSS -Wall -O6 -march=armv4 \
399
			-DOSS -Wall  -march=armv4 \
421
			-fomit-frame-pointer -funroll-all-loops \
400
			-ffast-math' \
422
			-finline-functions -ffast-math' \
423
		mpg123-make
401
		mpg123-make
424
 
402
 
425
403
Lines 427-434 Link Here
427
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
405
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
428
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX \
406
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX \
429
			-DOSS -DOSS_BIG_ENDIAN -Wall  -m68040 \
407
			-DOSS -DOSS_BIG_ENDIAN -Wall  -m68040 \
430
			-fomit-frame-pointer -funroll-loops \
408
			-ffast-math' \
431
			-finline-functions -ffast-math' \
432
		mpg123-make
409
		mpg123-make
433
410
434
linux-sajber:
411
linux-sajber:
Lines 449-456 Link Here
449
			control_sajber.o control_tk3play.o audio_oss.o' \
426
			control_sajber.o control_tk3play.o audio_oss.o' \
450
		CFLAGS='$(CFLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
427
		CFLAGS='$(CFLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
451
			-DPENTIUM_OPT -DLINUX -Wall   \
428
			-DPENTIUM_OPT -DLINUX -Wall   \
452
			-fomit-frame-pointer -funroll-all-loops \
429
			-ffast-math' \
453
			-finline-functions -ffast-math' \
454
		$(FRONTEND)
430
		$(FRONTEND)
455
431
456
linux-nas:
432
linux-nas:
Lines 460-480 Link Here
460
		CFLAGS='$(CFLAGS) -I/usr/X11R6/include \
436
		CFLAGS='$(CFLAGS) -I/usr/X11R6/include \
461
			-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -DNAS \
437
			-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -DNAS \
462
			-Wall   \
438
			-Wall   \
463
			-fomit-frame-pointer -funroll-all-loops \
439
			-ffast-math' \
464
			-finline-functions -ffast-math' \
465
		mpg123-make
440
		mpg123-make
466
441
467
#### the following defines are for experimental use ... 
442
#### the following defines are for experimental use ... 
468
#
443
#
469
#CFLAGS='$(CFLAGS) -pg -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall   -funroll-all-loops -finline-functions -ffast-math' mpg123
444
#CFLAGS='$(CFLAGS) -pg -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall    -ffast-math' mpg123
470
#CFLAGS='$(CFLAGS) -DI386_ASSEM  -DREAL_IS_FLOAT -DLINUX -Wall -g'
445
#CFLAGS='$(CFLAGS) -DI386_ASSEM  -DREAL_IS_FLOAT -DLINUX -Wall -g'
471
#CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall   -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
446
#CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall    -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
472
447
473
freebsd:
448
freebsd:
474
	$(MAKE) CC=cc LDFLAGS= \
449
	$(MAKE) CC=cc LDFLAGS= \
475
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
450
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
476
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
451
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic   
477
			-funroll-all-loops -ffast-math -DROT_I386 \
452
			-ffast-math -DROT_I386 \
478
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
453
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
479
		mpg123-make
454
		mpg123-make
480
455
Lines 482-491 Link Here
482
	$(MAKE) CC=cc LDFLAGS= \
457
	$(MAKE) CC=cc LDFLAGS= \
483
		OBJECTS='decode_i386.o dct64_i386.o \
458
		OBJECTS='decode_i386.o dct64_i386.o \
484
			decode_i486.o dct64_i486.o audio_oss.o' \
459
			decode_i486.o dct64_i486.o audio_oss.o' \
485
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
460
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic   
486
			-funroll-all-loops -ffast-math -DROT_I386 \
461
			-ffast-math -DROT_I386 \
487
			-DOPT_ARCH=i486 \
462
			-DOPT_ARCH=i486 \
488
			-march=i486 -finline-functions \
463
			-march=i486  \
489
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
464
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
490
		mpg123-make
465
		mpg123-make
491
466
Lines 493-500 Link Here
493
	$(MAKE) CC=cc LDFLAGS= \
468
	$(MAKE) CC=cc LDFLAGS= \
494
		AUDIO_LIB='-lesd -laudiofile' \
469
		AUDIO_LIB='-lesd -laudiofile' \
495
		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
470
		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
496
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
471
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic   
497
			-funroll-all-loops -ffast-math -DROT_I386 \
472
			-ffast-math -DROT_I386 \
498
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD \
473
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD \
499
			-I/usr/local/include -L/usr/local/lib' \
474
			-I/usr/local/include -L/usr/local/lib' \
500
		mpg123-make
475
		mpg123-make
Lines 503-510 Link Here
503
	$(MAKE) CC=cc LDFLAGS= \
478
	$(MAKE) CC=cc LDFLAGS= \
504
		AUDIO_LIB='-L/usr/X11R6/lib -laudio -lXau' \
479
		AUDIO_LIB='-L/usr/X11R6/lib -laudio -lXau' \
505
		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
480
		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
506
		CFLAGS='-Wall -ansi -pedantic -O4  -fomit-frame-pointer \
481
		CFLAGS='-Wall -ansi -pedantic   
507
			-funroll-all-loops -ffast-math -DROT_I386 \
482
			-ffast-math -DROT_I386 \
508
			-DREAD_MMAP \
483
			-DREAD_MMAP \
509
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNAS \
484
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNAS \
510
			-I/usr/X11R6/include -L/usr/X11R6/lib' \
485
			-I/usr/X11R6/include -L/usr/X11R6/lib' \
Lines 514-521 Link Here
514
	$(MAKE) CC=cc LDFLAGS= \
489
	$(MAKE) CC=cc LDFLAGS= \
515
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
490
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
516
			control_sajber.o control_tk3play.o' \
491
			control_sajber.o control_tk3play.o' \
517
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
492
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic   
518
			-funroll-all-loops -ffast-math -DROT_I386 \
493
			-ffast-math -DROT_I386 \
519
			-DFRONTEND \
494
			-DFRONTEND \
520
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
495
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
521
		$(FRONTEND)
496
		$(FRONTEND)
Lines 524-531 Link Here
524
	$(MAKE) CC=cc LDFLAGS='-L/usr/lib' \
499
	$(MAKE) CC=cc LDFLAGS='-L/usr/lib' \
525
		AUDIO_LIB='-lossaudio' \
500
		AUDIO_LIB='-lossaudio' \
526
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
501
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
527
		CFLAGS='-Wall -ansi -pedantic -O4  -fomit-frame-pointer \
502
		CFLAGS='-Wall -ansi -pedantic   
528
			-funroll-all-loops -ffast-math -DROT_I386 \
503
			-ffast-math -DROT_I386 \
529
			-DREAD_MMAP \
504
			-DREAD_MMAP \
530
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
505
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
531
		mpg123-make
506
		mpg123-make
Lines 561-568 Link Here
561
	$(MAKE) CC='gcc' \
536
	$(MAKE) CC='gcc' \
562
		LDFLAGS='-lsocket -lnsl -pg' \
537
		LDFLAGS='-lsocket -lnsl -pg' \
563
		OBJECTS='decode.o dct64.o audio_sun.o' \
538
		OBJECTS='decode.o dct64.o audio_sun.o' \
564
		CFLAGS='$(CFLAGS) -g -pg  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
539
		CFLAGS='$(CFLAGS) -g -pg  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP ' \
565
			-funroll-all-loops -finline-functions' \
566
		mpg123-make
540
		mpg123-make
567
541
568
#	-DREAL_IS_FLOAT 
542
#	-DREAL_IS_FLOAT 
Lines 573-580 Link Here
573
		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
547
		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
574
		CFLAGS='$(CFLAGS)  -Wall -pedantic -DSOLARIS \
548
		CFLAGS='$(CFLAGS)  -Wall -pedantic -DSOLARIS \
575
			-DUSE_MMAP -g \
549
			-DUSE_MMAP -g \
576
			-DTERM_CONTROL \
550
			-DTERM_CONTROL ' \
577
			-funroll-all-loops  -finline-functions' \
578
		mpg123-make
551
		mpg123-make
579
552
580
solaris-gcc-esd:
553
solaris-gcc-esd:
Lines 582-588 Link Here
582
		AUDIO_LIB='-lesd -lresolv' \
555
		AUDIO_LIB='-lesd -lresolv' \
583
		OBJECTS='decode.o dct64.o audio_esd.o' \
556
		OBJECTS='decode.o dct64.o audio_esd.o' \
584
		CFLAGS='$(CFLAGS)  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
557
		CFLAGS='$(CFLAGS)  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
585
			-DUSE_ESD -funroll-all-loops -finline-functions' \
558
			-DUSE_ESD ' \
586
		mpg123-make
559
		mpg123-make
587
560
588
solaris-x86-gcc-oss:
561
solaris-x86-gcc-oss:
Lines 591-598 Link Here
591
			audio_oss.o' \
564
			audio_oss.o' \
592
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \
565
		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \
593
			-DOSS \
566
			-DOSS \
594
			-Wall   \
567
			-Wall   ' \
595
			-funroll-all-loops -finline-functions' \
596
		mpg123-make
568
		mpg123-make
597
569
598
solaris-gcc-nas:
570
solaris-gcc-nas:
Lines 602-615 Link Here
602
		CFLAGS='$(CFLAGS)  -I/usr/openwin/include -Wall \
574
		CFLAGS='$(CFLAGS)  -I/usr/openwin/include -Wall \
603
			-DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
575
			-DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
604
			-DNAS \
576
			-DNAS \
605
			-funroll-all-loops -finline-functions' \
577
			' \
606
		mpg123-make
578
		mpg123-make
607
579
608
sunos:
580
sunos:
609
	$(MAKE)  LDFLAGS= \
581
	$(MAKE)  LDFLAGS= \
610
		OBJECTS='decode.o dct64.o audio_sun.o' \
582
		OBJECTS='decode.o dct64.o audio_sun.o' \
611
		CFLAGS='$(CFLAGS)  -DSUNOS -DREAL_IS_FLOAT -DUSE_MMAP \
583
		CFLAGS='$(CFLAGS)  -DSUNOS -DREAL_IS_FLOAT -DUSE_MMAP \
612
			-funroll-loops' \
584
			' \
613
		mpg123-make
585
		mpg123-make
614
586
615
#		CFLAGS='-DREAL_IS_FLOAT -Aa +O3 -D_HPUX_SOURCE -DHPUX'
587
#		CFLAGS='-DREAL_IS_FLOAT -Aa +O3 -D_HPUX_SOURCE -DHPUX'
Lines 629-635 Link Here
629
601
630
hpux-gcc:
602
hpux-gcc:
631
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' \
603
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' \
632
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -O3 -D_HPUX_SOURCE -DHPUX' \
604
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT  -D_HPUX_SOURCE -DHPUX' \
633
		mpg123-make
605
		mpg123-make
634
sgi:
606
sgi:
635
	$(MAKE) CC=cc LDFLAGS= \
607
	$(MAKE) CC=cc LDFLAGS= \
Lines 648-661 Link Here
648
dec:
620
dec:
649
	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_dec.o' \
621
	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_dec.o' \
650
		AUDIO_LIB=-lmme \
622
		AUDIO_LIB=-lmme \
651
		CFLAGS='$(CFLAGS) -std1 -warnprotos -O4 -DUSE_MMAP \
623
		CFLAGS='$(CFLAGS) -std1 -warnprotos  -DUSE_MMAP \
652
			-I/usr/include/mme' \
624
			-I/usr/include/mme' \
653
		mpg123-make
625
		mpg123-make
654
626
655
dec-esd:
627
dec-esd:
656
	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_esd.o' \
628
	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_esd.o' \
657
		AUDIO_LIB='-lesd -laudiofile' \
629
		AUDIO_LIB='-lesd -laudiofile' \
658
		CFLAGS='$(CFLAGS) -std1 -warnprotos -O4 -DUSE_MMAP \
630
		CFLAGS='$(CFLAGS) -std1 -warnprotos  -DUSE_MMAP \
659
			-I/usr/include/mme `esd-config --cflags`' \
631
			-I/usr/include/mme `esd-config --cflags`' \
660
		mpg123-make
632
		mpg123-make
661
633
Lines 663-669 Link Here
663
	$(MAKE) CC=cc LDFLAGS='-L/usr/X11R6/lib' \
635
	$(MAKE) CC=cc LDFLAGS='-L/usr/X11R6/lib' \
664
		AUDIO_LIB='-laudio -lXau -ldnet_stub'\
636
		AUDIO_LIB='-laudio -lXau -ldnet_stub'\
665
		OBJECTS='decode.o dct64.o  audio_nas.o' \
637
		OBJECTS='decode.o dct64.o  audio_nas.o' \
666
		CFLAGS='$(CFLAGS) -I/usr/X11R6/include -std1 -warnprotos -O4 -DUSE_MMAP' \
638
		CFLAGS='$(CFLAGS) -I/usr/X11R6/include -std1 -warnprotos  -DUSE_MMAP' \
667
		mpg123-make
639
		mpg123-make
668
640
669
ultrix:
641
ultrix:
Lines 673-693 Link Here
673
645
674
aix-gcc:
646
aix-gcc:
675
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
647
	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
676
		CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DREAL_IS_FLOAT \
648
		CFLAGS='$(CFLAGS) -DAIX -Wall  -DUSE_MMAP -DREAL_IS_FLOAT \
677
			-fomit-frame-pointer -funroll-all-loops \
649
			-ffast-math' \
678
			-finline-functions -ffast-math' \
679
		mpg123-make
650
		mpg123-make
680
651
681
aix-xlc:
652
aix-xlc:
682
	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
653
	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
683
		CFLAGS="$(CFLAGS) -O3 -qstrict -qcpluscmt -DAIX -DUSE_MMAP \
654
		CFLAGS="$(CFLAGS)  -qstrict -qcpluscmt -DAIX -DUSE_MMAP \
684
		mpg123-make
655
		mpg123-make
685
656
686
657
687
aix-ums:
658
aix-ums:
688
	$(MAKE) LDFLAGS='-L/usr/lpp/som/lib -lUMSobj' \
659
	$(MAKE) LDFLAGS='-L/usr/lpp/som/lib -lUMSobj' \
689
		OBJECTS='decode.o dct64.o audio_aixums.o term.o' \
660
		OBJECTS='decode.o dct64.o audio_aixums.o term.o' \
690
		CFLAGS="$(CFLAGS) -O3 -qstrict -qcpluscmt -DAIX -DAIX_UMS \
661
		CFLAGS="$(CFLAGS)  -qstrict -qcpluscmt -DAIX -DAIX_UMS \
691
			-DUSE_MMAP -DTERM_CONTROL \
662
			-DUSE_MMAP -DTERM_CONTROL \
692
			-DREAD_MMAP -I/usr/lpp/UMS/include \
663
			-DREAD_MMAP -I/usr/lpp/UMS/include \
693
			-I/usr/lpp/som/include" \
664
			-I/usr/lpp/som/include" \
Lines 700-741 Link Here
700
aix-frontend:
671
aix-frontend:
701
	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o \
672
	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o \
702
			control_sajber.o control_tk3play.o' \
673
			control_sajber.o control_tk3play.o' \
703
		CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DFRONTEND \
674
		CFLAGS='$(CFLAGS) -DAIX -Wall  -DUSE_MMAP -DFRONTEND \
704
			-fomit-frame-pointer -funroll-all-loops \
675
			-ffast-math' \
705
			-finline-functions -ffast-math' \
706
		$(FRONTEND)
676
		$(FRONTEND)
707
677
708
os2:
678
os2:
709
	$(MAKE)  LDFLAGS= \
679
	$(MAKE)  LDFLAGS= \
710
		OBJECTS='decode_i386.o dct64_i386.o audio_os2.o' \
680
		OBJECTS='decode_i386.o dct64_i386.o audio_os2.o' \
711
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall   \
681
		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall   \
712
		-fomit-frame-pointer -funroll-all-loops \
682
		-ffast-math' \
713
		-finline-functions -ffast-math' \
714
		LIBS='-los2me -lsocket' \
683
		LIBS='-los2me -lsocket' \
715
		mpg123.exe
684
		mpg123.exe
716
685
717
netbsd:
686
netbsd:
718
	$(MAKE) CC=cc LDFLAGS= \
687
	$(MAKE) CC=cc LDFLAGS= \
719
		OBJECTS='decode.o dct64.o audio_sun.o' \
688
		OBJECTS='decode.o dct64.o audio_sun.o' \
720
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
689
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic  
721
			-funroll-all-loops -ffast-math \
690
			-ffast-math \
722
			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
691
			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
723
		mpg123-make
692
		mpg123-make
724
693
725
netbsd-i386:
694
netbsd-i386:
726
	$(MAKE) CC=cc LDFLAGS= \
695
	$(MAKE) CC=cc LDFLAGS= \
727
		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
696
		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
728
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
697
		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic   
729
			-funroll-all-loops -ffast-math -DROT_I386 \
698
			-ffast-math -DROT_I386 \
730
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
699
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
731
		mpg123-make
700
		mpg123-make
732
701
733
bsdos:
702
bsdos:
734
	$(MAKE) CC=shlicc2 LDFLAGS= \
703
	$(MAKE) CC=shlicc2 LDFLAGS= \
735
		OBJECTS='decode_i386.o dct64_i386.o \
704
		OBJECTS='decode_i386.o dct64_i386.o \
736
			 audio_oss.o' \
705
			audio_oss.o' \
737
		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
706
		CFLAGS='$(CFLAGS) -Wall   
738
			-funroll-all-loops -ffast-math -DROT_I386 \
707
			-ffast-math -DROT_I386 \
739
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
708
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
740
			-DDONT_CATCH_SIGNALS' \
709
			-DDONT_CATCH_SIGNALS' \
741
		mpg123-make
710
		mpg123-make
Lines 743-750 Link Here
743
bsdos4:
712
bsdos4:
744
	$(MAKE)  LDFLAGS= \
713
	$(MAKE)  LDFLAGS= \
745
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
714
		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
746
		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
715
		CFLAGS='$(CFLAGS) -Wall   
747
			-funroll-all-loops -ffast-math -DROT_I386 \
716
			-ffast-math -DROT_I386 \
748
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
717
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
749
			-DDONT_CATCH_SIGNALS' \
718
			-DDONT_CATCH_SIGNALS' \
750
		mpg123-make
719
		mpg123-make
Lines 754-761 Link Here
754
		AUDIO_LIB='-laudio -lXau -L/usr/X11R6/lib' \
723
		AUDIO_LIB='-laudio -lXau -L/usr/X11R6/lib' \
755
		OBJECTS='decode_i386.o dct64_i386.o \
724
		OBJECTS='decode_i386.o dct64_i386.o \
756
			audio_nas.o' \
725
			audio_nas.o' \
757
		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
726
		CFLAGS='$(CFLAGS) -Wall \
758
			-funroll-all-loops -ffast-math -DROT_I386 \
727
			-ffast-math -DROT_I386 \
759
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
728
			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
760
			-DDONT_CATCH_SIGNALS -DNAS' \
729
			-DDONT_CATCH_SIGNALS -DNAS' \
761
		mpg123-make
730
		mpg123-make
Lines 763-771 Link Here
763
mint:
732
mint:
764
	$(MAKE)  LDFLAGS= \
733
	$(MAKE)  LDFLAGS= \
765
		OBJECTS='decode.o dct64.o audio_mint.o' \
734
		OBJECTS='decode.o dct64.o audio_mint.o' \
766
		CFLAGS='$(CFLAGS) -Wall  -m68020-40 -m68881 \
735
		CFLAGS='$(CFLAGS) -Wall -m68020-40 -m68881 \
767
		-fomit-frame-pointer -funroll-all-loops \
736
		
768
		-finline-functions -ffast-math \
737
		-ffast-math \
769
		-DREAL_IS_FLOAT -DMINT -DNOXFERMEM' \
738
		-DREAL_IS_FLOAT -DMINT -DNOXFERMEM' \
770
		AUDIO_LIB='-lsocket' \
739
		AUDIO_LIB='-lsocket' \
771
		mpg123-make
740
		mpg123-make

Return to bug 113414