Commit 06ab926a authored by Ian Craggs's avatar Ian Craggs

Make MACOS Makefile work with brew OpenSSL

parent e940c3c8
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
/build/ /build/
/build.paho/ /build.paho/
*.swp *.swp
*.pyc
/build.paho /build.paho
...@@ -164,12 +164,13 @@ END_GROUP = ...@@ -164,12 +164,13 @@ END_GROUP =
EXTRA_LIB = -ldl EXTRA_LIB = -ldl
CCFLAGS_SO += -Wno-deprecated-declarations -DOSX CCFLAGS_SO += -Wno-deprecated-declarations -DOSX -I /usr/local/opt/openssl/include
LDFLAGS_C += -Wl,-install_name,lib$(MQTTLIB_C).so.${MAJOR_VERSION} LDFLAGS_C += -Wl,-install_name,lib$(MQTTLIB_C).so.${MAJOR_VERSION}
LDFLAGS_CS += -Wl,-install_name,lib$(MQTTLIB_CS).so.${MAJOR_VERSION} LDFLAGS_CS += -Wl,-install_name,lib$(MQTTLIB_CS).so.${MAJOR_VERSION} -L /usr/local/opt/openssl/lib
LDFLAGS_A += -Wl,-install_name,lib${MQTTLIB_A}.so.${MAJOR_VERSION} LDFLAGS_A += -Wl,-install_name,lib${MQTTLIB_A}.so.${MAJOR_VERSION}
LDFLAGS_AS += -Wl,-install_name,lib${MQTTLIB_AS}.so.${MAJOR_VERSION} LDFLAGS_AS += -Wl,-install_name,lib${MQTTLIB_AS}.so.${MAJOR_VERSION} -L /usr/local/opt/openssl/lib
FLAGS_EXE += -DOSX FLAGS_EXE += -DOSX
FLAGS_EXES += -L /usr/local/opt/openssl/lib
endif endif
...@@ -179,6 +180,7 @@ build: | mkdir ${MQTTLIB_C_TARGET} ${MQTTLIB_CS_TARGET} ${MQTTLIB_A_TARGET} ${MQ ...@@ -179,6 +180,7 @@ build: | mkdir ${MQTTLIB_C_TARGET} ${MQTTLIB_CS_TARGET} ${MQTTLIB_A_TARGET} ${MQ
clean: clean:
rm -rf ${blddir}/* rm -rf ${blddir}/*
rm -rf ${blddir_work}/*
mkdir: mkdir:
-mkdir -p ${blddir}/samples -mkdir -p ${blddir}/samples
......
export TRAVIS_OS_NAME=osx
export TRAVIS_BUILD_DIR=/Users/icraggs/git/paho.mqtt.c
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