Merge pull request JuliaLang#796 from JuliaLang/webrepl-libuv

Libuv rewrite of the Web REPL
miau · May 3, 2012 · 6f78a24 · 6f78a24
2 parents 25398d1 + 0660c41
commit 6f78a24
Show file tree

Hide file tree

Showing 6 changed files with 1,117 additions and 1,584 deletions.
diff --git a/ui/webserver/Makefile b/ui/webserver/Makefile
@@ -4,9 +4,16 @@ include $(JULIAHOME)/Make.inc
 override CFLAGS += $(JCFLAGS)
 override CXXFLAGS += $(JCXXFLAGS)
 
-LIBS = -lpthread
+LIBS = -lpthread $(USRLIB)/uv.a 
+ifeq ($(OS), Linux)
+LIBS += -lrt 
+endif
 
-WEBSERVER_SRCS = webserver.cpp server.cpp network.cpp jsoncpp.cpp
+ifeq ($(OS),WINNT)
+LIBS += -lWs2_32 -lIphlpapi -lpsapi
+endif
+
+WEBSERVER_SRCS = webserver.cpp server.cpp jsoncpp.cpp
 
 %.o: %.c
 	$(QUIET_CC)$(CC) $(CFLAGS) $(SHIPFLAGS) -c $< -o $@