Fix El Capitan OSX 10.11 Compil

openpgpsdk/src/openpgpsdk.pro

@@ -1,11 +1,7 @@
 !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
 
 TEMPLATE = lib
-macx {
-	CONFIG = staticlib 
-} else {
-	CONFIG += staticlib
-}
+CONFIG += staticlib
 
 DEFINES *= OPENSSL_NO_IDEA 
 
@@ -13,8 +9,8 @@ QMAKE_CXXFLAGS *= -Wall -Werror -W
 
 TARGET = ops
 DESTDIR = lib
-DEPENDPATH += .
-INCLUDEPATH += .
+DEPENDPATH += . $$INC_DIR
+INCLUDEPATH += . $$INC_DIR
 
 #################################### Windows #####################################
 
@@ -34,9 +30,13 @@ win32 {
 	# Switch on optimization for debug version
 	#QMAKE_CXXFLAGS_DEBUG += -O2
 	#QMAKE_CFLAGS_DEBUG += -O2
+}
 
-	DEPENDPATH += $$INC_DIR
-	INCLUDEPATH += $$INC_DIR
+
+macx {
+	for(lib, LIB_DIR):LIBS += -L"$$lib"
+	for(bin, BIN_DIR):LIBS += -L"$$bin"
+	DEFINES += OPENSSL_NO_CAMELLIA
 }
 
 # Input
@@ -73,8 +73,10 @@ HEADERS += openpgpsdk/writer.h \
            openpgpsdk/armour.h \
            openpgpsdk/parse_local.h \
            openpgpsdk/keyring_local.h \
-           openpgpsdk/opsdir.h \
-           openpgpsdk/opsstring.h
+           openpgpsdk/opsdir.h
+win32{
+HEADERS += openpgpsdk/opsstring.h
+}
 
 SOURCES += openpgpsdk/accumulate.c \
            openpgpsdk/compress.c \
@@ -113,5 +115,7 @@ SOURCES += openpgpsdk/accumulate.c \
            openpgpsdk/writer_memory.c \
            openpgpsdk/writer_skey_checksum.c \
            openpgpsdk/writer_stream_encrypt_se_ip.c \
-           openpgpsdk/opsdir.c \
-           openpgpsdk/opsstring.c
+           openpgpsdk/opsdir.c
+win32{
+SOURCES += openpgpsdk/opsstring.c
+}

openpgpsdk/src/openpgpsdk/opsdir.c

@@ -1,6 +1,7 @@
 #include "opsdir.h"
+#ifdef WIN32
 #include "opsstring.h"
-
+#endif
 #include <fcntl.h>
 
 int ops_open(const char* filename, int flag, int pmode)