hewei преди 6 години
родител
ревизия
f6bc874d39
променени са 4 файла, в които са добавени 42 реда и са изтрити 7 реда
  1. 35 0
      BUILD.md
  2. 1 1
      Makefile
  3. 4 4
      Makefile.in
  4. 2 2
      configure

+ 35 - 0
BUILD.md

@@ -0,0 +1,35 @@
+## Required
+
+- c99
+- c++11
+
+gcc4.8+, msvc2013+
+
+## Unix
+```
+./configure
+make
+sudo make install
+```
+
+## CROSS_COMPILE
+```
+export CROSS_COMPILE=arm-linux-androideabi-
+./configure
+make
+```
+
+## Windows
+### MSVC
+winbuild/libhv/libhv.sln
+
+### mingw
+see CROSS_COMPILE
+
+for examples
+```
+sudo apt-get install mingw-w64 # ubuntu
+export CROSS_COMPILE=x86_64-w64-mingw32-
+./configure
+make
+```

+ 1 - 1
Makefile

@@ -8,7 +8,7 @@ all: libhv examples
 examples: test timer loop tcp udp nc nmap httpd curl consul_cli
 
 clean:
-	$(MAKEF) clean SRCDIRS=". base utils event http http/client http/server protocol examples $(TMPDIR)"
+	$(MAKEF) clean SRCDIRS=". base utils event http http/client http/server protocol examples consul $(TMPDIR)"
 
 prepare:
 	$(MKDIR) -p $(TMPDIR) lib bin

+ 4 - 4
Makefile.in

@@ -159,7 +159,7 @@ else
 ifeq ($(OS), Android)
 	LDFLAGS += -lstdc++ -lm -llog -ldl
 else
-	LDFLAGS += -lstdc++ -lpthread -lm -ldl
+	LDFLAGS += -lstdc++ -lpthread -lm -ldl -lrt
 endif
 endif
 
@@ -198,9 +198,9 @@ $(info BUILD_TYPE       = $(BUILD_TYPE))
 $(info SRCS=$(SRCS))
 $(info OBJS=$(OBJS))
 
-$(info INSTALLED_INCS=$(INSTALLED_INCS))
-$(info INSTALLED_LIBS=$(INSTALLED_LIBS))
-$(info INSTALLED_BINS=$(INSTALLED_BINS))
+#$(info INSTALLED_INCS=$(INSTALLED_INCS))
+#$(info INSTALLED_LIBS=$(INSTALLED_LIBS))
+#$(info INSTALLED_BINS=$(INSTALLED_BINS))
 
 default: all
 

+ 2 - 2
configure

@@ -11,8 +11,8 @@ END
 # Checks for compiler
 echo "checking for compiler..."
 if [ $CROSS_COMPILE ]; then
-    $CC  = ${CROSS_COMPILE}gcc
-    $CXX = ${CROSS_COMPILE}g++
+    CC=${CROSS_COMPILE}gcc
+    CXX=${CROSS_COMPILE}g++
 fi
 
 if [ ! $CC ]; then