Difference for ./rules.mak from version 1.20 to 1.21


version 1.20 version 1.21
Line 35
 
Line 35
 ARC = a  ARC = a
 #CC = egcc  #CC = egcc
 CC = gcc  CC = gcc
   ifdef ENV_DJGPP
   CXX = gxx
   else
   CXX = g++
   endif
 ifdef CHECKER  ifdef CHECKER
 CC = $(CHECKER)  CC = $(CHECKER)
 LINKLIBS += -lm  LINKLIBS += -lm
Line 47
 
Line 52
 CFLAGS += -fomit-frame-pointer  CFLAGS += -fomit-frame-pointer
 endif #!DEBUGABLE  endif #!DEBUGABLE
 endif #!DEBUG  endif #!DEBUG
   ifdef MINGW_EXTRA
   CFLAGS += -I$(MINGW_EXTRA)/include
   LFLAGS += -L$(MINGW_EXTRA)/lib
   endif
 ifdef ENV_CYGWIN  ifdef ENV_CYGWIN
 CFLAGS += -mno-cygwin  CFLAGS += -mno-cygwin
 LFLAGS += -mno-cygwin  LFLAGS += -mno-cygwin
Line 89
 
Line 98
   
 ifdef ENV_DJGPP  ifdef ENV_DJGPP
 CFLAGS += -I$(TOPDIR)/arch/dos/include  CFLAGS += -I$(TOPDIR)/arch/dos/include
   ifdef ENV_DJGPP_REALDOS
   NASM = nasm -f coff
   else
 NASM = nasmw -f coff  NASM = nasmw -f coff
   endif
   
 ifdef ALLEGRO  ifdef ALLEGRO
 CFLAGS += -DALLEGRO  CFLAGS += -DALLEGRO
Line 103
 
Line 116
   
 endif  endif
   
   ifdef SUPPORTS_NET_IP
   CFLAGS += -DSUPPORTS_NET_IP
   endif
 ifdef BIGENDIAN  ifdef BIGENDIAN
 CFLAGS += -DBIGENDIAN  CFLAGS += -DBIGENDIAN
 endif  endif
Line 216
 
Line 232
   
 %.o: %.c  %.o: %.c
  $(CC) $(CFLAGS) $(E_CFLAGS) -o $@ $<   $(CC) $(CFLAGS) $(E_CFLAGS) -o $@ $<
   %.o: %.cpp
    $(CXX) $(CFLAGS) $(E_CFLAGS) -o $@ $<
 %.o: %.asm  %.o: %.asm
  $(NASM) $< -o $@   $(NASM) $< -o $@
 %.o: %.s  %.o: %.s
Line 249
 
Line 267
 ifdef CRAPPY_SHELL  ifdef CRAPPY_SHELL
 CLEANOBJ=rm -f *.$(OBJ)  CLEANOBJ=rm -f *.$(OBJ)
 else  else
 CLEANOBJ=rm -f $(OBJECTS)  CLEANOBJ=rm -f $(OBJECTS) $(MISCOBJECTS)
 endif  endif
 endif  endif
 ifdef OUTPUT  ifdef OUTPUT
 CLEANOUT=rm -f $(OUTPUT)  CLEANOUT=rm -f $(OUTPUT) $(MISCOUTPUT)
 endif  endif

Legend:
line(s) removed in v.1.20 
line(s) changed
 line(s) added in v.1.21