View | Details | Raw Unified
Collapse All | Expand All

(-) Makefile.orig (-16 / +21 lines)
 Lines 12-18    Link Here  

        
# Select the compiler. Normally gcc is used.
# Select the compiler. Normally gcc is used.

        

            

              
CC       = cc   -pipe -L/lib

              
CC       = gcc   -pipe -L/lib

            

        
CC3      = gcc3 -pipe -L/lib
CC3      = gcc3 -pipe -L/lib

        

        

  

    

    

       Lines 20-27
       
    
  Link Here 
    

  

        
# If unset Intel 386 with optimization for Pentium is selected.
# If unset Intel 386 with optimization for Pentium is selected.

        

        
ifdef ARCH
ifdef ARCH

            

              
else

              
ARCH     = #-march=i586 -mcpu=i386

            

            

              
ARCH     = -march=i586 -mcpu=i386

              

            

        
endif
endif

        

        

  

    

    

       Lines 80-86
       
    
  Link Here 
    

  

        
# Name of libraries you need for linking
# Name of libraries you need for linking

        

        
LDADD    = -lm
LDADD    = -lm

            

              
LDADD   += -lesd

              
LDADD   += `esd-config --libs`

            

        
#LDADD  += -lossaudio
#LDADD  += -lossaudio

        
#LDADD  += -lrt
#LDADD  += -lrt

        
#LDADD  += -lsocket -lnsl
#LDADD  += -lsocket -lnsl

  

    

    

       Lines 100-106
       
    
  Link Here 
    

  

        
# Warning options, unset if the compiler makes trouble because of unknown
# Warning options, unset if the compiler makes trouble because of unknown

        
# options
# options

        

            

              
WARN  = \

              
WARN  = #\

            

        
	-Wall                   \
	-Wall                   \

        
	-pedantic               \
	-pedantic               \

        
	-W                      \
	-W                      \

  

    

    

       Lines 143-149
       
    
  Link Here 
    

  

        
	-fstrength-reduce       \
	-fstrength-reduce       \

        
	-fexpensive-optimizations \
	-fexpensive-optimizations \

        
	-funroll-all-loops -fmove-all-movables -fstrength-reduce \
	-funroll-all-loops -fmove-all-movables -fstrength-reduce \

            

              
	-mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5

              
	-mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5

            

        

        
# -fcse-follow-jumps \
# -fcse-follow-jumps \

        

  

    

    

       Lines 156-162
       
    
  Link Here 
    

  

        
	-frerun-loop-opt        \
	-frerun-loop-opt        \

        
	-fstrength-reduce       \
	-fstrength-reduce       \

        
	-fmove-all-movables -fstrength-reduce -fcse-follow-jumps \
	-fmove-all-movables -fstrength-reduce -fcse-follow-jumps \

            

              
	-mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5

              
	-mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5

            

        

        
# Options to generate Assembly code for inspecting
# Options to generate Assembly code for inspecting

        

  

    

    

       Lines 189-195
       
    
  Link Here 
    

  

        

        
# Merge all options together for CFLAGS and CFLAG_SIZE
# Merge all options together for CFLAGS and CFLAG_SIZE

        

            

              
CFLAGS        = $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"

              
CFLAGS       += $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"

            

        
CFLAGS       += -I$(XINCLDIR) -L$(XLIBDIR)
CFLAGS       += -I$(XINCLDIR) -L$(XLIBDIR)

        
#CFLAGS      += $(ASSEM)
#CFLAGS      += $(ASSEM)

        
CFLAGS_SIZE   = $(CFLAGS) $(OPTIM_SIZE)
CFLAGS_SIZE   = $(CFLAGS) $(OPTIM_SIZE)

  

    

    

       Lines 275-284
       
    
  Link Here 
    

  

        

        

        
$(MPPDEC_TARGET): $(MPPDEC_OBJ)
$(MPPDEC_TARGET): $(MPPDEC_OBJ)

            

              
              
ifndef BLDSTATIC

            

        
	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)
	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)

            

              
	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)

              
#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)

            

            

              
	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD)

              
else

            

            

              
	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)-static

              
	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET) $(LDADD)

            

            

              

              
#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)

            

            

              

              
endif

            

        

        

        
$(MPPDEC_TARGET)16: $(MPPDEC_OBJ)
$(MPPDEC_TARGET)16: $(MPPDEC_OBJ)

  

    

    

       Lines 303-312
       
    
  Link Here 
    

  

        

        

        
$(MPPENC_TARGET): $(MPPENC_OBJ)
$(MPPENC_TARGET): $(MPPENC_OBJ)

            

              
              
ifndef BLDSTATIC

            

        
	$(CC)         $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)        $(LDADD)
	$(CC)         $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)        $(LDADD)

            

              
	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)

              
#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)

            

            

              
	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)-static $(LDADD)

              
else

            

            

              
	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)-static

              
	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET) $(LDADD)

            

            

              

              
#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)

            

            

              

              
endif

            

        

        

        
$(MPPDEC_TARGET)-profiling: $(MPPDEC_OBJ)
$(MPPDEC_TARGET)-profiling: $(MPPDEC_OBJ)

  

    

    

       Lines 336-347
       
    
  Link Here 
    

  

        

        
$(REPLAY_TARGET): $(REPLAY_OBJ) mpp.h config.c
$(REPLAY_TARGET): $(REPLAY_OBJ) mpp.h config.c

        
	$(CC) $(CFLAGS) $(REPLAY_OBJ) -o $(REPLAY_TARGET)      $(LDADD)
	$(CC) $(CFLAGS) $(REPLAY_OBJ) -o $(REPLAY_TARGET)      $(LDADD)

            

              
	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)

              
#	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)

            

        

        

        
$(TAGGER_TARGET):
$(TAGGER_TARGET):

        
	$(CC) -DMPP_DECODER $(CFLAGS) -o $(TAGGER_TARGET) $(TAGGER_TARGET).c
	$(CC) -DMPP_DECODER $(CFLAGS) -o $(TAGGER_TARGET) $(TAGGER_TARGET).c

            

              
	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)

              
#	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)

            

        

        

        
$(CLIPSTAT_TARGET):
$(CLIPSTAT_TARGET):