aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2019-01-01 08:06:20 -0600
committerBrent Cook <busterb@gmail.com>2019-01-01 15:44:11 -0600
commit0f0bec5a76cffe27293c8f88449e86d674f7d9ef (patch)
treee5a7ad909971a5c68a274aad3bbce4d60895640b /crypto
parent20503fd6ac65cb3dae57d2265551fa4b9a142a6d (diff)
downloadportable-0f0bec5a76cffe27293c8f88449e86d674f7d9ef.tar.gz
portable-0f0bec5a76cffe27293c8f88449e86d674f7d9ef.tar.bz2
portable-0f0bec5a76cffe27293c8f88449e86d674f7d9ef.zip
build crypto_lock_win.c in-place
Diffstat (limited to 'crypto')
-rw-r--r--crypto/CMakeLists.txt2
-rw-r--r--crypto/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index c37bacf..250be82 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -669,7 +669,7 @@ if(UNIX)
669endif() 669endif()
670 670
671if(WIN32) 671if(WIN32)
672 set(CRYPTO_SRC ${CRYPTO_SRC} crypto_lock_win.c) 672 set(CRYPTO_SRC ${CRYPTO_SRC} compat/crypto_lock_win.c)
673 set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) 673 set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c)
674 set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) 674 set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
675 set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) 675 set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c)
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index e9f0f7a..6cb1b49 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -216,7 +216,7 @@ libcrypto_la_SOURCES += crypto_init.c
216if !HOST_WIN 216if !HOST_WIN
217libcrypto_la_SOURCES += crypto_lock.c 217libcrypto_la_SOURCES += crypto_lock.c
218else 218else
219libcrypto_la_SOURCES += crypto_lock_win.c 219libcrypto_la_SOURCES += compat/crypto_lock_win.c
220endif 220endif
221libcrypto_la_SOURCES += cversion.c 221libcrypto_la_SOURCES += cversion.c
222libcrypto_la_SOURCES += ex_data.c 222libcrypto_la_SOURCES += ex_data.c