Browse Source

Removing OpenSSL defines that are clearly either obsolete or not part of public API from Neon makefile

Plus some reordering

Source commit: 04685847c2fbf56992b6315a1c643da15ef4a169
Martin Prikryl 2 weeks ago
parent
commit
4141a203d5
1 changed files with 2 additions and 2 deletions
  1. 2 2
      libs/neon/Makefile.bcb

+ 2 - 2
libs/neon/Makefile.bcb

@@ -1,9 +1,9 @@
 !include ../Makefile.inc
 
 # Set your compiler options
-OPENSSL_DEFINES=OPENSSL_SYSNAME_WIN32;L_ENDIAN;DSO_WIN32;BN_ASM;MD5_ASM;SHA1_ASM;RMD160_ASM;OPENSSL_NO_CAMELLIA;OPENSSL_NO_SEED;OPENSSL_NO_RC5;OPENSSL_NO_MDC2;OPENSSL_NO_CMS;OPENSSL_NO_CAPIENG;OPENSSL_NO_KRB5;OPENSSL_NO_ENGINE;OPENSSL_NO_DYNAMIC_ENGINE;OPENSSL_DISABLE_OLD_DES_SUPPORT;NO_CHMOD;OPENSSL_NO_DGRAM;OPENSSL_NO_EC;OPENSSL_NO_ECDH;OPENSSL_NO_ECDSA;DOPENSSL_NO_EC_NISTP_64_GCC_128
+OPENSSL_DEFINES=L_ENDIAN;DSO_WIN32;OPENSSL_NO_CAMELLIA;OPENSSL_NO_SEED;OPENSSL_NO_RC5;OPENSSL_NO_MDC2;OPENSSL_NO_CMS;OPENSSL_NO_CAPIENG;OPENSSL_NO_KRB5;OPENSSL_NO_ENGINE;OPENSSL_NO_DYNAMIC_ENGINE;OPENSSL_NO_DGRAM;OPENSSL_NO_EC;OPENSSL_NO_ECDH;OPENSSL_NO_ECDSA
 EXPAT_DEFINES=COMPILED_FROM_DSP;XML_STATIC
-DEFINES=WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WIN32;NDEBUG;_LIB;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL;NE_HAVE_SSL;HAVE_OPENSSL;HAVE_EXPAT;HAVE_EXPAT_H;NE_HAVE_DAV;NE_LFS;NOUSER;NOGDI;HAVE_STRTOLL;WINSCP
+DEFINES=WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WIN32;NOUSER;NOGDI;NDEBUG;_LIB;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL;NE_HAVE_SSL;HAVE_OPENSSL;HAVE_EXPAT;HAVE_EXPAT_H;NE_HAVE_DAV;NE_LFS;HAVE_STRTOLL;WINSCP
 ALLDEFINES=$(OPENSSL_DEFINES);$(EXPAT_DEFINES);$(DEFINES)
 WARNINGS=-Wno-typedef-redefinition -Wno-incompatible-pointer-types
 CFLAG=$(CFLAG_COMMON) $(WARNINGS)