X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=geekos%2Fbuild%2FMakefile;h=210b39a4ae73b82a4d65e71ff2ded1672e742653;hp=1877773ae5d5d03efd9bf4d46e68187874af4258;hb=452885dcf15a56694ba283a079877ac38b545b0f;hpb=9ba3dfc76b6572ac3a71e4b1be6cd4f9cf28f593

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index 1877773..210b39a 100644
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -53,7 +53,7 @@ VPATH := $(PROJECT_ROOT)/src
 
 
 #
-#TCPSTACK, uIP is used currently
+#uIP, ON -- used, OFF -- not used
 #
 UIP=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
 V3_OBJS := ./palacios/libxed.a ./palacios/libv3vee.a ./palacios/vm_kernel
 
-
-
-
-
 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)
@@ -158,8 +152,13 @@ else
 endif
 
 ifeq ($(LWIP),ON)
+<<<<<<< HEAD:geekos/build/Makefile
 	LWIP_OBJS := lwip
 	CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG
+=======
+	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 -DLWIP
+>>>>>>> 64bit:geekos/build/Makefile
 else
 	LWIP_OBJS := 
 	CC_LWIP_OPTS :=