include.mk: moved windows openssl detection intelligence from sqliteCipher's makefile...

diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index 01f9f40..8212ffc 100644 (file)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -84,17 +84,11 @@ endif
 
 ifdef WINDOWS
 
-_SSL_CONF = $(call hidspace,$(call fixps,$(OPENSSL_CONF)))
-_SSL_BIN = $(_SSL_CONF:$(notdir $(_SSL_CONF))=$(empty))
-_SSL_INC_DIR = $(call fixspace,$(call shwspace,$(subst /bin,/include,$(_SSL_BIN))))
-_SSL_LIB_DIR = $(call fixspace,$(call shwspace,$(subst /bin,/lib,$(_SSL_BIN))))
-_SSL_BIN_DIR = $(call fixspace,$(call shwspace,$(_SSL_BIN)))
-
 CFLAGS += \
-        -I$(_SSL_INC_DIR)
+        -I$(OPEN_SSL_INCLUDE_DIR)
 
 OFLAGS += \
-        -L$(_SSL_BIN_DIR)
+        -L$(OPEN_SSL_BIN_DIR)
 
 LIBS += -llibeay32
 
@@ -173,9 +167,9 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 openssldebug:
        @$(call echo,OPENSSL_CONF $(OPENSSL_CONF))
        @$(call echo,_SSL_CONF $(_SSL_CONF))
-       @$(call echo,_SSL_INC_DIR $(_SSL_INC_DIR))
-       @$(call echo,_SSL_BIN_DIR $(_SSL_BIN_DIR))
-       @$(call echo,_SSL_LIB_DIR $(_SSL_LIB_DIR))
+       @$(call echo,OPEN_SSL_INCLUDE_DIR $(OPEN_SSL_INCLUDE_DIR))
+       @$(call echo,OPEN_SSL_BIN_DIR $(OPEN_SSL_BIN_DIR))
+       @$(call echo,OPEN_SSL_LIB_DIR $(OPEN_SSL_LIB_DIR))
 
 clean: objdir
        $(call rmq,$(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))

diff --git a/include.mk b/include.mk
index 830b12f..da61a30 100644 (file)
--- a/include.mk
+++ b/include.mk
@@ -184,3 +184,15 @@ ifdef WINDOWS
 else
    SODESTDIR := obj/$(PLATFORM)/lib/
 endif
+
+# COMMON LIBRARIES DETECTION
+
+ifdef WINDOWS
+
+_SSL_CONF = $(call hidspace,$(call fixps,$(OPENSSL_CONF)))
+_SSL_BIN = $(_SSL_CONF:$(notdir $(_SSL_CONF))=$(empty))
+OPEN_SSL_INCLUDE_DIR = $(call fixspace,$(call shwspace,$(subst /bin,/include,$(_SSL_BIN))))
+OPEN_SSL_LIB_DIR = $(call fixspace,$(call shwspace,$(subst /bin,/lib,$(_SSL_BIN))))
+OPEN_SSL_BIN_DIR = $(call fixspace,$(call shwspace,$(_SSL_BIN)))
+
+endif