Revert previous three commits to master branch

This reverts to commit 807c501
GoyaPtyLtd · Jul 30, 2024 · 85f5606 · 85f5606
1 parent c9241ce
commit 85f5606
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Project/BaseElements.cbp b/Project/BaseElements.cbp
@@ -101,12 +101,11 @@
 			<Add library="libPocoZip.a" />
 			<Add library="libPocoXML.a" />
 			<Add library="libpodofo.a" />
-			<Add library="libunistring.a" />
 			<Add library="libfontconfig.a" />
 			<Add library="libfreetype.a" />
 			<Add library="libiconv.a" />
 			<Add library="libheif.a" />
-			<Add library="libde265.a" />
+			<Add library="liblibde265.a" />
 			<Add library="libjpeg.a" />
 			<Add library="libpng16.a" />
 			<Add library="libz.a" />

diff --git a/Source/Crypto/BEOpenSSLAES.cpp b/Source/Crypto/BEOpenSSLAES.cpp
@@ -29,9 +29,7 @@ using namespace std;
   https://boringssl.googlesource.com/boringssl/+/517073cd4b/crypto/cpu-intel.c#76
  
  */
-// 2024-07-29 - GAV
-//   This is now causing a multiple definition error on linking
-//uint32_t OPENSSL_ia32cap_P[4] = { 0 };
+uint32_t OPENSSL_ia32cap_P[4] = { 0 };
 
 const vector<unsigned char> HexOrContainer ( const fmx::DataVect& parameters, const fmx::uint32 which )
 {