refine folder as follow:

├── src ├── include ├── gear-lib ├── build.sh └── Makefile
gozfree · Aug 2, 2019 · 2a74175 · 2a74175
1 parent 6801a79
commit 2a74175
Show file tree

Hide file tree

Showing 510 changed files with 377 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,118 @@
+###############################################################################
+# common
+###############################################################################
+#ARCH: linux/pi/android/ios/
+ARCH		?= linux
+CROSS_PREFIX	?=
+OUTPUT		?= /usr/local
+BUILD_DIR	:= $(shell pwd)/../build/
+ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
+COLOR_INC	:= $(BUILD_DIR)/color.inc
+
+ifeq ($(ARCH_INC), $(wildcard $(ARCH_INC)))
+include $(ARCH_INC)
+endif
+
+
+CC	= $(CROSS_PREFIX)gcc
+CXX	= $(CROSS_PREFIX)g++
+LD	= $(CROSS_PREFIX)ld
+AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
+
+ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
+include $(COLOR_INC)
+else
+CC_V	= $(CC)
+CXX_V	= $(CXX)
+LD_V	= $(LD)
+AR_V	= $(AR)
+CP_V	= $(CP)
+RM_V	= $(RM)
+endif
+
+###############################################################################
+# target and object
+###############################################################################
+LIBNAME		= libgear
+VERSION_SH	= $(shell pwd)/src/version.sh $(LIBNAME)
+VER		= $(shell $(VERSION_SH); awk '/define\ $(LIBNAME)_version/{print $$3}' version.h)
+TGT_LIB_H	= $(LIBNAME).h
+TGT_LIB_A	= $(LIBNAME).a
+TGT_LIB_SO	= $(LIBNAME).so
+TGT_LIB_SO_VER	= $(TGT_LIB_SO).${VER}
+
+OBJS_LIB := $(patsubst %.c,%.o,$(wildcard src/*.c))
+
+
+###############################################################################
+# cflags and ldflags
+###############################################################################
+
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
+CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
+ifeq ($(OUTPUT),/usr/local)
+OUTLIBPATH := /usr/local
+else
+OUTLIBPATH := $(OUTPUT)/$(LTYPE)
+endif
+CFLAGS	+= $($(ARCH)_CFLAGS)
+CFLAGS	+= -Iinclude
+CFLAGS	+= -I$(OUTPUT)/include
+
+CFLAGS	+= -DNO_CRYPTO
+
+SHARED	:= -shared
+
+LDFLAGS	:= $($(ARCH)_LDFLAGS)
+LDFLAGS	+= -pthread
+
+###############################################################################
+# target
+###############################################################################
+.PHONY : all clean
+
+TGT	:= $(TGT_LIB_A)
+TGT	+= $(TGT_LIB_SO)
+
+OBJS	:= $(OBJS_LIB)
+
+all: $(TGT)
+
+%.o:%.c
+	$(CC_V) -c $(CFLAGS) $< -o $@
+
+$(TGT_LIB_A): $(OBJS_LIB)
+	$(AR_V) rcs $@ $^
+
+$(TGT_LIB_SO): $(OBJS_LIB)
+	$(LD_V) -o $@ $^ $(SHARED)
+	@mv $(TGT_LIB_SO) $(TGT_LIB_SO_VER)
+	@ln -sf $(TGT_LIB_SO_VER) $(TGT_LIB_SO)
+
+
+clean:
+	$(RM_V) -f $(OBJS)
+	$(RM_V) -f $(TGT)
+	$(RM_V) -f version.h
+	$(RM_V) -f $(TGT_LIB_SO)*
+	$(RM_V) -f $(TGT_LIB_SO_VER)
+
+install:
+	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
+	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTLIBPATH)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTLIBPATH)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTLIBPATH)/lib
+
+uninstall:
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTLIBPATH)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTLIBPATH)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTLIBPATH)/lib/$(TGT_LIB_SO_VER)
diff --git a/build.sh b/build.sh
@@ -79,7 +79,7 @@ config_ios()
 config_common()
 {
 	STRIP=${CROSS_PREFIX}strip
-	LIBS_DIR=`pwd`
+	LIBS_DIR=`pwd`/gear-lib
 	OUTPUT=${LIBS_DIR}/output/${ARCH}/
 }
 
@@ -122,6 +122,7 @@ build_module()
 		return
 	fi
 	cd ${LIBS_DIR}/${MODULE}/
+	echo "cd ${LIBS_DIR}/${MODULE}/"
 
 	case $ACTION in
 	"clean")

diff --git a/build/autogen_lib.sh b/build/autogen_lib.sh
@@ -31,8 +31,8 @@ usage()
 
 mkdir_libfoo()
 {
-	mkdir ${MODULE}
-	cd ${MODULE}
+	mkdir gear-lib/${MODULE}
+	cd gear-lib/${MODULE}
 }
 
 autogen_libfoo_h()
@@ -328,6 +328,14 @@ autogen_version_h
 chmod a+x ${VERSION_SH}
 }
 
+link_libfoo()
+{
+	cd ../../include/
+	ln -s ../gear-lib/${LIBFOO_H} .
+	cd ../src/
+	ln -s ../gear-lib/${LIBFOO_C} .
+}
+
 case $# in
 0)
 	usage;
@@ -345,4 +353,5 @@ autogen_makefile_nmake
 autogen_version_sh
 autogen_android_mk
 autogen_readme_md
+link_libfoo
 
diff --git a/libbase64/Android.mk → gear-lib/libbase64/Android.mk b/libbase64/Android.mk → gear-lib/libbase64/Android.mk
diff --git a/libbase64/Makefile → gear-lib/libbase64/Makefile b/libbase64/Makefile → gear-lib/libbase64/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libbase64/Makefile.nmake → gear-lib/libbase64/Makefile.nmake b/libbase64/Makefile.nmake → gear-lib/libbase64/Makefile.nmake
diff --git a/libbase64/README.md → gear-lib/libbase64/README.md b/libbase64/README.md → gear-lib/libbase64/README.md
diff --git a/libbase64/libbase64.c → gear-lib/libbase64/libbase64.c b/libbase64/libbase64.c → gear-lib/libbase64/libbase64.c
diff --git a/libbase64/libbase64.h → gear-lib/libbase64/libbase64.h b/libbase64/libbase64.h → gear-lib/libbase64/libbase64.h
diff --git a/libbase64/test_libbase64.c → gear-lib/libbase64/test_libbase64.c b/libbase64/test_libbase64.c → gear-lib/libbase64/test_libbase64.c
diff --git a/libbase64/version.sh → gear-lib/libbase64/version.sh b/libbase64/version.sh → gear-lib/libbase64/version.sh
diff --git a/libconfig/Android.mk → gear-lib/libconfig/Android.mk b/libconfig/Android.mk → gear-lib/libconfig/Android.mk
diff --git a/libconfig/Makefile → gear-lib/libconfig/Makefile b/libconfig/Makefile → gear-lib/libconfig/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libconfig/Makefile.nmake → gear-lib/libconfig/Makefile.nmake b/libconfig/Makefile.nmake → gear-lib/libconfig/Makefile.nmake
diff --git a/libconfig/README.md → gear-lib/libconfig/README.md b/libconfig/README.md → gear-lib/libconfig/README.md
diff --git a/libconfig/config_util.h → gear-lib/libconfig/config_util.h b/libconfig/config_util.h → gear-lib/libconfig/config_util.h
diff --git a/libconfig/ini/dictionary.c → gear-lib/libconfig/ini/dictionary.c b/libconfig/ini/dictionary.c → gear-lib/libconfig/ini/dictionary.c
diff --git a/libconfig/ini/dictionary.h → gear-lib/libconfig/ini/dictionary.h b/libconfig/ini/dictionary.h → gear-lib/libconfig/ini/dictionary.h
diff --git a/libconfig/ini/example.ini → gear-lib/libconfig/ini/example.ini b/libconfig/ini/example.ini → gear-lib/libconfig/ini/example.ini
diff --git a/libconfig/ini/ini_config.c → gear-lib/libconfig/ini/ini_config.c b/libconfig/ini/ini_config.c → gear-lib/libconfig/ini/ini_config.c
diff --git a/libconfig/ini/iniparser.c → gear-lib/libconfig/ini/iniparser.c b/libconfig/ini/iniparser.c → gear-lib/libconfig/ini/iniparser.c
diff --git a/libconfig/ini/iniparser.h → gear-lib/libconfig/ini/iniparser.h b/libconfig/ini/iniparser.h → gear-lib/libconfig/ini/iniparser.h
diff --git a/libconfig/json/all.json → gear-lib/libconfig/json/all.json b/libconfig/json/all.json → gear-lib/libconfig/json/all.json
diff --git a/libconfig/json/cJSON.c → gear-lib/libconfig/json/cJSON.c b/libconfig/json/cJSON.c → gear-lib/libconfig/json/cJSON.c
diff --git a/libconfig/json/cJSON.h → gear-lib/libconfig/json/cJSON.h b/libconfig/json/cJSON.h → gear-lib/libconfig/json/cJSON.h
diff --git a/libconfig/json/json_config.c → gear-lib/libconfig/json/json_config.c b/libconfig/json/json_config.c → gear-lib/libconfig/json/json_config.c
diff --git a/libconfig/json/test.json → gear-lib/libconfig/json/test.json b/libconfig/json/test.json → gear-lib/libconfig/json/test.json
diff --git a/libconfig/libconfig++/Android.mk → gear-lib/libconfig/libconfig++/Android.mk b/libconfig/libconfig++/Android.mk → gear-lib/libconfig/libconfig++/Android.mk
diff --git a/libconfig/libconfig++/Makefile → gear-lib/libconfig/libconfig++/Makefile b/libconfig/libconfig++/Makefile → gear-lib/libconfig/libconfig++/Makefile
@@ -13,7 +13,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libconfig/libconfig++/README.md → gear-lib/libconfig/libconfig++/README.md b/libconfig/libconfig++/README.md → gear-lib/libconfig/libconfig++/README.md
diff --git a/libconfig/libconfig++/json/config.json → ...ib/libconfig/libconfig++/json/config.json b/libconfig/libconfig++/json/config.json → ...ib/libconfig/libconfig++/json/config.json
diff --git a/libconfig/libconfig++/json/json_config.cpp → ...ibconfig/libconfig++/json/json_config.cpp b/libconfig/libconfig++/json/json_config.cpp → ...ibconfig/libconfig++/json/json_config.cpp
diff --git a/libconfig/libconfig++/json/json_config.h → .../libconfig/libconfig++/json/json_config.h b/libconfig/libconfig++/json/json_config.h → .../libconfig/libconfig++/json/json_config.h
diff --git a/libconfig/libconfig++/libgconfig.cpp → ...-lib/libconfig/libconfig++/libgconfig.cpp b/libconfig/libconfig++/libgconfig.cpp → ...-lib/libconfig/libconfig++/libgconfig.cpp
diff --git a/libconfig/libconfig++/libgconfig.h → gear-lib/libconfig/libconfig++/libgconfig.h b/libconfig/libconfig++/libgconfig.h → gear-lib/libconfig/libconfig++/libgconfig.h
diff --git a/libconfig/libconfig++/lua/config.lua → ...-lib/libconfig/libconfig++/lua/config.lua b/libconfig/libconfig++/lua/config.lua → ...-lib/libconfig/libconfig++/lua/config.lua
diff --git a/libconfig/libconfig++/lua/lua_config.cpp → .../libconfig/libconfig++/lua/lua_config.cpp b/libconfig/libconfig++/lua/lua_config.cpp → .../libconfig/libconfig++/lua/lua_config.cpp
diff --git a/libconfig/libconfig++/lua/lua_config.h → ...ib/libconfig/libconfig++/lua/lua_config.h b/libconfig/libconfig++/lua/lua_config.h → ...ib/libconfig/libconfig++/lua/lua_config.h
diff --git a/libconfig/libconfig++/lua/luatables.cc → ...ib/libconfig/libconfig++/lua/luatables.cc b/libconfig/libconfig++/lua/luatables.cc → ...ib/libconfig/libconfig++/lua/luatables.cc
diff --git a/libconfig/libconfig++/lua/luatables.h → ...lib/libconfig/libconfig++/lua/luatables.h b/libconfig/libconfig++/lua/luatables.h → ...lib/libconfig/libconfig++/lua/luatables.h
diff --git a/...fig/libconfig++/lua/utils/serialize.lua.h → ...fig/libconfig++/lua/utils/serialize.lua.h b/...fig/libconfig++/lua/utils/serialize.lua.h → ...fig/libconfig++/lua/utils/serialize.lua.h
diff --git a/libconfig/libconfig++/test_libgconfig.cpp → ...libconfig/libconfig++/test_libgconfig.cpp b/libconfig/libconfig++/test_libgconfig.cpp → ...libconfig/libconfig++/test_libgconfig.cpp
diff --git a/libconfig/libconfig++/version.sh → gear-lib/libconfig/libconfig++/version.sh b/libconfig/libconfig++/version.sh → gear-lib/libconfig/libconfig++/version.sh
diff --git a/libconfig/libconfig.c → gear-lib/libconfig/libconfig.c b/libconfig/libconfig.c → gear-lib/libconfig/libconfig.c
diff --git a/libconfig/libconfig.h → gear-lib/libconfig/libconfig.h b/libconfig/libconfig.h → gear-lib/libconfig/libconfig.h
diff --git a/libconfig/lua/config.lua → gear-lib/libconfig/lua/config.lua b/libconfig/lua/config.lua → gear-lib/libconfig/lua/config.lua
diff --git a/libconfig/lua/lua_config.cc → gear-lib/libconfig/lua/lua_config.cc b/libconfig/lua/lua_config.cc → gear-lib/libconfig/lua/lua_config.cc
diff --git a/libconfig/lua/luatables.cc → gear-lib/libconfig/lua/luatables.cc b/libconfig/lua/luatables.cc → gear-lib/libconfig/lua/luatables.cc
diff --git a/libconfig/lua/luatables.h → gear-lib/libconfig/lua/luatables.h b/libconfig/lua/luatables.h → gear-lib/libconfig/lua/luatables.h
diff --git a/libconfig/lua/serialize.lua.h → gear-lib/libconfig/lua/serialize.lua.h b/libconfig/lua/serialize.lua.h → gear-lib/libconfig/lua/serialize.lua.h
diff --git a/libconfig/test_libconfig.c → gear-lib/libconfig/test_libconfig.c b/libconfig/test_libconfig.c → gear-lib/libconfig/test_libconfig.c
diff --git a/libconfig/version.sh → gear-lib/libconfig/version.sh b/libconfig/version.sh → gear-lib/libconfig/version.sh
diff --git a/libdebug/Android.mk → gear-lib/libdebug/Android.mk b/libdebug/Android.mk → gear-lib/libdebug/Android.mk
diff --git a/libdebug/Makefile → gear-lib/libdebug/Makefile b/libdebug/Makefile → gear-lib/libdebug/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libdebug/README.md → gear-lib/libdebug/README.md b/libdebug/README.md → gear-lib/libdebug/README.md
diff --git a/libdebug/aarch64-gcc.macro → gear-lib/libdebug/aarch64-gcc.macro b/libdebug/aarch64-gcc.macro → gear-lib/libdebug/aarch64-gcc.macro
diff --git a/...buildroot-linux-uclibcgnueabihf-gcc.macro → ...buildroot-linux-uclibcgnueabihf-gcc.macro b/...buildroot-linux-uclibcgnueabihf-gcc.macro → ...buildroot-linux-uclibcgnueabihf-gcc.macro
diff --git a/libdebug/arm-linux-gnueabihf-g++.macro → ...ib/libdebug/arm-linux-gnueabihf-g++.macro b/libdebug/arm-linux-gnueabihf-g++.macro → ...ib/libdebug/arm-linux-gnueabihf-g++.macro
diff --git a/libdebug/arm-linux-gnueabihf-gcc.macro → ...ib/libdebug/arm-linux-gnueabihf-gcc.macro b/libdebug/arm-linux-gnueabihf-gcc.macro → ...ib/libdebug/arm-linux-gnueabihf-gcc.macro
diff --git a/libdebug/gcc.macro → gear-lib/libdebug/gcc.macro b/libdebug/gcc.macro → gear-lib/libdebug/gcc.macro
diff --git a/libdebug/libdebug.c → gear-lib/libdebug/libdebug.c b/libdebug/libdebug.c → gear-lib/libdebug/libdebug.c
diff --git a/libdebug/libdebug.h → gear-lib/libdebug/libdebug.h b/libdebug/libdebug.h → gear-lib/libdebug/libdebug.h
diff --git a/libdebug/test_libdebug.c → gear-lib/libdebug/test_libdebug.c b/libdebug/test_libdebug.c → gear-lib/libdebug/test_libdebug.c
diff --git a/libdebug/uclibc-gcc.macro → gear-lib/libdebug/uclibc-gcc.macro b/libdebug/uclibc-gcc.macro → gear-lib/libdebug/uclibc-gcc.macro
diff --git a/libdebug/version.sh → gear-lib/libdebug/version.sh b/libdebug/version.sh → gear-lib/libdebug/version.sh
diff --git a/libdict/Android.mk → gear-lib/libdict/Android.mk b/libdict/Android.mk → gear-lib/libdict/Android.mk
diff --git a/libdict/Makefile → gear-lib/libdict/Makefile b/libdict/Makefile → gear-lib/libdict/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libdict/README.md → gear-lib/libdict/README.md b/libdict/README.md → gear-lib/libdict/README.md
diff --git a/libdict/libdict.c → gear-lib/libdict/libdict.c b/libdict/libdict.c → gear-lib/libdict/libdict.c
diff --git a/libdict/libdict.h → gear-lib/libdict/libdict.h b/libdict/libdict.h → gear-lib/libdict/libdict.h
diff --git a/libdict/test_libdict.c → gear-lib/libdict/test_libdict.c b/libdict/test_libdict.c → gear-lib/libdict/test_libdict.c
diff --git a/libdict/version.sh → gear-lib/libdict/version.sh b/libdict/version.sh → gear-lib/libdict/version.sh
diff --git a/libfile/Android.mk → gear-lib/libfile/Android.mk b/libfile/Android.mk → gear-lib/libfile/Android.mk
diff --git a/libfile/Makefile → gear-lib/libfile/Makefile b/libfile/Makefile → gear-lib/libfile/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libfile/Makefile.nmake → gear-lib/libfile/Makefile.nmake b/libfile/Makefile.nmake → gear-lib/libfile/Makefile.nmake
diff --git a/libfile/README.md → gear-lib/libfile/README.md b/libfile/README.md → gear-lib/libfile/README.md
diff --git a/libfile/filewatcher.c → gear-lib/libfile/filewatcher.c b/libfile/filewatcher.c → gear-lib/libfile/filewatcher.c
diff --git a/libfile/fio.c → gear-lib/libfile/fio.c b/libfile/fio.c → gear-lib/libfile/fio.c
diff --git a/libfile/io.c → gear-lib/libfile/io.c b/libfile/io.c → gear-lib/libfile/io.c
diff --git a/libfile/libfile.c → gear-lib/libfile/libfile.c b/libfile/libfile.c → gear-lib/libfile/libfile.c
diff --git a/libfile/libfile.h → gear-lib/libfile/libfile.h b/libfile/libfile.h → gear-lib/libfile/libfile.h
diff --git a/libfile/libfilewatcher.h → gear-lib/libfile/libfilewatcher.h b/libfile/libfilewatcher.h → gear-lib/libfile/libfilewatcher.h
diff --git a/libfile/test_libfile.c → gear-lib/libfile/test_libfile.c b/libfile/test_libfile.c → gear-lib/libfile/test_libfile.c
diff --git a/libfile/version.sh → gear-lib/libfile/version.sh b/libfile/version.sh → gear-lib/libfile/version.sh
diff --git a/libgevent/Android.mk → gear-lib/libgevent/Android.mk b/libgevent/Android.mk → gear-lib/libgevent/Android.mk
diff --git a/libgevent/Makefile → gear-lib/libgevent/Makefile b/libgevent/Makefile → gear-lib/libgevent/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libgevent/Makefile.nmake → gear-lib/libgevent/Makefile.nmake b/libgevent/Makefile.nmake → gear-lib/libgevent/Makefile.nmake
diff --git a/libgevent/README.md → gear-lib/libgevent/README.md b/libgevent/README.md → gear-lib/libgevent/README.md
diff --git a/libgevent/epoll.c → gear-lib/libgevent/epoll.c b/libgevent/epoll.c → gear-lib/libgevent/epoll.c
diff --git a/libgevent/iocp.c → gear-lib/libgevent/iocp.c b/libgevent/iocp.c → gear-lib/libgevent/iocp.c
diff --git a/libgevent/libgevent.c → gear-lib/libgevent/libgevent.c b/libgevent/libgevent.c → gear-lib/libgevent/libgevent.c
diff --git a/libgevent/libgevent.h → gear-lib/libgevent/libgevent.h b/libgevent/libgevent.h → gear-lib/libgevent/libgevent.h
diff --git a/libgevent/poll.c → gear-lib/libgevent/poll.c b/libgevent/poll.c → gear-lib/libgevent/poll.c
diff --git a/libgevent/select.c → gear-lib/libgevent/select.c b/libgevent/select.c → gear-lib/libgevent/select.c
diff --git a/libgevent/test_libgevent.c → gear-lib/libgevent/test_libgevent.c b/libgevent/test_libgevent.c → gear-lib/libgevent/test_libgevent.c
diff --git a/libgevent/version.sh → gear-lib/libgevent/version.sh b/libgevent/version.sh → gear-lib/libgevent/version.sh
diff --git a/libhal/Android.mk → gear-lib/libhal/Android.mk b/libhal/Android.mk → gear-lib/libhal/Android.mk
diff --git a/libhal/Makefile → gear-lib/libhal/Makefile b/libhal/Makefile → gear-lib/libhal/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libhal/libhal.c → gear-lib/libhal/libhal.c b/libhal/libhal.c → gear-lib/libhal/libhal.c
diff --git a/libhal/libhal.h → gear-lib/libhal/libhal.h b/libhal/libhal.h → gear-lib/libhal/libhal.h
diff --git a/libhal/test_libhal.c → gear-lib/libhal/test_libhal.c b/libhal/test_libhal.c → gear-lib/libhal/test_libhal.c
diff --git a/libhal/version.sh → gear-lib/libhal/version.sh b/libhal/version.sh → gear-lib/libhal/version.sh
diff --git a/libhash/Android.mk → gear-lib/libhash/Android.mk b/libhash/Android.mk → gear-lib/libhash/Android.mk
diff --git a/libhash/Makefile → gear-lib/libhash/Makefile b/libhash/Makefile → gear-lib/libhash/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libhash/Makefile.nmake → gear-lib/libhash/Makefile.nmake b/libhash/Makefile.nmake → gear-lib/libhash/Makefile.nmake
diff --git a/libhash/README.md → gear-lib/libhash/README.md b/libhash/README.md → gear-lib/libhash/README.md
diff --git a/libhash/libhash.c → gear-lib/libhash/libhash.c b/libhash/libhash.c → gear-lib/libhash/libhash.c
diff --git a/libhash/libhash.h → gear-lib/libhash/libhash.h b/libhash/libhash.h → gear-lib/libhash/libhash.h
diff --git a/libhash/test_libhash.c → gear-lib/libhash/test_libhash.c b/libhash/test_libhash.c → gear-lib/libhash/test_libhash.c
diff --git a/libhash/version.sh → gear-lib/libhash/version.sh b/libhash/version.sh → gear-lib/libhash/version.sh
diff --git a/libipc/Android.mk → gear-lib/libipc/Android.mk b/libipc/Android.mk → gear-lib/libipc/Android.mk
diff --git a/libipc/Makefile → gear-lib/libipc/Makefile b/libipc/Makefile → gear-lib/libipc/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libipc/README.md → gear-lib/libipc/README.md b/libipc/README.md → gear-lib/libipc/README.md
diff --git a/libipc/libipc.c → gear-lib/libipc/libipc.c b/libipc/libipc.c → gear-lib/libipc/libipc.c
diff --git a/libipc/libipc.h → gear-lib/libipc/libipc.h b/libipc/libipc.h → gear-lib/libipc/libipc.h
diff --git a/libipc/libipc_stub.h → gear-lib/libipc/libipc_stub.h b/libipc/libipc_stub.h → gear-lib/libipc/libipc_stub.h
diff --git a/libipc/msgq_posix.c → gear-lib/libipc/msgq_posix.c b/libipc/msgq_posix.c → gear-lib/libipc/msgq_posix.c
diff --git a/libipc/msgq_sysv.c → gear-lib/libipc/msgq_sysv.c b/libipc/msgq_sysv.c → gear-lib/libipc/msgq_sysv.c
diff --git a/libipc/netlink.c → gear-lib/libipc/netlink.c b/libipc/netlink.c → gear-lib/libipc/netlink.c
diff --git a/libipc/netlink_driver.c → gear-lib/libipc/netlink_driver.c b/libipc/netlink_driver.c → gear-lib/libipc/netlink_driver.c
diff --git a/libipc/netlink_driver.h → gear-lib/libipc/netlink_driver.h b/libipc/netlink_driver.h → gear-lib/libipc/netlink_driver.h
diff --git a/libipc/shm.c → gear-lib/libipc/shm.c b/libipc/shm.c → gear-lib/libipc/shm.c
diff --git a/libipc/test_libipc.c → gear-lib/libipc/test_libipc.c b/libipc/test_libipc.c → gear-lib/libipc/test_libipc.c
diff --git a/libipc/unix_socket.c → gear-lib/libipc/unix_socket.c b/libipc/unix_socket.c → gear-lib/libipc/unix_socket.c
diff --git a/libipc/version.sh → gear-lib/libipc/version.sh b/libipc/version.sh → gear-lib/libipc/version.sh
diff --git a/libjpeg-ex/720x480.jpeg → gear-lib/libjpeg-ex/720x480.jpeg b/libjpeg-ex/720x480.jpeg → gear-lib/libjpeg-ex/720x480.jpeg
diff --git a/libjpeg-ex/720x480.yuv → gear-lib/libjpeg-ex/720x480.yuv b/libjpeg-ex/720x480.yuv → gear-lib/libjpeg-ex/720x480.yuv
diff --git a/libjpeg-ex/Makefile → gear-lib/libjpeg-ex/Makefile b/libjpeg-ex/Makefile → gear-lib/libjpeg-ex/Makefile
diff --git a/libjpeg-ex/Makefile.android → gear-lib/libjpeg-ex/Makefile.android b/libjpeg-ex/Makefile.android → gear-lib/libjpeg-ex/Makefile.android
diff --git a/libjpeg-ex/README → gear-lib/libjpeg-ex/README b/libjpeg-ex/README → gear-lib/libjpeg-ex/README
diff --git a/libjpeg-ex/bali_640x360_YUY2.yuv → gear-lib/libjpeg-ex/bali_640x360_YUY2.yuv b/libjpeg-ex/bali_640x360_YUY2.yuv → gear-lib/libjpeg-ex/bali_640x360_YUY2.yuv
diff --git a/libjpeg-ex/libjpeg-ex.c → gear-lib/libjpeg-ex/libjpeg-ex.c b/libjpeg-ex/libjpeg-ex.c → gear-lib/libjpeg-ex/libjpeg-ex.c
diff --git a/libjpeg-ex/libjpeg-ex.h → gear-lib/libjpeg-ex/libjpeg-ex.h b/libjpeg-ex/libjpeg-ex.h → gear-lib/libjpeg-ex/libjpeg-ex.h
diff --git a/libjpeg-ex/neon/chrome_convert.S → gear-lib/libjpeg-ex/neon/chrome_convert.S b/libjpeg-ex/neon/chrome_convert.S → gear-lib/libjpeg-ex/neon/chrome_convert.S
diff --git a/libjpeg-ex/test_libjpeg-ex.c → gear-lib/libjpeg-ex/test_libjpeg-ex.c b/libjpeg-ex/test_libjpeg-ex.c → gear-lib/libjpeg-ex/test_libjpeg-ex.c
diff --git a/liblog/Android.mk → gear-lib/liblog/Android.mk b/liblog/Android.mk → gear-lib/liblog/Android.mk
diff --git a/liblog/Makefile → gear-lib/liblog/Makefile b/liblog/Makefile → gear-lib/liblog/Makefile
@@ -23,7 +23,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/liblog/Makefile.nmake → gear-lib/liblog/Makefile.nmake b/liblog/Makefile.nmake → gear-lib/liblog/Makefile.nmake
diff --git a/liblog/README.md → gear-lib/liblog/README.md b/liblog/README.md → gear-lib/liblog/README.md
diff --git a/liblog/color.h → gear-lib/liblog/color.h b/liblog/color.h → gear-lib/liblog/color.h
diff --git a/liblog/liblog.c → gear-lib/liblog/liblog.c b/liblog/liblog.c → gear-lib/liblog/liblog.c
diff --git a/liblog/liblog.h → gear-lib/liblog/liblog.h b/liblog/liblog.h → gear-lib/liblog/liblog.h
diff --git a/liblog/test_liblog.c → gear-lib/liblog/test_liblog.c b/liblog/test_liblog.c → gear-lib/liblog/test_liblog.c
diff --git a/liblog/version.sh → gear-lib/liblog/version.sh b/liblog/version.sh → gear-lib/liblog/version.sh
diff --git a/libmacro/Android.mk → gear-lib/libmacro/Android.mk b/libmacro/Android.mk → gear-lib/libmacro/Android.mk
diff --git a/libmacro/Makefile → gear-lib/libmacro/Makefile b/libmacro/Makefile → gear-lib/libmacro/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libmacro/Makefile.nmake → gear-lib/libmacro/Makefile.nmake b/libmacro/Makefile.nmake → gear-lib/libmacro/Makefile.nmake
diff --git a/libmacro/README.md → gear-lib/libmacro/README.md b/libmacro/README.md → gear-lib/libmacro/README.md
diff --git a/libmacro/kernel_list.h → gear-lib/libmacro/kernel_list.h b/libmacro/kernel_list.h → gear-lib/libmacro/kernel_list.h
diff --git a/libmacro/kernel_list_win32.h → gear-lib/libmacro/kernel_list_win32.h b/libmacro/kernel_list_win32.h → gear-lib/libmacro/kernel_list_win32.h
diff --git a/libmacro/libmacro.c → gear-lib/libmacro/libmacro.c b/libmacro/libmacro.c → gear-lib/libmacro/libmacro.c
diff --git a/libmacro/libmacro.h → gear-lib/libmacro/libmacro.h b/libmacro/libmacro.h → gear-lib/libmacro/libmacro.h
diff --git a/libmacro/test_libmacro.c → gear-lib/libmacro/test_libmacro.c b/libmacro/test_libmacro.c → gear-lib/libmacro/test_libmacro.c
diff --git a/libmacro/version.sh → gear-lib/libmacro/version.sh b/libmacro/version.sh → gear-lib/libmacro/version.sh
diff --git a/libmacro/win.h → gear-lib/libmacro/win.h b/libmacro/win.h → gear-lib/libmacro/win.h
diff --git a/libmp4parser/Android.mk → gear-lib/libmp4parser/Android.mk b/libmp4parser/Android.mk → gear-lib/libmp4parser/Android.mk
diff --git a/libmp4parser/Makefile → gear-lib/libmp4parser/Makefile b/libmp4parser/Makefile → gear-lib/libmp4parser/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libmp4parser/README.md → gear-lib/libmp4parser/README.md b/libmp4parser/README.md → gear-lib/libmp4parser/README.md
diff --git a/libmp4parser/libmp4parser.c → gear-lib/libmp4parser/libmp4parser.c b/libmp4parser/libmp4parser.c → gear-lib/libmp4parser/libmp4parser.c
diff --git a/libmp4parser/libmp4parser.h → gear-lib/libmp4parser/libmp4parser.h b/libmp4parser/libmp4parser.h → gear-lib/libmp4parser/libmp4parser.h
diff --git a/libmp4parser/mp4parser_inner.c → gear-lib/libmp4parser/mp4parser_inner.c b/libmp4parser/mp4parser_inner.c → gear-lib/libmp4parser/mp4parser_inner.c
diff --git a/libmp4parser/mp4parser_inner.h → gear-lib/libmp4parser/mp4parser_inner.h b/libmp4parser/mp4parser_inner.h → gear-lib/libmp4parser/mp4parser_inner.h
diff --git a/libmp4parser/patch.c → gear-lib/libmp4parser/patch.c b/libmp4parser/patch.c → gear-lib/libmp4parser/patch.c
diff --git a/libmp4parser/patch.h → gear-lib/libmp4parser/patch.h b/libmp4parser/patch.h → gear-lib/libmp4parser/patch.h
diff --git a/libmp4parser/test_libmp4parser.c → gear-lib/libmp4parser/test_libmp4parser.c b/libmp4parser/test_libmp4parser.c → gear-lib/libmp4parser/test_libmp4parser.c
diff --git a/libmp4parser/version.sh → gear-lib/libmp4parser/version.sh b/libmp4parser/version.sh → gear-lib/libmp4parser/version.sh
diff --git a/libp2p/Android.mk → gear-lib/libp2p/Android.mk b/libp2p/Android.mk → gear-lib/libp2p/Android.mk
diff --git a/libp2p/Makefile → gear-lib/libp2p/Makefile b/libp2p/Makefile → gear-lib/libp2p/Makefile
diff --git a/libp2p/README.md → gear-lib/libp2p/README.md b/libp2p/README.md → gear-lib/libp2p/README.md
diff --git a/libp2p/libp2p.c → gear-lib/libp2p/libp2p.c b/libp2p/libp2p.c → gear-lib/libp2p/libp2p.c
diff --git a/libp2p/libp2p.h → gear-lib/libp2p/libp2p.h b/libp2p/libp2p.h → gear-lib/libp2p/libp2p.h
diff --git a/libp2p/libptcp.c → gear-lib/libp2p/libptcp.c b/libp2p/libptcp.c → gear-lib/libp2p/libptcp.c
diff --git a/libp2p/libptcp.h → gear-lib/libp2p/libptcp.h b/libp2p/libptcp.h → gear-lib/libp2p/libptcp.h
diff --git a/libp2p/libstun.c → gear-lib/libp2p/libstun.c b/libp2p/libstun.c → gear-lib/libp2p/libstun.c
diff --git a/libp2p/libstun.h → gear-lib/libp2p/libstun.h b/libp2p/libstun.h → gear-lib/libp2p/libstun.h
diff --git a/libp2p/queue.h → gear-lib/libp2p/queue.h b/libp2p/queue.h → gear-lib/libp2p/queue.h
diff --git a/libp2p/test_file_transfer.c → gear-lib/libp2p/test_file_transfer.c b/libp2p/test_file_transfer.c → gear-lib/libp2p/test_file_transfer.c
diff --git a/libp2p/test_libp2p.c → gear-lib/libp2p/test_libp2p.c b/libp2p/test_libp2p.c → gear-lib/libp2p/test_libp2p.c
diff --git a/libp2p/test_libptcp.c → gear-lib/libp2p/test_libptcp.c b/libp2p/test_libptcp.c → gear-lib/libp2p/test_libptcp.c
diff --git a/libp2p/test_libstun.c → gear-lib/libp2p/test_libstun.c b/libp2p/test_libstun.c → gear-lib/libp2p/test_libstun.c
diff --git a/libp2p/version.sh → gear-lib/libp2p/version.sh b/libp2p/version.sh → gear-lib/libp2p/version.sh
diff --git a/libplugin/Android.mk → gear-lib/libplugin/Android.mk b/libplugin/Android.mk → gear-lib/libplugin/Android.mk
diff --git a/libplugin/Makefile → gear-lib/libplugin/Makefile b/libplugin/Makefile → gear-lib/libplugin/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libplugin/README.md → gear-lib/libplugin/README.md b/libplugin/README.md → gear-lib/libplugin/README.md
diff --git a/libplugin/libplugin.c → gear-lib/libplugin/libplugin.c b/libplugin/libplugin.c → gear-lib/libplugin/libplugin.c
diff --git a/libplugin/libplugin.h → gear-lib/libplugin/libplugin.h b/libplugin/libplugin.h → gear-lib/libplugin/libplugin.h
diff --git a/libplugin/modules/Makefile → gear-lib/libplugin/modules/Makefile b/libplugin/modules/Makefile → gear-lib/libplugin/modules/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libplugin/modules/plugin_ipc.c → gear-lib/libplugin/modules/plugin_ipc.c b/libplugin/modules/plugin_ipc.c → gear-lib/libplugin/modules/plugin_ipc.c
diff --git a/libplugin/modules/plugin_log.c → gear-lib/libplugin/modules/plugin_log.c b/libplugin/modules/plugin_log.c → gear-lib/libplugin/modules/plugin_log.c
diff --git a/libplugin/modules/plugin_skt.c → gear-lib/libplugin/modules/plugin_skt.c b/libplugin/modules/plugin_skt.c → gear-lib/libplugin/modules/plugin_skt.c
diff --git a/libplugin/test_libplugin.c → gear-lib/libplugin/test_libplugin.c b/libplugin/test_libplugin.c → gear-lib/libplugin/test_libplugin.c
diff --git a/libplugin/version.sh → gear-lib/libplugin/version.sh b/libplugin/version.sh → gear-lib/libplugin/version.sh
diff --git a/libposix4win/Makefile.nmake → gear-lib/libposix4win/Makefile.nmake b/libposix4win/Makefile.nmake → gear-lib/libposix4win/Makefile.nmake
diff --git a/libposix4win/README.md → gear-lib/libposix4win/README.md b/libposix4win/README.md → gear-lib/libposix4win/README.md
diff --git a/libposix4win/libposix4win.c → gear-lib/libposix4win/libposix4win.c b/libposix4win/libposix4win.c → gear-lib/libposix4win/libposix4win.c
diff --git a/libposix4win/libposix4win.h → gear-lib/libposix4win/libposix4win.h b/libposix4win/libposix4win.h → gear-lib/libposix4win/libposix4win.h
diff --git a/libposix4win/test_libposix4win.c → gear-lib/libposix4win/test_libposix4win.c b/libposix4win/test_libposix4win.c → gear-lib/libposix4win/test_libposix4win.c
diff --git a/libposix4win/version.sh → gear-lib/libposix4win/version.sh b/libposix4win/version.sh → gear-lib/libposix4win/version.sh
diff --git a/libqueue/Android.mk → gear-lib/libqueue/Android.mk b/libqueue/Android.mk → gear-lib/libqueue/Android.mk
diff --git a/libqueue/Makefile → gear-lib/libqueue/Makefile b/libqueue/Makefile → gear-lib/libqueue/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libqueue/README.md → gear-lib/libqueue/README.md b/libqueue/README.md → gear-lib/libqueue/README.md
diff --git a/libqueue/libqueue.c → gear-lib/libqueue/libqueue.c b/libqueue/libqueue.c → gear-lib/libqueue/libqueue.c
diff --git a/libqueue/libqueue.h → gear-lib/libqueue/libqueue.h b/libqueue/libqueue.h → gear-lib/libqueue/libqueue.h
diff --git a/libqueue/test_libqueue.c → gear-lib/libqueue/test_libqueue.c b/libqueue/test_libqueue.c → gear-lib/libqueue/test_libqueue.c
diff --git a/libqueue/version.sh → gear-lib/libqueue/version.sh b/libqueue/version.sh → gear-lib/libqueue/version.sh
diff --git a/librbtree/Makefile → gear-lib/librbtree/Makefile b/librbtree/Makefile → gear-lib/librbtree/Makefile
@@ -3,7 +3,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/librbtree/README → gear-lib/librbtree/README b/librbtree/README → gear-lib/librbtree/README
diff --git a/librbtree/librbtree.c → gear-lib/librbtree/librbtree.c b/librbtree/librbtree.c → gear-lib/librbtree/librbtree.c
diff --git a/librbtree/librbtree.h → gear-lib/librbtree/librbtree.h b/librbtree/librbtree.h → gear-lib/librbtree/librbtree.h
diff --git a/librbtree/test_librbtree.c → gear-lib/librbtree/test_librbtree.c b/librbtree/test_librbtree.c → gear-lib/librbtree/test_librbtree.c
diff --git a/libringbuffer/Android.mk → gear-lib/libringbuffer/Android.mk b/libringbuffer/Android.mk → gear-lib/libringbuffer/Android.mk
diff --git a/libringbuffer/Makefile → gear-lib/libringbuffer/Makefile b/libringbuffer/Makefile → gear-lib/libringbuffer/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libringbuffer/README.md → gear-lib/libringbuffer/README.md b/libringbuffer/README.md → gear-lib/libringbuffer/README.md
diff --git a/libringbuffer/libringbuffer.c → gear-lib/libringbuffer/libringbuffer.c b/libringbuffer/libringbuffer.c → gear-lib/libringbuffer/libringbuffer.c
diff --git a/libringbuffer/libringbuffer.h → gear-lib/libringbuffer/libringbuffer.h b/libringbuffer/libringbuffer.h → gear-lib/libringbuffer/libringbuffer.h
diff --git a/libringbuffer/test_libringbuffer.c → gear-lib/libringbuffer/test_libringbuffer.c b/libringbuffer/test_libringbuffer.c → gear-lib/libringbuffer/test_libringbuffer.c
diff --git a/libringbuffer/version.sh → gear-lib/libringbuffer/version.sh b/libringbuffer/version.sh → gear-lib/libringbuffer/version.sh
diff --git a/librpc/Android.mk → gear-lib/librpc/Android.mk b/librpc/Android.mk → gear-lib/librpc/Android.mk
diff --git a/librpc/Makefile → gear-lib/librpc/Makefile b/librpc/Makefile → gear-lib/librpc/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/librpc/README.md → gear-lib/librpc/README.md b/librpc/README.md → gear-lib/librpc/README.md
diff --git a/librpc/librpc.c → gear-lib/librpc/librpc.c b/librpc/librpc.c → gear-lib/librpc/librpc.c
diff --git a/librpc/librpc.h → gear-lib/librpc/librpc.h b/librpc/librpc.h → gear-lib/librpc/librpc.h
diff --git a/librpc/librpc_stub.h → gear-lib/librpc/librpc_stub.h b/librpc/librpc_stub.h → gear-lib/librpc/librpc_stub.h
diff --git a/librpc/msgq_posix.c → gear-lib/librpc/msgq_posix.c b/librpc/msgq_posix.c → gear-lib/librpc/msgq_posix.c
diff --git a/librpc/msgq_sysv.c → gear-lib/librpc/msgq_sysv.c b/librpc/msgq_sysv.c → gear-lib/librpc/msgq_sysv.c
diff --git a/librpc/netlink.c → gear-lib/librpc/netlink.c b/librpc/netlink.c → gear-lib/librpc/netlink.c
diff --git a/librpc/netlink_driver.c → gear-lib/librpc/netlink_driver.c b/librpc/netlink_driver.c → gear-lib/librpc/netlink_driver.c
diff --git a/librpc/netlink_driver.h → gear-lib/librpc/netlink_driver.h b/librpc/netlink_driver.h → gear-lib/librpc/netlink_driver.h
diff --git a/librpc/proto/Makefile → gear-lib/librpc/proto/Makefile b/librpc/proto/Makefile → gear-lib/librpc/proto/Makefile
diff --git a/librpc/proto/hello.proto → gear-lib/librpc/proto/hello.proto b/librpc/proto/hello.proto → gear-lib/librpc/proto/hello.proto
diff --git a/librpc/proto/librpc.proto → gear-lib/librpc/proto/librpc.proto b/librpc/proto/librpc.proto → gear-lib/librpc/proto/librpc.proto
diff --git a/librpc/proto/proto_librpc.cpp → gear-lib/librpc/proto/proto_librpc.cpp b/librpc/proto/proto_librpc.cpp → gear-lib/librpc/proto/proto_librpc.cpp
diff --git a/librpc/shm.c → gear-lib/librpc/shm.c b/librpc/shm.c → gear-lib/librpc/shm.c
diff --git a/librpc/test_librpc.c → gear-lib/librpc/test_librpc.c b/librpc/test_librpc.c → gear-lib/librpc/test_librpc.c
diff --git a/librpc/unix_socket.c → gear-lib/librpc/unix_socket.c b/librpc/unix_socket.c → gear-lib/librpc/unix_socket.c
diff --git a/librpc/version.sh → gear-lib/librpc/version.sh b/librpc/version.sh → gear-lib/librpc/version.sh
diff --git a/librtmp/Android.mk → gear-lib/librtmp/Android.mk b/librtmp/Android.mk → gear-lib/librtmp/Android.mk
diff --git a/librtmp/Makefile → gear-lib/librtmp/Makefile b/librtmp/Makefile → gear-lib/librtmp/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/librtmp/README.md → gear-lib/librtmp/README.md b/librtmp/README.md → gear-lib/librtmp/README.md
diff --git a/librtmp/amf.c → gear-lib/librtmp/amf.c b/librtmp/amf.c → gear-lib/librtmp/amf.c
diff --git a/librtmp/amf.h → gear-lib/librtmp/amf.h b/librtmp/amf.h → gear-lib/librtmp/amf.h
diff --git a/librtmp/bytes.h → gear-lib/librtmp/bytes.h b/librtmp/bytes.h → gear-lib/librtmp/bytes.h
diff --git a/librtmp/dh.h → gear-lib/librtmp/dh.h b/librtmp/dh.h → gear-lib/librtmp/dh.h
diff --git a/librtmp/dhgroups.h → gear-lib/librtmp/dhgroups.h b/librtmp/dhgroups.h → gear-lib/librtmp/dhgroups.h
diff --git a/librtmp/handshake.h → gear-lib/librtmp/handshake.h b/librtmp/handshake.h → gear-lib/librtmp/handshake.h
diff --git a/librtmp/hashswf.c → gear-lib/librtmp/hashswf.c b/librtmp/hashswf.c → gear-lib/librtmp/hashswf.c
diff --git a/librtmp/http.h → gear-lib/librtmp/http.h b/librtmp/http.h → gear-lib/librtmp/http.h
diff --git a/librtmp/librtmp.c → gear-lib/librtmp/librtmp.c b/librtmp/librtmp.c → gear-lib/librtmp/librtmp.c
diff --git a/librtmp/librtmp.h → gear-lib/librtmp/librtmp.h b/librtmp/librtmp.h → gear-lib/librtmp/librtmp.h
diff --git a/librtmp/log.c → gear-lib/librtmp/log.c b/librtmp/log.c → gear-lib/librtmp/log.c
diff --git a/librtmp/log.h → gear-lib/librtmp/log.h b/librtmp/log.h → gear-lib/librtmp/log.h
diff --git a/librtmp/parseurl.c → gear-lib/librtmp/parseurl.c b/librtmp/parseurl.c → gear-lib/librtmp/parseurl.c
diff --git a/librtmp/rtmp.c → gear-lib/librtmp/rtmp.c b/librtmp/rtmp.c → gear-lib/librtmp/rtmp.c
diff --git a/librtmp/rtmp.h → gear-lib/librtmp/rtmp.h b/librtmp/rtmp.h → gear-lib/librtmp/rtmp.h
diff --git a/librtmp/rtmp_aac.c → gear-lib/librtmp/rtmp_aac.c b/librtmp/rtmp_aac.c → gear-lib/librtmp/rtmp_aac.c
diff --git a/librtmp/rtmp_aac.h → gear-lib/librtmp/rtmp_aac.h b/librtmp/rtmp_aac.h → gear-lib/librtmp/rtmp_aac.h
diff --git a/librtmp/rtmp_g711.c → gear-lib/librtmp/rtmp_g711.c b/librtmp/rtmp_g711.c → gear-lib/librtmp/rtmp_g711.c
diff --git a/librtmp/rtmp_g711.h → gear-lib/librtmp/rtmp_g711.h b/librtmp/rtmp_g711.h → gear-lib/librtmp/rtmp_g711.h
diff --git a/librtmp/rtmp_h264.c → gear-lib/librtmp/rtmp_h264.c b/librtmp/rtmp_h264.c → gear-lib/librtmp/rtmp_h264.c
diff --git a/librtmp/rtmp_h264.h → gear-lib/librtmp/rtmp_h264.h b/librtmp/rtmp_h264.h → gear-lib/librtmp/rtmp_h264.h
diff --git a/librtmp/rtmp_sys.h → gear-lib/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h → gear-lib/librtmp/rtmp_sys.h
diff --git a/librtmp/rtmp_util.c → gear-lib/librtmp/rtmp_util.c b/librtmp/rtmp_util.c → gear-lib/librtmp/rtmp_util.c
diff --git a/librtmp/rtmp_util.h → gear-lib/librtmp/rtmp_util.h b/librtmp/rtmp_util.h → gear-lib/librtmp/rtmp_util.h
diff --git a/librtmp/test_librtmp.c → gear-lib/librtmp/test_librtmp.c b/librtmp/test_librtmp.c → gear-lib/librtmp/test_librtmp.c
diff --git a/librtmp/version.sh → gear-lib/librtmp/version.sh b/librtmp/version.sh → gear-lib/librtmp/version.sh
diff --git a/librtsp/Android.mk → gear-lib/librtsp/Android.mk b/librtsp/Android.mk → gear-lib/librtsp/Android.mk
diff --git a/librtsp/Makefile → gear-lib/librtsp/Makefile b/librtsp/Makefile → gear-lib/librtsp/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/librtsp/README.md → gear-lib/librtsp/README.md b/librtsp/README.md → gear-lib/librtsp/README.md
diff --git a/librtsp/TODO → gear-lib/librtsp/TODO b/librtsp/TODO → gear-lib/librtsp/TODO
diff --git a/librtsp/librtsp.h → gear-lib/librtsp/librtsp.h b/librtsp/librtsp.h → gear-lib/librtsp/librtsp.h
diff --git a/librtsp/librtsp_server.c → gear-lib/librtsp/librtsp_server.c b/librtsp/librtsp_server.c → gear-lib/librtsp/librtsp_server.c
diff --git a/librtsp/librtsp_server.h → gear-lib/librtsp/librtsp_server.h b/librtsp/librtsp_server.h → gear-lib/librtsp/librtsp_server.h
diff --git a/librtsp/media_source.c → gear-lib/librtsp/media_source.c b/librtsp/media_source.c → gear-lib/librtsp/media_source.c
diff --git a/librtsp/media_source.h → gear-lib/librtsp/media_source.h b/librtsp/media_source.h → gear-lib/librtsp/media_source.h
diff --git a/librtsp/media_source_h264.c → gear-lib/librtsp/media_source_h264.c b/librtsp/media_source_h264.c → gear-lib/librtsp/media_source_h264.c
diff --git a/librtsp/media_source_live.c → gear-lib/librtsp/media_source_live.c b/librtsp/media_source_live.c → gear-lib/librtsp/media_source_live.c
diff --git a/librtsp/request_handle.c → gear-lib/librtsp/request_handle.c b/librtsp/request_handle.c → gear-lib/librtsp/request_handle.c
diff --git a/librtsp/request_handle.h → gear-lib/librtsp/request_handle.h b/librtsp/request_handle.h → gear-lib/librtsp/request_handle.h
diff --git a/librtsp/rtp.c → gear-lib/librtsp/rtp.c b/librtsp/rtp.c → gear-lib/librtsp/rtp.c
diff --git a/librtsp/rtp.h → gear-lib/librtsp/rtp.h b/librtsp/rtp.h → gear-lib/librtsp/rtp.h
diff --git a/librtsp/rtp_h264.c → gear-lib/librtsp/rtp_h264.c b/librtsp/rtp_h264.c → gear-lib/librtsp/rtp_h264.c
diff --git a/librtsp/rtsp_parser.c → gear-lib/librtsp/rtsp_parser.c b/librtsp/rtsp_parser.c → gear-lib/librtsp/rtsp_parser.c
diff --git a/librtsp/rtsp_parser.h → gear-lib/librtsp/rtsp_parser.h b/librtsp/rtsp_parser.h → gear-lib/librtsp/rtsp_parser.h
diff --git a/librtsp/sample.264 → gear-lib/librtsp/sample.264 b/librtsp/sample.264 → gear-lib/librtsp/sample.264
diff --git a/librtsp/sdp.c → gear-lib/librtsp/sdp.c b/librtsp/sdp.c → gear-lib/librtsp/sdp.c
diff --git a/librtsp/sdp.h → gear-lib/librtsp/sdp.h b/librtsp/sdp.h → gear-lib/librtsp/sdp.h
diff --git a/librtsp/test_librtsp.c → gear-lib/librtsp/test_librtsp.c b/librtsp/test_librtsp.c → gear-lib/librtsp/test_librtsp.c
diff --git a/librtsp/transport_session.c → gear-lib/librtsp/transport_session.c b/librtsp/transport_session.c → gear-lib/librtsp/transport_session.c
diff --git a/librtsp/transport_session.h → gear-lib/librtsp/transport_session.h b/librtsp/transport_session.h → gear-lib/librtsp/transport_session.h
diff --git a/librtsp/uri_parse.c → gear-lib/librtsp/uri_parse.c b/librtsp/uri_parse.c → gear-lib/librtsp/uri_parse.c
diff --git a/librtsp/uri_parse.h → gear-lib/librtsp/uri_parse.h b/librtsp/uri_parse.h → gear-lib/librtsp/uri_parse.h
diff --git a/librtsp/version.sh → gear-lib/librtsp/version.sh b/librtsp/version.sh → gear-lib/librtsp/version.sh
diff --git a/libskt/Android.mk → gear-lib/libskt/Android.mk b/libskt/Android.mk → gear-lib/libskt/Android.mk
diff --git a/libskt/Makefile → gear-lib/libskt/Makefile b/libskt/Makefile → gear-lib/libskt/Makefile
@@ -5,7 +5,7 @@
 ARCH		?= linux
 CROSS_PREFIX	?=
 OUTPUT		?= /usr/local
-BUILD_DIR	:= $(shell pwd)/../build/
+BUILD_DIR	:= $(shell pwd)/../../build/
 ARCH_INC	:= $(BUILD_DIR)/$(ARCH).inc
 COLOR_INC	:= $(BUILD_DIR)/color.inc
 

diff --git a/libskt/Makefile.nmake → gear-lib/libskt/Makefile.nmake b/libskt/Makefile.nmake → gear-lib/libskt/Makefile.nmake
diff --git a/libskt/README.md → gear-lib/libskt/README.md b/libskt/README.md → gear-lib/libskt/README.md
diff --git a/libskt/libskt.c → gear-lib/libskt/libskt.c b/libskt/libskt.c → gear-lib/libskt/libskt.c
diff --git a/libskt/libskt.h → gear-lib/libskt/libskt.h b/libskt/libskt.h → gear-lib/libskt/libskt.h
diff --git a/libskt/test_libskt.c → gear-lib/libskt/test_libskt.c b/libskt/test_libskt.c → gear-lib/libskt/test_libskt.c
diff --git a/libskt/version.sh → gear-lib/libskt/version.sh b/libskt/version.sh → gear-lib/libskt/version.sh