Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / boringssl / src / crypto / CMakeLists.txt

diff --git a/src/third_party/boringssl/src/crypto/CMakeLists.txt b/src/third_party/boringssl/src/crypto/CMakeLists.txt
index 2e255b8..d820e82 100644 (file)
--- a/src/third_party/boringssl/src/crypto/CMakeLists.txt
+++ b/src/third_party/boringssl/src/crypto/CMakeLists.txt
@@ -4,20 +4,22 @@ if(APPLE)
        set(PERLASM_STYLE macosx)
        set(ASM_EXT S)
        enable_language(ASM)
-else(UNIX)
+elseif(UNIX)
        set(PERLASM_STYLE elf)
        set(ASM_EXT S)
        enable_language(ASM)
 else()
        if (CMAKE_CL_64)
-               message("Using masm")
-               set(PERLASM_STYLE masm)
+               message("Using nasm")
+               set(PERLASM_STYLE nasm)
        else()
                message("Using win32n")
                set(PERLASM_STYLE win32n)
        endif()
+
+       # On Windows, we use the NASM output, specifically built with Yasm.
        set(ASM_EXT asm)
-       enable_language(ASM_MASM)
+       enable_language(ASM_NASM)
 endif()
 
 function(perlasm dest src)
@@ -27,9 +29,10 @@ function(perlasm dest src)
                DEPENDS
                ${src}
                ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86_64-xlate.pl
-               ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86gas.pl
-               ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86asm.pl
                ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86asm.pl
+               ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86gas.pl
+               ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86masm.pl
+               ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86nasm.pl
                WORKING_DIRECTORY .
        )
 endfunction()
@@ -71,6 +74,7 @@ add_subdirectory(bytestring)
 
 # Level 0.2 - depends on nothing but itself
 add_subdirectory(sha)
+add_subdirectory(md4)
 add_subdirectory(md5)
 add_subdirectory(modes)
 add_subdirectory(aes)
@@ -112,6 +116,7 @@ add_library(
        crypto
        STATIC
 
+       crypto.c
        crypto_error.c
        mem.c
        thread.c
@@ -129,6 +134,7 @@ add_library(
        $<TARGET_OBJECTS:base64>
        $<TARGET_OBJECTS:bytestring>
        $<TARGET_OBJECTS:sha>
+       $<TARGET_OBJECTS:md4>
        $<TARGET_OBJECTS:md5>
        $<TARGET_OBJECTS:digest>
        $<TARGET_OBJECTS:cipher>