[dev] update config and version.

winshining · Mar 13, 2019 · 3054375 · 3054375
1 parent 86deeca
commit 3054375
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/config b/config
@@ -96,6 +96,11 @@ RTMP_CORE_SRCS="                                                \
                 "
 
 
+RTMP_HTTP_DEPS="                                                \
+                $ngx_addon_dir/ngx_http_flv_live_module.h       \
+                "
+
+
 RTMP_HTTP_SRCS="                                                \
                 $ngx_addon_dir/ngx_rtmp_stat_module.c           \
                 $ngx_addon_dir/ngx_rtmp_control_module.c        \
@@ -104,7 +109,7 @@ RTMP_HTTP_SRCS="                                                \
 
 if [ -f auto/module ] ; then
     ngx_module_incs=$ngx_addon_dir
-    ngx_module_deps=$RTMP_DEPS
+    ngx_module_deps="$RTMP_DEPS $RTMP_HTTP_DEPS"
 
     if [ $ngx_module_link = DYNAMIC ] ; then
         ngx_module_name="$ngx_addon_name $RTMP_CORE_MODULES $RTMP_HTTP_MODULES"
@@ -125,15 +130,15 @@ if [ -f auto/module ] ; then
     else
         ngx_module_type=CORE
         ngx_module_name=$RTMP_CORE_MODULES
+        ngx_module_deps=$RTMP_DEPS
         ngx_module_srcs=$RTMP_CORE_SRCS
 
         . auto/module
 
 
         ngx_module_type=HTTP
         ngx_module_name=$RTMP_HTTP_MODULES
-        ngx_module_incs=
-        ngx_module_deps=
+        ngx_module_deps=$RTMP_HTTP_DEPS
         ngx_module_srcs=$RTMP_HTTP_SRCS
 
         . auto/module
@@ -143,7 +148,7 @@ else
     CORE_MODULES="$CORE_MODULES $RTMP_CORE_MODULES"
     HTTP_MODULES="$HTTP_MODULES $RTMP_HTTP_MODULES"
 
-    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $RTMP_DEPS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $RTMP_DEPS $RTMP_HTTP_DEPS"
     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $RTMP_CORE_SRCS $RTMP_HTTP_SRCS"
 
     CFLAGS="$CFLAGS -I$ngx_addon_dir"

diff --git a/ngx_rtmp_version.h b/ngx_rtmp_version.h
@@ -9,8 +9,8 @@
 #define _NGX_RTMP_VERSION_H_INCLUDED_
 
 
-#define nginx_rtmp_version  1002005
-#define NGINX_RTMP_VERSION  "1.2.5"
+#define nginx_rtmp_version  1002006
+#define NGINX_RTMP_VERSION  "1.2.6"
 
 
 #endif /* _NGX_RTMP_VERSION_H_INCLUDED_ */