X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=geekos%2Fbuild%2FMakefile;fp=geekos%2Fbuild%2FMakefile;h=0601b6d651d2e20aea76403fc0bcd3806727974d;hp=f49bfd242e20f8757f923923f717ccbccd88732c;hb=0275d8e8b9bc4c08095426a20e82054d759094e7;hpb=33b93a80d8b3bf7f4e80aa783a1db4d277d33c35 diff --git a/geekos/build/Makefile b/geekos/build/Makefile index f49bfd2..0601b6d 100644 --- a/geekos/build/Makefile +++ b/geekos/build/Makefile @@ -53,14 +53,14 @@ VPATH := $(PROJECT_ROOT)/src # -#TCPSTACK, uIP is used currently +#uIP, ON -- used, OFF -- not used # UIP=OFF # #LWIP, ON -- used, OFF -- not used # -LWIP=ON +LWIP=OFF # @@ -138,17 +138,11 @@ COMMON_C_SRCS := fmtout.c string.c memmove.c COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o) - - V3_LD_FLAGS := -L./palacios/ #V3_LIBS := -lxed -lv3vee V3_LIBS := ./palacios/libxed.a ./palacios/libv3vee.a ./palacios/libxed.a ./palacios/libv3vee.a - - - - ifeq ($(UIP),ON) UIP_C_SRCS := psock.c timer.c uip_arp.c uip.c uip-fw.c uiplib.c uip-neighbor.c uip-split.c resolv.c UIP_C_OBJS := $(UIP_C_SRCS:%.c=net/%.o) @@ -159,7 +153,7 @@ endif ifeq ($(LWIP),ON) LWIP_OBJS := lwip/*.o - CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG + CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG -DLWIP else LWIP_OBJS := CC_LWIP_OPTS :=