version 1.13 | | version 1.14 |
---|
| | |
ifdef CHECKER | | ifdef CHECKER |
$(CC) $(LFLAGS) -o $(OUTPUT) $(TOPDIR)/main/inferno.o $(TOPDIR)/misc/checker.o $(LIBS) $(LINKLIBS) | | $(CC) $(LFLAGS) -o $(OUTPUT) $(TOPDIR)/main/inferno.o $(TOPDIR)/misc/checker.o $(LIBS) $(LINKLIBS) |
else | | else |
$(CC) $(LFLAGS) -o $(OUTPUT) $(LIBS) $(LINKLIBS) | | $(CXX) $(LFLAGS) -o $(OUTPUT) $(LIBS) $(LINKLIBS) |
ifdef RELEASE | | ifdef RELEASE |
ifndef DEBUGABLE | | ifndef DEBUGABLE |
strip --strip-all $(OUTPUT) | | strip --strip-all $(OUTPUT) |
| | |
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 |
| | |
| | ifdef SUPPORTS_NET_IP |
| | IP_DAEMON_OUTPUT=d1x_udpd_$(D1XMAJOR)$(D1XMINOR)$(SHRWR)$(DBG)$(EXT) |
| | #IP_DAEMON_LIBS=$(TOPDIR)/main/ipserver.$(OBJ) $(TOPDIR)/main/ip_base.$(OBJ) $(TOPDIR)/main/ipclient.$(OBJ) $(TOPDIR)/arch/linux/arch_ip.$(OBJ) |
| | IP_DAEMON_LIBS=$(TOPDIR)/main/ipserver.$(OBJ) $(TOPDIR)/arch/linux/arch_ip.$(OBJ) $(TOPDIR)/main/ip_base.$(OBJ) $(TOPDIR)/arch/linux/timer.$(OBJ) $(TOPDIR)/arch/linux/mono.$(OBJ) $(TOPDIR)/lib/maths.a |
| | |
| | d1x_udpd udpd ip_daemon udp_daemon: $(IP_DAEMON_OUTPUT) |
| | |
| | $(IP_DAEMON_OUTPUT): $(SUBDIRS) $(IP_DAEMON_LIBS) |
| | $(CC) $(LFLAGS) -o $(IP_DAEMON_OUTPUT) $(IP_DAEMON_LIBS) |
| | endif |
| | |
$(SUBDIRS): dummy | | $(SUBDIRS): dummy |
make -C $@ | | make -C $@ |