Build System: Fixed linking issues with SQLiteCipher occurring when OPENSSL_CONF...

diff --git a/crossplatform.mk b/crossplatform.mk
index db82707..d88b8e2 100644 (file)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -194,6 +194,11 @@ _OPENSSL_CONF = $(call hidspace,$(call fixps,$(OPENSSL_CONF)))
 OPENSSL_INCLUDE_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/include,$(_OPENSSL_CONF)))
 OPENSSL_LIB_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/lib,$(_OPENSSL_CONF)))
 OPENSSL_BIN_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/bin,$(_OPENSSL_CONF)))
+else
+# To avoid confusion with empty -L/-I
+OPENSSL_INCLUDE_DIR = .
+OPENSSL_LIB_DIR = .
+OPENSSL_BIN_DIR = .
 endif
 
 endif

diff --git a/ecere/src/gui/controls/DataBox.ec b/ecere/src/gui/controls/DataBox.ec
index 702c4dd..7197def 100644 (file)
--- a/ecere/src/gui/controls/DataBox.ec
+++ b/ecere/src/gui/controls/DataBox.ec
@@ -129,9 +129,9 @@ private:
          {
             String s;
             if(type.type == noHeadClass || type.type == normalClass)
-               s = type._vTbl[__ecereVMethodID_class_OnGetString](type, *(void **)this.data, tempString, fieldData, null);
+               s = (String)type._vTbl[__ecereVMethodID_class_OnGetString](type, *(void **)this.data, tempString, fieldData, null);
             else
-               s = type._vTbl[__ecereVMethodID_class_OnGetString](type, this.data, tempString, fieldData, null);
+               s = (String)type._vTbl[__ecereVMethodID_class_OnGetString](type, this.data, tempString, fieldData, null);
             delete stringValue;
             stringValue = CopyString(s);
             needUpdate = false;