- updated Makefiles to compile code for latest version of MacOs

pull/331/head
Michael Zillgith 4 years ago
parent 9e6e3487da
commit 72feb2f614

@ -53,6 +53,13 @@ LIB_SOURCE_DIRS += hal/ethernet/bsd
LIB_SOURCE_DIRS += hal/filesystem/linux
LIB_SOURCE_DIRS += hal/time/unix
LIB_SOURCE_DIRS += hal/memory
else ifeq ($(HAL_IMPL), MACOS)
LIB_SOURCE_DIRS += hal/socket/bsd
LIB_SOURCE_DIRS += hal/thread/macos
LIB_SOURCE_DIRS += hal/ethernet/bsd
LIB_SOURCE_DIRS += hal/filesystem/linux
LIB_SOURCE_DIRS += hal/time/unix
LIB_SOURCE_DIRS += hal/memory
endif
LIB_INCLUDE_DIRS += config
LIB_INCLUDE_DIRS += hal/inc

@ -20,7 +20,7 @@ TARGET=POSIX
else ifeq ($(findstring MINGW,$(UNAME)), MINGW)
TARGET=WIN32
else ifeq ($(UNAME), Darwin)
TARGET=BSD
TARGET=MACOS
else ifeq ($(UNAME), FreeBSD)
TARGET=BSD
endif
@ -117,10 +117,14 @@ endif
else
ifeq ($(TARGET), BSD)
HAL_IMPL = BSD
else ifeq ($(TARGET), MACOS)
HAL_IMPL = MACOS
else
HAL_IMPL = POSIX
endif
LDLIBS = -lpthread
ifeq ($(TARGET), LINUX-MIPSEL)
@ -174,7 +178,11 @@ else
ifeq ($(TARGET), BSD)
DYN_LIB_NAME = $(LIB_OBJS_DIR)/libiec61850.dylib
else
ifeq ($(TARGET), MACOS)
DYN_LIB_NAME = $(LIB_OBJS_DIR)/libiec61850.dylib
else
DYN_LIB_NAME = $(LIB_OBJS_DIR)/libiec61850.so
endif
endif
endif

Loading…
Cancel
Save