- 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/filesystem/linux
LIB_SOURCE_DIRS += hal/time/unix LIB_SOURCE_DIRS += hal/time/unix
LIB_SOURCE_DIRS += hal/memory 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 endif
LIB_INCLUDE_DIRS += config LIB_INCLUDE_DIRS += config
LIB_INCLUDE_DIRS += hal/inc LIB_INCLUDE_DIRS += hal/inc

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

Loading…
Cancel
Save