Difference for ./makefile from version 1.3 to 1.4


version 1.3 version 1.4
Line 98
 
Line 98
 LINKLIBS += -ldinput -lddraw -ldsound -ldxguid -lwsock32 -lwinmm -luser32 -lkernel32  LINKLIBS += -ldinput -lddraw -ldsound -ldxguid -lwsock32 -lwinmm -luser32 -lkernel32
 endif  endif
   
   ifdef D1XD3D
   LIBS += $(LIBDIR)d3dframe.$(ARC) $(LIBDIR)d1x.res
   endif
   ifdef ENV_MSVC
   LINKLIBS += dinput.lib ddraw.lib dsound.lib dxguid.lib wsock32.lib \
    winmm.lib user32.lib kernel32.lib gdi32.lib
   ifdef DEBUG
   LINKLIBS += msvcrtd.lib
   else
   LINKLIBS += msvcrt.lib
   endif
   ifdef RELEASE
   LFLAGS = -OPT:REF -PDB:NONE
   else
   LFLAGS = -DEBUG -DEBUGTYPE:CV -PDB:$(TOPDIR)/lib/
   endif
   endif
   
 ifdef SCRIPT  ifdef SCRIPT
 LIBS += $(LIBDIR)script.$(ARC)  LIBS += $(LIBDIR)script.$(ARC)
 E_CFLAGS += -DSCRIPT  E_CFLAGS += -DSCRIPT
Line 158
 
Line 176
   
 include $(TOPDIR)/rules.mak  include $(TOPDIR)/rules.mak
   
   ifdef ENV_MSVC
   $(OUTPUT):  $(SUBDIRS) $(LIBS)
    link $(LFLAGS) -out:$(OUTPUT)  -machine:i386 -subsystem:console $(LIBS) $(LINKLIBS)
   else
 $(OUTPUT):  $(SUBDIRS) $(LIBS)  $(OUTPUT):  $(SUBDIRS) $(LIBS)
 ifdef CHECKER  ifdef CHECKER
  $(CC)  -o $(OUTPUT) $(TOPDIR)/main/inferno.o $(TOPDIR)/misc/checker.o $(LIBS) $(LINKLIBS)    $(CC)  -o $(OUTPUT) $(TOPDIR)/main/inferno.o $(TOPDIR)/misc/checker.o $(LIBS) $(LINKLIBS)
Line 165
 
Line 187
  $(CC)  -o $(OUTPUT) $(LIBS) $(LINKLIBS)    $(CC)  -o $(OUTPUT) $(LIBS) $(LINKLIBS)
 ifdef RELEASE  ifdef RELEASE
  strip --strip-all $(OUTPUT)   strip --strip-all $(OUTPUT)
   endif
 endif  endif
 endif  endif
 # ld -X -o d1x.exe -L $(DJDIR)/lib $(OBJECTS) $(LIBS) $(DJDIR)/lib/crt0.o -lc -lgcc -T $(DJDIR)/lib/djgpp.djl  # ld -X -o d1x.exe -L $(DJDIR)/lib $(OBJECTS) $(LIBS) $(DJDIR)/lib/crt0.o -lc -lgcc -T $(DJDIR)/lib/djgpp.djl

Legend:
line(s) removed in v.1.3 
line(s) changed
 line(s) added in v.1.4