Help libzrtp build without ECC files
More build system work may be needed.
This commit is contained in:
Ivo Kutts
Travis Cross
parent
c7e476402a
commit
fcfa41e537
|
|
@ -123,7 +123,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef ZRTP_ENABLE_EC
|
||||
#define ZRTP_ENABLE_EC 1
|
||||
#define ZRTP_ENABLE_EC 0
|
||||
#endif
|
||||
|
||||
#ifndef ZRTP_DEBUG_WITH_PJSIP
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../include;../../third_party/bnlib;../../third_party/bgaes;../../test/include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=1"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="../../include;../../third_party/bnlib;../../third_party/bgaes"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=1"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="0"
|
||||
StructMemberAlignment="0"
|
||||
|
|
@ -180,10 +180,6 @@
|
|||
RelativePath="..\..\include\zrtp_crypto.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\zrtp_ec.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\zrtp_engine.h"
|
||||
>
|
||||
|
|
@ -248,10 +244,6 @@
|
|||
RelativePath="..\..\include\zrtp_utils.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\zrtp_version.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="src"
|
||||
|
|
@ -272,14 +264,6 @@
|
|||
RelativePath="..\..\src\zrtp_crypto_atl.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_crypto_ec.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_crypto_ecdh.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_crypto_hash.c"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
ExecutionBucket="7"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"
|
||||
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=1"
|
||||
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=0"
|
||||
MinimalRebuild="true"
|
||||
RuntimeLibrary="1"
|
||||
StructMemberAlignment="0"
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
ExecutionBucket="7"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"
|
||||
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=1"
|
||||
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=0"
|
||||
MinimalRebuild="true"
|
||||
RuntimeLibrary="1"
|
||||
BufferSecurityCheck="false"
|
||||
|
|
@ -219,7 +219,7 @@
|
|||
ExecutionBucket="7"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"
|
||||
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=1"
|
||||
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=0"
|
||||
RuntimeLibrary="0"
|
||||
BufferSecurityCheck="false"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -300,7 +300,7 @@
|
|||
ExecutionBucket="7"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"
|
||||
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=1"
|
||||
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=0"
|
||||
RuntimeLibrary="0"
|
||||
BufferSecurityCheck="false"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -382,10 +382,6 @@
|
|||
RelativePath="..\..\include\zrtp_crypto.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\zrtp_ec.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\zrtp_engine.h"
|
||||
>
|
||||
|
|
@ -466,18 +462,6 @@
|
|||
RelativePath="..\..\src\zrtp_crypto_atl.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_crypto_ec.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_crypto_ecdh.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_crypto_ecdsa.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_crypto_hash.c"
|
||||
>
|
||||
|
|
@ -498,10 +482,6 @@
|
|||
RelativePath="..\..\src\zrtp_engine.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_engine_driven.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\zrtp_iface_cache.c"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -43,9 +43,6 @@ protocol = \
|
|||
../../src/zrtp_crypto_sas.obj \
|
||||
../../src/zrtp_datatypes.obj \
|
||||
../../src/zrtp_engine.obj \
|
||||
../../src/enterprise/zrtp_engine_driven.obj \
|
||||
../../src/enterprise/zrtp_crypto_ec.obj \
|
||||
../../src/enterprise/zrtp_crypto_ecdh.obj \
|
||||
../../src/zrtp_iface_sys.obj \
|
||||
../../src/zrtp_initiator.obj \
|
||||
../../src/zrtp_legal.obj \
|
||||
|
|
@ -74,13 +71,13 @@ OBJECTS = $(bnlib) $(protocol) $(bgaes)
|
|||
|
||||
# Debug
|
||||
|
||||
OUT_DIR = debug_ec.km
|
||||
OUT_DIR = debug.km
|
||||
|
||||
DEFINES_D = -D_X86_=1 -Di386=1 -DSTD_CALL -DCONDITION_HANDLING=1 \
|
||||
-DNT_UP=1 -DNT_INST=0 -DWIN32=100 -D_NT1X_=100 \
|
||||
-DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDBG=1 -D_DEBUG -DDEBUG -DDEVL=1 \
|
||||
-DFPO=0 -D_DLL=1 -D_IDWBUILD -DRDRDBG -DSRVDBG -DDBG_MESSAGES=1 \
|
||||
-D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1
|
||||
-D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=0
|
||||
|
||||
CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX- \
|
||||
-GR- -GF -FI$(DDK)\inc\$(OS)\warning.h -Z7 -Od -Oi -Oy- -W3
|
||||
|
|
@ -89,13 +86,13 @@ CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX-
|
|||
|
||||
# Release
|
||||
|
||||
OUT_DIR = release_ec.km
|
||||
OUT_DIR = release.km
|
||||
|
||||
DEFINES_D = -D_X86_=1 -Di386=1 -DSTD_CALL -DCONDITION_HANDLING=1 \
|
||||
-DNT_UP=1 -DNO_DISK_ACCESS -DNT_INST=0 -DWIN32=100 -D_NT1X_=100 \
|
||||
-DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDEVL=1 \
|
||||
-DFPO=1 -DNDEBUG -D_DLL=1 -D_IDWBUILD -D_UNICODE \
|
||||
-DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1
|
||||
-DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=0
|
||||
|
||||
CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX- \
|
||||
-GR- -GF -Oxs -Oy -FI$(DDK)\inc\$(OS)\warning.h -W3 -FAcs -Z7
|
||||
|
|
@ -108,6 +105,7 @@ AINCLUDE = -I. -I$(DDK)\inc
|
|||
|
||||
CFLAGS = $(CFLAGS_D) -nologo -DHAVE_CONFIG_H=1 -DNT_DRIVER -D__BUILDMACHINE__=WinDDK \
|
||||
-I$(DDK)\inc\$(OS) -I$(DDK)\inc\ddk\$(OS) -I$(DDK)\inc\ddk\wdm\$(OS) \
|
||||
-I. -Ibnlib -Iinclude \
|
||||
-I$(DDK)\inc\crt -I..\..\third_party\bnlib\config -I..\..\third_party\bnlib \
|
||||
-I..\..\third_party\bgaes -I..\..\test\include -I..\..\include -I..\..\include\enterprise
|
||||
|
||||
|
|
|
|||
|
|
@ -44,9 +44,6 @@ protocol = \
|
|||
../../src/zrtp_crypto_sas.obj \
|
||||
../../src/zrtp_datatypes.obj \
|
||||
../../src/zrtp_engine.obj \
|
||||
../../src/enterprise/zrtp_engine_driven.obj \
|
||||
../../src/enterprise/zrtp_crypto_ec.obj \
|
||||
../../src/enterprise/zrtp_crypto_ecdh.obj \
|
||||
../../src/zrtp_iface_sys.obj \
|
||||
../../src/zrtp_initiator.obj \
|
||||
../../src/zrtp_legal.obj \
|
||||
|
|
@ -69,21 +66,20 @@ bgaes = \
|
|||
../../third_party/bgaes/sha1.obj \
|
||||
../../third_party/bgaes/sha2.obj
|
||||
|
||||
|
||||
OBJECTS = $(bnlib) $(protocol) $(bgaes)
|
||||
|
||||
!IFNDEF RELEASE
|
||||
|
||||
# Debug
|
||||
|
||||
OUT_DIR = debug64_ec.km
|
||||
OUT_DIR = debug64.km
|
||||
|
||||
DEFINES_D = -DWIN64=1 -D_WIN64=1 -D_AMD64_=1 -D_M_AMD64 -D_WINDOWS \
|
||||
-DSTD_CALL -DCONDITION_HANDLING=1 \
|
||||
-DNT_UP=1 -DNT_INST=0 -D_NT1X_=100 \
|
||||
-DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDBG=1 -D_DEBUG -DDEBUG -DDEVL=1 \
|
||||
-DFPO=0 -D_DLL=1 -D_IDWBUILD -DRDRDBG -DSRVDBG -DDBG_MESSAGES=1 \
|
||||
-D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1
|
||||
-D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=0
|
||||
|
||||
CFLAGS_D = $(DEFINES_D) -Zp8 -Gy -cbstring -Gz -Gm- -EHs-c- \
|
||||
-GR- -GF -FI$(DDK)\inc\$(OS)\warning.h -Z7 -Od -Oi -Oy- -W3
|
||||
|
|
@ -92,14 +88,14 @@ CFLAGS_D = $(DEFINES_D) -Zp8 -Gy -cbstring -Gz -Gm- -EHs-c- \
|
|||
|
||||
# Release
|
||||
|
||||
OUT_DIR = release64_ec.km
|
||||
OUT_DIR = release64.km
|
||||
|
||||
DEFINES_D = -DWIN64=1 -D_WIN64=1 -D_AMD64_=1 -D_M_AMD64 -D_WINDOWS \
|
||||
-DSTD_CALL -DCONDITION_HANDLING=1 \
|
||||
-DNT_UP=1 -DNO_DISK_ACCESS -DNT_INST=0 -DWIN32=100 -D_NT1X_=100 \
|
||||
-DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDEVL=1 \
|
||||
-DFPO=1 -DNDEBUG -D_DLL=1 -D_IDWBUILD -D_UNICODE \
|
||||
-DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1
|
||||
-DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=0
|
||||
|
||||
CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX- \
|
||||
-GR- -GF -Oxs -Oy -FI$(DDK)\inc\$(OS)\warning.h -W3 -FAcs -Z7
|
||||
|
|
|
|||
Loading…
Reference in New Issue