diff --git a/examples/alarm/cron_alarm/Makefile b/examples/alarm/cron_alarm/Makefile index 8576a0fd..9e6068c8 100644 --- a/examples/alarm/cron_alarm/Makefile +++ b/examples/alarm/cron_alarm/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_alarm \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/alarm/oneshot_alarm/Makefile b/examples/alarm/oneshot_alarm/Makefile index 12de32c9..05ec3420 100644 --- a/examples/alarm/oneshot_alarm/Makefile +++ b/examples/alarm/oneshot_alarm/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_alarm \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/alarm/weekly_alarm/Makefile b/examples/alarm/weekly_alarm/Makefile index b5ec9225..1481c0a7 100644 --- a/examples/alarm/weekly_alarm/Makefile +++ b/examples/alarm/weekly_alarm/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_alarm \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/base/assert/Makefile b/examples/base/assert/Makefile index 1da11c5f..63643bd4 100644 --- a/examples/base/assert/Makefile +++ b/examples/base/assert/Makefile @@ -24,6 +24,6 @@ EXE_NAME := assert CPP_SRC_FILES := main.cpp CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) -LDFLAGS += -ltbox_base +LDFLAGS += -ltbox_base -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/base/object_pool/Makefile b/examples/base/object_pool/Makefile index 8c7b1054..545a6e78 100644 --- a/examples/base/object_pool/Makefile +++ b/examples/base/object_pool/Makefile @@ -24,6 +24,6 @@ EXE_NAME := object_pool CPP_SRC_FILES := main.cpp CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) -LDFLAGS += -ltbox_base +LDFLAGS += -ltbox_base -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/base/print_log/Makefile b/examples/base/print_log/Makefile index d22a2075..f45c0d1a 100644 --- a/examples/base/print_log/Makefile +++ b/examples/base/print_log/Makefile @@ -27,6 +27,6 @@ C_SRC_FILES := other.c CXXFLAGS += -DLOG_MODULE_ID='"demo"' CFLAGS += -DLOG_MODULE_ID='"demo"' -LDFLAGS += -ltbox_base +LDFLAGS += -ltbox_base -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/dbus/00-loop/Makefile b/examples/dbus/00-loop/Makefile index b3c86f92..61b08fa4 100644 --- a/examples/dbus/00-loop/Makefile +++ b/examples/dbus/00-loop/Makefile @@ -30,5 +30,6 @@ LDFLAGS += \ -ltbox_dbus \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/01_io/Makefile b/examples/event/01_io/Makefile index c08ebab4..59ec160c 100644 --- a/examples/event/01_io/Makefile +++ b/examples/event/01_io/Makefile @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) LDFLAGS += \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/02_timer/Makefile b/examples/event/02_timer/Makefile index 090af4f6..e7cba07e 100644 --- a/examples/event/02_timer/Makefile +++ b/examples/event/02_timer/Makefile @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) LDFLAGS += \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/03_signal/Makefile b/examples/event/03_signal/Makefile index 42aab080..66a1c643 100644 --- a/examples/event/03_signal/Makefile +++ b/examples/event/03_signal/Makefile @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) LDFLAGS += \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/04_run_in_loop/Makefile b/examples/event/04_run_in_loop/Makefile index 28fb2965..0e6be9d0 100644 --- a/examples/event/04_run_in_loop/Makefile +++ b/examples/event/04_run_in_loop/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_event \ -ltbox_base \ -lpthread \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/05_run_next_seq/Makefile b/examples/event/05_run_next_seq/Makefile index 6b0a3f4f..0047db9b 100644 --- a/examples/event/05_run_next_seq/Makefile +++ b/examples/event/05_run_next_seq/Makefile @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) LDFLAGS += \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/06_stdin_timer_signal/Makefile b/examples/event/06_stdin_timer_signal/Makefile index 53233aa2..2e23ca89 100644 --- a/examples/event/06_stdin_timer_signal/Makefile +++ b/examples/event/06_stdin_timer_signal/Makefile @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) LDFLAGS += \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/07_delay_delete/Makefile b/examples/event/07_delay_delete/Makefile index 650913de..4b45e23b 100644 --- a/examples/event/07_delay_delete/Makefile +++ b/examples/event/07_delay_delete/Makefile @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) LDFLAGS += \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/event/08_calc_game/Makefile b/examples/event/08_calc_game/Makefile index fcebb09d..641583a4 100644 --- a/examples/event/08_calc_game/Makefile +++ b/examples/event/08_calc_game/Makefile @@ -29,5 +29,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS) LDFLAGS += \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/http/server/async_respond/Makefile b/examples/http/server/async_respond/Makefile index a1806867..c86945fb 100644 --- a/examples/http/server/async_respond/Makefile +++ b/examples/http/server/async_respond/Makefile @@ -32,6 +32,6 @@ LDFLAGS += \ -ltbox_log \ -ltbox_util \ -ltbox_base \ - -lpthread + -lpthread -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/http/server/router/Makefile b/examples/http/server/router/Makefile index 9243a07e..f5befbd8 100644 --- a/examples/http/server/router/Makefile +++ b/examples/http/server/router/Makefile @@ -32,6 +32,6 @@ LDFLAGS += \ -ltbox_log \ -ltbox_util \ -ltbox_base \ - -lpthread + -lpthread -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/http/server/simple/Makefile b/examples/http/server/simple/Makefile index fe7ed31d..4d61b82a 100644 --- a/examples/http/server/simple/Makefile +++ b/examples/http/server/simple/Makefile @@ -32,6 +32,6 @@ LDFLAGS += \ -ltbox_log \ -ltbox_util \ -ltbox_base \ - -lpthread + -lpthread -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/mqtt/conn/Makefile b/examples/mqtt/conn/Makefile index b14b72ce..80678504 100644 --- a/examples/mqtt/conn/Makefile +++ b/examples/mqtt/conn/Makefile @@ -30,5 +30,6 @@ LDFLAGS += \ -ltbox_base \ -lmosquitto \ -lpthread \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/mqtt/pub/Makefile b/examples/mqtt/pub/Makefile index e5779c7a..6c7dfed1 100644 --- a/examples/mqtt/pub/Makefile +++ b/examples/mqtt/pub/Makefile @@ -30,5 +30,6 @@ LDFLAGS += \ -ltbox_base \ -lmosquitto \ -lpthread \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/mqtt/sub/Makefile b/examples/mqtt/sub/Makefile index 3138d83d..d57a0e3b 100644 --- a/examples/mqtt/sub/Makefile +++ b/examples/mqtt/sub/Makefile @@ -30,5 +30,6 @@ LDFLAGS += \ -ltbox_base \ -lmosquitto \ -lpthread \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/buffered_fd/Makefile b/examples/network/buffered_fd/Makefile index 8fb5310b..1c14c585 100644 --- a/examples/network/buffered_fd/Makefile +++ b/examples/network/buffered_fd/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/stdio_stream/01_stdin_out/Makefile b/examples/network/stdio_stream/01_stdin_out/Makefile index 8a8dd1de..c85a5066 100644 --- a/examples/network/stdio_stream/01_stdin_out/Makefile +++ b/examples/network/stdio_stream/01_stdin_out/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/stdio_stream/02_stdio/Makefile b/examples/network/stdio_stream/02_stdio/Makefile index 1823a97e..a8363f5a 100644 --- a/examples/network/stdio_stream/02_stdio/Makefile +++ b/examples/network/stdio_stream/02_stdio/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_acceptor/tcp_echo/Makefile b/examples/network/tcp_acceptor/tcp_echo/Makefile index a5b281e7..594a7f2e 100644 --- a/examples/network/tcp_acceptor/tcp_echo/Makefile +++ b/examples/network/tcp_acceptor/tcp_echo/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_acceptor/tcp_nc_server/Makefile b/examples/network/tcp_acceptor/tcp_nc_server/Makefile index 5374b3b8..f91b5463 100644 --- a/examples/network/tcp_acceptor/tcp_nc_server/Makefile +++ b/examples/network/tcp_acceptor/tcp_nc_server/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_client/tcp_echo/Makefile b/examples/network/tcp_client/tcp_echo/Makefile index 05669325..09aa1498 100644 --- a/examples/network/tcp_client/tcp_echo/Makefile +++ b/examples/network/tcp_client/tcp_echo/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_client/tcp_hex_client/Makefile b/examples/network/tcp_client/tcp_hex_client/Makefile index 62de2b05..914a0b21 100644 --- a/examples/network/tcp_client/tcp_hex_client/Makefile +++ b/examples/network/tcp_client/tcp_hex_client/Makefile @@ -29,5 +29,6 @@ LDFLAGS += \ -ltbox_event \ -ltbox_util \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_client/tcp_nc_client/Makefile b/examples/network/tcp_client/tcp_nc_client/Makefile index a8ba759a..604859d0 100644 --- a/examples/network/tcp_client/tcp_nc_client/Makefile +++ b/examples/network/tcp_client/tcp_nc_client/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_connector/tcp_echo/Makefile b/examples/network/tcp_connector/tcp_echo/Makefile index a3727bbd..12888ca7 100644 --- a/examples/network/tcp_connector/tcp_echo/Makefile +++ b/examples/network/tcp_connector/tcp_echo/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_connector/tcp_nc_client/Makefile b/examples/network/tcp_connector/tcp_nc_client/Makefile index d965e880..6ead141b 100644 --- a/examples/network/tcp_connector/tcp_nc_client/Makefile +++ b/examples/network/tcp_connector/tcp_nc_client/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_server/tcp_echo/Makefile b/examples/network/tcp_server/tcp_echo/Makefile index 6326476c..fb3d0ae6 100644 --- a/examples/network/tcp_server/tcp_echo/Makefile +++ b/examples/network/tcp_server/tcp_echo/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/tcp_server/tcp_nc_server/Makefile b/examples/network/tcp_server/tcp_nc_server/Makefile index b8a2412e..8b5f7a12 100644 --- a/examples/network/tcp_server/tcp_nc_server/Makefile +++ b/examples/network/tcp_server/tcp_nc_server/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/uart/uart_to_uart/Makefile b/examples/network/uart/uart_to_uart/Makefile index fef62b2e..571aa9a0 100644 --- a/examples/network/uart/uart_to_uart/Makefile +++ b/examples/network/uart/uart_to_uart/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/uart/uart_tool/Makefile b/examples/network/uart/uart_tool/Makefile index 83d23491..3cc1fea0 100644 --- a/examples/network/uart/uart_tool/Makefile +++ b/examples/network/uart/uart_tool/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/udp_socket/ping_pong/Makefile b/examples/network/udp_socket/ping_pong/Makefile index 350b987b..a6c7288a 100644 --- a/examples/network/udp_socket/ping_pong/Makefile +++ b/examples/network/udp_socket/ping_pong/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/udp_socket/recv_only/Makefile b/examples/network/udp_socket/recv_only/Makefile index 346acc87..f943aa8d 100644 --- a/examples/network/udp_socket/recv_only/Makefile +++ b/examples/network/udp_socket/recv_only/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/udp_socket/request/Makefile b/examples/network/udp_socket/request/Makefile index 7f618aba..3f4bca1c 100644 --- a/examples/network/udp_socket/request/Makefile +++ b/examples/network/udp_socket/request/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/udp_socket/respond/Makefile b/examples/network/udp_socket/respond/Makefile index 3c6a7897..43805aa3 100644 --- a/examples/network/udp_socket/respond/Makefile +++ b/examples/network/udp_socket/respond/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/network/udp_socket/send_only/Makefile b/examples/network/udp_socket/send_only/Makefile index 326ac89c..b679c904 100644 --- a/examples/network/udp_socket/send_only/Makefile +++ b/examples/network/udp_socket/send_only/Makefile @@ -28,5 +28,6 @@ LDFLAGS += \ -ltbox_network \ -ltbox_event \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/terminal/tcp_rpc/Makefile b/examples/terminal/tcp_rpc/Makefile index aa484326..cc1bd385 100644 --- a/examples/terminal/tcp_rpc/Makefile +++ b/examples/terminal/tcp_rpc/Makefile @@ -30,5 +30,6 @@ LDFLAGS += \ -ltbox_event \ -ltbox_util \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/examples/terminal/telnetd/Makefile b/examples/terminal/telnetd/Makefile index 8cefcb62..7dfa12bf 100644 --- a/examples/terminal/telnetd/Makefile +++ b/examples/terminal/telnetd/Makefile @@ -30,5 +30,6 @@ LDFLAGS += \ -ltbox_event \ -ltbox_util \ -ltbox_base \ + -ldl include ${TOP_DIR}/tools/exe_common.mk diff --git a/modules/alarm/Makefile b/modules/alarm/Makefile index ae2b6bb8..e4210573 100644 --- a/modules/alarm/Makefile +++ b/modules/alarm/Makefile @@ -47,7 +47,7 @@ TEST_CPP_SRC_FILES = \ $(CPP_SRC_FILES) \ workday_calendar_test.cpp \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -ldl ENABLE_SHARED_LIB = no include $(TOP_DIR)/tools/lib_tbox_common.mk diff --git a/modules/coroutine/Makefile b/modules/coroutine/Makefile index 086fae0f..9e8ee2f3 100644 --- a/modules/coroutine/Makefile +++ b/modules/coroutine/Makefile @@ -46,7 +46,7 @@ TEST_CPP_SRC_FILES = \ broadcast_test.cpp \ condition_test.cpp \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -ldl ENABLE_SHARED_LIB = no diff --git a/modules/crypto/Makefile b/modules/crypto/Makefile index 31e3e9ef..b789d90f 100644 --- a/modules/crypto/Makefile +++ b/modules/crypto/Makefile @@ -39,7 +39,7 @@ TEST_CPP_SRC_FILES = \ md5_test.cpp \ aes_test.cpp \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_base -ldl ENABLE_SHARED_LIB = no diff --git a/modules/event/Makefile b/modules/event/Makefile index f4d27e09..f52cb129 100644 --- a/modules/event/Makefile +++ b/modules/event/Makefile @@ -55,7 +55,7 @@ TEST_CPP_SRC_FILES = \ CXXFLAGS := -DLOG_MODULE_ID='"tbox.event"' $(CXXFLAGS) -TEST_LDFLAGS := $(LDFLAGS) -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_base -ldl ENABLE_SHARED_LIB = no diff --git a/modules/flow/Makefile b/modules/flow/Makefile index 03aee2a2..7ff4a339 100644 --- a/modules/flow/Makefile +++ b/modules/flow/Makefile @@ -89,7 +89,7 @@ TEST_CPP_SRC_FILES = \ actions/succ_fail_action_test.cpp \ to_graphviz_test.cpp \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_flow -ltbox_event -ltbox_util -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_flow -ltbox_event -ltbox_util -ltbox_base -ldl ENABLE_SHARED_LIB = no include $(TOP_DIR)/tools/lib_tbox_common.mk diff --git a/modules/http/Makefile b/modules/http/Makefile index a9237fd2..4144132c 100644 --- a/modules/http/Makefile +++ b/modules/http/Makefile @@ -58,7 +58,7 @@ TEST_CPP_SRC_FILES = \ url_test.cpp \ server/request_parser_test.cpp \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_network -ltbox_log -ltbox_event -ltbox_util -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_network -ltbox_log -ltbox_event -ltbox_util -ltbox_base -ldl ENABLE_SHARED_LIB = no diff --git a/modules/log/Makefile b/modules/log/Makefile index e233065d..6fd2bf9e 100644 --- a/modules/log/Makefile +++ b/modules/log/Makefile @@ -50,7 +50,7 @@ TEST_CPP_SRC_FILES = \ CXXFLAGS := -DLOG_MODULE_ID='"tbox.log"' $(CXXFLAGS) -TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_event -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_event -ltbox_base -ldl ENABLE_SHARED_LIB = no include $(TOP_DIR)/tools/lib_tbox_common.mk diff --git a/modules/main/Makefile b/modules/main/Makefile index ac7f329a..c3404321 100644 --- a/modules/main/Makefile +++ b/modules/main/Makefile @@ -52,7 +52,7 @@ TEST_LDFLAGS := $(LDFLAGS) \ -ltbox_log \ -ltbox_util \ -ltbox_base \ - -ldl \ + -lpthread -ldl ENABLE_SHARED_LIB = no diff --git a/modules/main/README.md b/modules/main/README.md index 8bb98153..84fdb216 100644 --- a/modules/main/README.md +++ b/modules/main/README.md @@ -76,5 +76,5 @@ LDFLAGS += -L.. \ -ltbox_event \ -ltbox_util \ -ltbox_base \ - -lpthread + -lpthread -ldl ``` diff --git a/modules/mqtt/Makefile b/modules/mqtt/Makefile index 684b1317..7cc9a692 100644 --- a/modules/mqtt/Makefile +++ b/modules/mqtt/Makefile @@ -32,7 +32,7 @@ CXXFLAGS := -DLOG_MODULE_ID='"tbox.mqtt"' $(CXXFLAGS) TEST_CPP_SRC_FILES = \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -lmosquitto +TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -lmosquitto -ldl ENABLE_SHARED_LIB = no diff --git a/modules/network/Makefile b/modules/network/Makefile index 883c2fd3..612d1b78 100644 --- a/modules/network/Makefile +++ b/modules/network/Makefile @@ -76,7 +76,7 @@ TEST_CPP_SRC_FILES = \ net_if_test.cpp \ dns_request_test.cpp \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_eventx -ltbox_event -ltbox_util -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_eventx -ltbox_event -ltbox_util -ltbox_base -ldl ENABLE_SHARED_LIB = no diff --git a/modules/terminal/Makefile b/modules/terminal/Makefile index ffa2659c..f24908fc 100644 --- a/modules/terminal/Makefile +++ b/modules/terminal/Makefile @@ -57,7 +57,7 @@ TEST_CPP_SRC_FILES = \ impl/key_event_scanner.cpp \ impl/key_event_scanner_test.cpp \ -TEST_LDFLAGS := $(LDFLAGS) -ltbox_network -ltbox_event -ltbox_util -ltbox_base +TEST_LDFLAGS := $(LDFLAGS) -ltbox_network -ltbox_event -ltbox_util -ltbox_base -ldl ENABLE_SHARED_LIB = no include $(TOP_DIR)/tools/lib_tbox_common.mk diff --git a/version.mk b/version.mk index 3ad48fbe..59d90f4c 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ # TBOX版本号 TBOX_VERSION_MAJOR := 1 TBOX_VERSION_MINOR := 8 -TBOX_VERSION_REVISION := 2 +TBOX_VERSION_REVISION := 3