Commit a9d72488 authored by chen.weican's avatar chen.weican

【修改内容】Z3GatewayHost 兼容9531环境的编译

【提交人】陈伟灿
parent cad01e43
...@@ -34,14 +34,19 @@ ...@@ -34,14 +34,19 @@
# or # or
# "cd app/builder/Z3GatewayHost; make INCLUDE_MAKEFILE=my-custom.mak" # "cd app/builder/Z3GatewayHost; make INCLUDE_MAKEFILE=my-custom.mak"
# #
CONFIG_VENDOR = ubuntu
ifdef INCLUDE_MAKEFILE ifdef INCLUDE_MAKEFILE
include $(INCLUDE_MAKEFILE) include $(INCLUDE_MAKEFILE)
endif endif
ifeq ($(CONFIG_VENDOR),ubuntu)
COMPILER ?= gcc COMPILER ?= gcc
LINKER ?= gcc LINKER ?= gcc
ARCHIVE ?= ar ARCHIVE ?= ar
else
COMPILER ?= mips-openwrt-linux-gcc
LINKER ?= mips-openwrt-linux-gcc
ARCHIVE ?= mips-openwrt-linux-ar
endif
STD ?= gnu99 STD ?= gnu99
ARCHIVE_EXTENSION ?= .a ARCHIVE_EXTENSION ?= .a
...@@ -317,13 +322,17 @@ DEPENDENCY_POST_PROCESS ?= ...@@ -317,13 +322,17 @@ DEPENDENCY_POST_PROCESS ?=
CPPFLAGS= $(INCLUDES) $(DEFINES) $(COMPILER_FLAGS) $(DEPENDENCY_FLAGS) CPPFLAGS= $(INCLUDES) $(DEFINES) $(COMPILER_FLAGS) $(DEPENDENCY_FLAGS)
LINKER_FLAGS ?= LINKER_FLAGS ?=
ifdef NO_READLINE
CPPFLAGS += -DNO_READLINE ifeq ($(CONFIG_VENDOR),ubuntu)
LINKER_FLAGS += \
-lreadline_ubuntu \
-lncurses_ubuntu
else else
LINKER_FLAGS += \ LINKER_FLAGS += \
-lreadline \ -lreadline \
-lncurses -lncurses
endif endif
# Conditionally include the math library if EM_AF_LINK_M is defined. # Conditionally include the math library if EM_AF_LINK_M is defined.
ifeq ($(findstring -DEM_AF_LINK_M,$(DEFINES)),-DEM_AF_LINK_M) ifeq ($(findstring -DEM_AF_LINK_M,$(DEFINES)),-DEM_AF_LINK_M)
...@@ -356,8 +365,13 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES) ...@@ -356,8 +365,13 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
@echo -e '\n$@ build success' @echo -e '\n$@ build success'
else else
$(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES) $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
$(LD) $^ $(LINKER_FLAGS) -lm -L. -lapi_com -lnanomsg -lkk_hal -lanl -pthread -lev -ltinfo -o $(TARGET_FILE) ifeq ($(CONFIG_VENDOR),ubuntu)
$(LD) $^ $(LINKER_FLAGS) -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lkk_hal_ubuntu -o $(TARGET_FILE)
@echo -e '\n$@ build success'
else
$(LD) $^ $(LINKER_FLAGS) -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -o $(TARGET_FILE)
@echo -e '\n$@ build success' @echo -e '\n$@ build success'
endif
endif endif
.PHONY: clean .PHONY: clean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment