Skip to content

Commit 35a8139

Browse files
author
logwang
committed
Micro_thread: convert encoding of source files and remove chinese comments.
1 parent ef39c58 commit 35a8139

36 files changed

+1193
-6042
lines changed

app/micro_thread/Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,20 @@
2020
########MAKEFILE##########
2121

2222
ifeq ($(FF_PATH),)
23-
$(error variable FF_PATH is not set)
23+
$(error variable FF_PATH is not set)
24+
endif
25+
26+
ifeq ($(FF_DPDK),)
27+
FF_DPDK= $(FF_PATH)/dpdk/x86_64-native-linuxapp-gcc
2428
endif
2529

2630
DEBUG= -g
2731
BINARY = libmt.a
28-
FF_LIB=$(FF_PATH)/libfstack.a
29-
DPDK_LIBS+= -L${FF_PATH}/lib -L${FF_DPDK}/lib -Wl,--whole-archive,-lfstack,--no-whole-archive
30-
DPDK_LIBS+= -Wl,--whole-archive -lrte_pmd_vmxnet3_uio -lrte_pmd_i40e -lrte_pmd_ixgbe -lrte_pmd_e1000 -lrte_pmd_ring
31-
DPDK_LIBS+= -Wl,--whole-archive -lrte_hash -lrte_kvargs -Wl,-lrte_mbuf -lethdev -lrte_eal -Wl,-lrte_mempool
32-
DPDK_LIBS+= -lrte_ring -lrte_cmdline -lrte_cfgfile -lrte_kni -lrte_timer -Wl,-lrte_pmd_virtio
33-
DPDK_LIBS+= -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto -pthread
32+
FF_LIBS+= -L${FF_PATH}/lib -L${FF_DPDK}/lib -Wl,--whole-archive,-lfstack,--no-whole-archive
33+
FF_LIBS+= -Wl,--whole-archive -lrte_pmd_vmxnet3_uio -lrte_pmd_i40e -lrte_pmd_ixgbe -lrte_pmd_e1000 -lrte_pmd_ring
34+
FF_LIBS+= -Wl,--whole-archive -lrte_hash -lrte_kvargs -Wl,-lrte_mbuf -lethdev -lrte_eal -Wl,-lrte_mempool
35+
FF_LIBS+= -lrte_ring -lrte_cmdline -lrte_cfgfile -lrte_kni -lrte_timer -Wl,-lrte_pmd_virtio
36+
FF_LIBS+= -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto -pthread
3437

3538
# Comment the following line if you are not using the gnu c compiler
3639
#C_ARGS = -Wall -g -fPIC -D_DEBUG
@@ -91,9 +94,9 @@ LIB_OBJ = micro_thread.o kqueue_proxy.o arch_ctx.o mt_session.o mt_notify.o mt_a
9194
libmt.a: $(LIB_OBJ)
9295
@echo -e Linking $(CYAN)$@$(RESET) ...$(RED)
9396
@-rm -f $@
94-
@ar crs $@ $^ $(FST_LIB) $(CRESET)
97+
@ar crs $@ $^ $(CRESET)
9598
@chmod +x $@
9699

97100
echo: echo.o libmt.a
98101
@echo -e Compile $(CYAN)$@$(RESET) ...$(RED)
99-
@$(CC) -O -gdwarf-2 -o $@ $^ -lstdc++ -ldl -lm $(DPDK_LIBS) $(CRESET)
102+
@$(CC) -O -gdwarf-2 -o $@ $^ -lstdc++ -ldl -lm $(FF_LIBS) $(CRESET)

0 commit comments

Comments
 (0)