From ea2c2db12c218b5d3fd137442d277d462f9f1208 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 5 Mar 2018 01:54:27 -0300 Subject: [PATCH] Try to fix compile --- StepmaniaCore.cmake | 17 +++++------------ .../{include => includelibs}/openssl/aes.h | 0 .../{include => includelibs}/openssl/applink.c | 0 .../{include => includelibs}/openssl/asn1.h | 0 .../{include => includelibs}/openssl/asn1_mac.h | 0 .../{include => includelibs}/openssl/asn1t.h | 0 .../{include => includelibs}/openssl/bio.h | 0 .../{include => includelibs}/openssl/blowfish.h | 0 .../{include => includelibs}/openssl/bn.h | 0 .../{include => includelibs}/openssl/buffer.h | 0 .../{include => includelibs}/openssl/camellia.h | 0 .../{include => includelibs}/openssl/cast.h | 0 .../{include => includelibs}/openssl/cmac.h | 0 .../{include => includelibs}/openssl/cms.h | 0 .../{include => includelibs}/openssl/comp.h | 0 .../{include => includelibs}/openssl/conf.h | 0 .../{include => includelibs}/openssl/conf_api.h | 0 .../{include => includelibs}/openssl/crypto.h | 0 .../{include => includelibs}/openssl/des.h | 0 .../{include => includelibs}/openssl/des_old.h | 0 .../{include => includelibs}/openssl/dh.h | 0 .../{include => includelibs}/openssl/dsa.h | 0 .../{include => includelibs}/openssl/dso.h | 0 .../{include => includelibs}/openssl/dtls1.h | 0 .../{include => includelibs}/openssl/e_os2.h | 0 .../{include => includelibs}/openssl/ebcdic.h | 0 .../{include => includelibs}/openssl/ec.h | 0 .../{include => includelibs}/openssl/ecdh.h | 0 .../{include => includelibs}/openssl/ecdsa.h | 0 .../{include => includelibs}/openssl/engine.h | 0 .../{include => includelibs}/openssl/err.h | 0 .../{include => includelibs}/openssl/evp.h | 0 .../{include => includelibs}/openssl/hmac.h | 0 .../{include => includelibs}/openssl/idea.h | 0 .../{include => includelibs}/openssl/krb5_asn.h | 0 .../{include => includelibs}/openssl/kssl.h | 0 .../{include => includelibs}/openssl/lhash.h | 0 .../{include => includelibs}/openssl/md4.h | 0 .../{include => includelibs}/openssl/md5.h | 0 .../{include => includelibs}/openssl/mdc2.h | 0 .../{include => includelibs}/openssl/modes.h | 0 .../{include => includelibs}/openssl/obj_mac.h | 0 .../{include => includelibs}/openssl/objects.h | 0 .../{include => includelibs}/openssl/ocsp.h | 0 .../openssl/opensslconf.h | 0 .../{include => includelibs}/openssl/opensslv.h | 0 .../{include => includelibs}/openssl/ossl_typ.h | 0 .../{include => includelibs}/openssl/pem.h | 0 .../{include => includelibs}/openssl/pem2.h | 0 .../{include => includelibs}/openssl/pkcs12.h | 0 .../{include => includelibs}/openssl/pkcs7.h | 0 .../{include => includelibs}/openssl/pqueue.h | 0 .../{include => includelibs}/openssl/rand.h | 0 .../{include => includelibs}/openssl/rc2.h | 0 .../{include => includelibs}/openssl/rc4.h | 0 .../{include => includelibs}/openssl/ripemd.h | 0 .../{include => includelibs}/openssl/rsa.h | 0 .../openssl/safestack.h | 0 .../{include => includelibs}/openssl/seed.h | 0 .../{include => includelibs}/openssl/sha.h | 0 .../{include => includelibs}/openssl/srp.h | 0 .../{include => includelibs}/openssl/srtp.h | 0 .../{include => includelibs}/openssl/ssl.h | 0 .../{include => includelibs}/openssl/ssl2.h | 0 .../{include => includelibs}/openssl/ssl23.h | 0 .../{include => includelibs}/openssl/ssl3.h | 0 .../{include => includelibs}/openssl/stack.h | 0 .../{include => includelibs}/openssl/symhacks.h | 0 .../{include => includelibs}/openssl/tls1.h | 0 .../{include => includelibs}/openssl/ts.h | 0 .../{include => includelibs}/openssl/txt_db.h | 0 .../{include => includelibs}/openssl/ui.h | 0 .../openssl/ui_compat.h | 0 .../{include => includelibs}/openssl/whrlpool.h | 0 .../{include => includelibs}/openssl/x509.h | 0 .../{include => includelibs}/openssl/x509_vfy.h | 0 .../{include => includelibs}/openssl/x509v3.h | 0 .../uWebSocket/{include => includelibs}/tree.h | 0 .../{include => includelibs}/uv-errno.h | 0 .../{include => includelibs}/uv-threadpool.h | 0 .../{include => includelibs}/uv-version.h | 0 .../{include => includelibs}/uv-win.h | 5 ----- extern/uWebSocket/{include => includelibs}/uv.h | 0 src/CMakeLists.txt | 4 +--- 84 files changed, 6 insertions(+), 20 deletions(-) rename extern/uWebSocket/{include => includelibs}/openssl/aes.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/applink.c (100%) rename extern/uWebSocket/{include => includelibs}/openssl/asn1.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/asn1_mac.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/asn1t.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/bio.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/blowfish.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/bn.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/buffer.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/camellia.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/cast.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/cmac.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/cms.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/comp.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/conf.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/conf_api.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/crypto.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/des.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/des_old.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/dh.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/dsa.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/dso.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/dtls1.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/e_os2.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ebcdic.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ec.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ecdh.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ecdsa.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/engine.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/err.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/evp.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/hmac.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/idea.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/krb5_asn.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/kssl.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/lhash.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/md4.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/md5.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/mdc2.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/modes.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/obj_mac.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/objects.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ocsp.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/opensslconf.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/opensslv.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ossl_typ.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/pem.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/pem2.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/pkcs12.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/pkcs7.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/pqueue.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/rand.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/rc2.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/rc4.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ripemd.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/rsa.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/safestack.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/seed.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/sha.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/srp.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/srtp.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ssl.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ssl2.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ssl23.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ssl3.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/stack.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/symhacks.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/tls1.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ts.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/txt_db.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ui.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/ui_compat.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/whrlpool.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/x509.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/x509_vfy.h (100%) rename extern/uWebSocket/{include => includelibs}/openssl/x509v3.h (100%) rename extern/uWebSocket/{include => includelibs}/tree.h (100%) rename extern/uWebSocket/{include => includelibs}/uv-errno.h (100%) rename extern/uWebSocket/{include => includelibs}/uv-threadpool.h (100%) rename extern/uWebSocket/{include => includelibs}/uv-version.h (100%) rename extern/uWebSocket/{include => includelibs}/uv-win.h (99%) rename extern/uWebSocket/{include => includelibs}/uv.h (100%) diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake index 990fefcc98..6e158dd5b1 100644 --- a/StepmaniaCore.cmake +++ b/StepmaniaCore.cmake @@ -254,18 +254,11 @@ if(WIN32) link_libraries(${SM_EXTERN_DIR}/LuaJIT/lua51.lib) include_directories(${SM_EXTERN_DIR}/LuaJIT/include) - find_library(LIB_UWS NAMES "uWS" - PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH - ) - find_library(LIB_EAY NAMES "libeay32" - PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH - ) - find_library(LIB_SSL NAMES "ssleay32" - PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH - ) - find_library(LIB_UV NAMES "libuv" - PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH - ) + include_directories(${SM_EXTERN_DIR}/uWebSocket/include) + link_libraries(${SM_EXTERN_DIR}/uWebSocket/uWS.lib) + link_libraries(${SM_EXTERN_DIR}/uWebSocket/libeay32.lib) + link_libraries(${SM_EXTERN_DIR}/uWebSocket/ssleay32.lib) + link_libraries(${SM_EXTERN_DIR}/uWebSocket/libuv.lib) if (MINGW AND WITH_FFMPEG) include("${SM_CMAKE_DIR}/SetupFfmpeg.cmake") set(HAS_FFMPEG TRUE) diff --git a/extern/uWebSocket/include/openssl/aes.h b/extern/uWebSocket/includelibs/openssl/aes.h similarity index 100% rename from extern/uWebSocket/include/openssl/aes.h rename to extern/uWebSocket/includelibs/openssl/aes.h diff --git a/extern/uWebSocket/include/openssl/applink.c b/extern/uWebSocket/includelibs/openssl/applink.c similarity index 100% rename from extern/uWebSocket/include/openssl/applink.c rename to extern/uWebSocket/includelibs/openssl/applink.c diff --git a/extern/uWebSocket/include/openssl/asn1.h b/extern/uWebSocket/includelibs/openssl/asn1.h similarity index 100% rename from extern/uWebSocket/include/openssl/asn1.h rename to extern/uWebSocket/includelibs/openssl/asn1.h diff --git a/extern/uWebSocket/include/openssl/asn1_mac.h b/extern/uWebSocket/includelibs/openssl/asn1_mac.h similarity index 100% rename from extern/uWebSocket/include/openssl/asn1_mac.h rename to extern/uWebSocket/includelibs/openssl/asn1_mac.h diff --git a/extern/uWebSocket/include/openssl/asn1t.h b/extern/uWebSocket/includelibs/openssl/asn1t.h similarity index 100% rename from extern/uWebSocket/include/openssl/asn1t.h rename to extern/uWebSocket/includelibs/openssl/asn1t.h diff --git a/extern/uWebSocket/include/openssl/bio.h b/extern/uWebSocket/includelibs/openssl/bio.h similarity index 100% rename from extern/uWebSocket/include/openssl/bio.h rename to extern/uWebSocket/includelibs/openssl/bio.h diff --git a/extern/uWebSocket/include/openssl/blowfish.h b/extern/uWebSocket/includelibs/openssl/blowfish.h similarity index 100% rename from extern/uWebSocket/include/openssl/blowfish.h rename to extern/uWebSocket/includelibs/openssl/blowfish.h diff --git a/extern/uWebSocket/include/openssl/bn.h b/extern/uWebSocket/includelibs/openssl/bn.h similarity index 100% rename from extern/uWebSocket/include/openssl/bn.h rename to extern/uWebSocket/includelibs/openssl/bn.h diff --git a/extern/uWebSocket/include/openssl/buffer.h b/extern/uWebSocket/includelibs/openssl/buffer.h similarity index 100% rename from extern/uWebSocket/include/openssl/buffer.h rename to extern/uWebSocket/includelibs/openssl/buffer.h diff --git a/extern/uWebSocket/include/openssl/camellia.h b/extern/uWebSocket/includelibs/openssl/camellia.h similarity index 100% rename from extern/uWebSocket/include/openssl/camellia.h rename to extern/uWebSocket/includelibs/openssl/camellia.h diff --git a/extern/uWebSocket/include/openssl/cast.h b/extern/uWebSocket/includelibs/openssl/cast.h similarity index 100% rename from extern/uWebSocket/include/openssl/cast.h rename to extern/uWebSocket/includelibs/openssl/cast.h diff --git a/extern/uWebSocket/include/openssl/cmac.h b/extern/uWebSocket/includelibs/openssl/cmac.h similarity index 100% rename from extern/uWebSocket/include/openssl/cmac.h rename to extern/uWebSocket/includelibs/openssl/cmac.h diff --git a/extern/uWebSocket/include/openssl/cms.h b/extern/uWebSocket/includelibs/openssl/cms.h similarity index 100% rename from extern/uWebSocket/include/openssl/cms.h rename to extern/uWebSocket/includelibs/openssl/cms.h diff --git a/extern/uWebSocket/include/openssl/comp.h b/extern/uWebSocket/includelibs/openssl/comp.h similarity index 100% rename from extern/uWebSocket/include/openssl/comp.h rename to extern/uWebSocket/includelibs/openssl/comp.h diff --git a/extern/uWebSocket/include/openssl/conf.h b/extern/uWebSocket/includelibs/openssl/conf.h similarity index 100% rename from extern/uWebSocket/include/openssl/conf.h rename to extern/uWebSocket/includelibs/openssl/conf.h diff --git a/extern/uWebSocket/include/openssl/conf_api.h b/extern/uWebSocket/includelibs/openssl/conf_api.h similarity index 100% rename from extern/uWebSocket/include/openssl/conf_api.h rename to extern/uWebSocket/includelibs/openssl/conf_api.h diff --git a/extern/uWebSocket/include/openssl/crypto.h b/extern/uWebSocket/includelibs/openssl/crypto.h similarity index 100% rename from extern/uWebSocket/include/openssl/crypto.h rename to extern/uWebSocket/includelibs/openssl/crypto.h diff --git a/extern/uWebSocket/include/openssl/des.h b/extern/uWebSocket/includelibs/openssl/des.h similarity index 100% rename from extern/uWebSocket/include/openssl/des.h rename to extern/uWebSocket/includelibs/openssl/des.h diff --git a/extern/uWebSocket/include/openssl/des_old.h b/extern/uWebSocket/includelibs/openssl/des_old.h similarity index 100% rename from extern/uWebSocket/include/openssl/des_old.h rename to extern/uWebSocket/includelibs/openssl/des_old.h diff --git a/extern/uWebSocket/include/openssl/dh.h b/extern/uWebSocket/includelibs/openssl/dh.h similarity index 100% rename from extern/uWebSocket/include/openssl/dh.h rename to extern/uWebSocket/includelibs/openssl/dh.h diff --git a/extern/uWebSocket/include/openssl/dsa.h b/extern/uWebSocket/includelibs/openssl/dsa.h similarity index 100% rename from extern/uWebSocket/include/openssl/dsa.h rename to extern/uWebSocket/includelibs/openssl/dsa.h diff --git a/extern/uWebSocket/include/openssl/dso.h b/extern/uWebSocket/includelibs/openssl/dso.h similarity index 100% rename from extern/uWebSocket/include/openssl/dso.h rename to extern/uWebSocket/includelibs/openssl/dso.h diff --git a/extern/uWebSocket/include/openssl/dtls1.h b/extern/uWebSocket/includelibs/openssl/dtls1.h similarity index 100% rename from extern/uWebSocket/include/openssl/dtls1.h rename to extern/uWebSocket/includelibs/openssl/dtls1.h diff --git a/extern/uWebSocket/include/openssl/e_os2.h b/extern/uWebSocket/includelibs/openssl/e_os2.h similarity index 100% rename from extern/uWebSocket/include/openssl/e_os2.h rename to extern/uWebSocket/includelibs/openssl/e_os2.h diff --git a/extern/uWebSocket/include/openssl/ebcdic.h b/extern/uWebSocket/includelibs/openssl/ebcdic.h similarity index 100% rename from extern/uWebSocket/include/openssl/ebcdic.h rename to extern/uWebSocket/includelibs/openssl/ebcdic.h diff --git a/extern/uWebSocket/include/openssl/ec.h b/extern/uWebSocket/includelibs/openssl/ec.h similarity index 100% rename from extern/uWebSocket/include/openssl/ec.h rename to extern/uWebSocket/includelibs/openssl/ec.h diff --git a/extern/uWebSocket/include/openssl/ecdh.h b/extern/uWebSocket/includelibs/openssl/ecdh.h similarity index 100% rename from extern/uWebSocket/include/openssl/ecdh.h rename to extern/uWebSocket/includelibs/openssl/ecdh.h diff --git a/extern/uWebSocket/include/openssl/ecdsa.h b/extern/uWebSocket/includelibs/openssl/ecdsa.h similarity index 100% rename from extern/uWebSocket/include/openssl/ecdsa.h rename to extern/uWebSocket/includelibs/openssl/ecdsa.h diff --git a/extern/uWebSocket/include/openssl/engine.h b/extern/uWebSocket/includelibs/openssl/engine.h similarity index 100% rename from extern/uWebSocket/include/openssl/engine.h rename to extern/uWebSocket/includelibs/openssl/engine.h diff --git a/extern/uWebSocket/include/openssl/err.h b/extern/uWebSocket/includelibs/openssl/err.h similarity index 100% rename from extern/uWebSocket/include/openssl/err.h rename to extern/uWebSocket/includelibs/openssl/err.h diff --git a/extern/uWebSocket/include/openssl/evp.h b/extern/uWebSocket/includelibs/openssl/evp.h similarity index 100% rename from extern/uWebSocket/include/openssl/evp.h rename to extern/uWebSocket/includelibs/openssl/evp.h diff --git a/extern/uWebSocket/include/openssl/hmac.h b/extern/uWebSocket/includelibs/openssl/hmac.h similarity index 100% rename from extern/uWebSocket/include/openssl/hmac.h rename to extern/uWebSocket/includelibs/openssl/hmac.h diff --git a/extern/uWebSocket/include/openssl/idea.h b/extern/uWebSocket/includelibs/openssl/idea.h similarity index 100% rename from extern/uWebSocket/include/openssl/idea.h rename to extern/uWebSocket/includelibs/openssl/idea.h diff --git a/extern/uWebSocket/include/openssl/krb5_asn.h b/extern/uWebSocket/includelibs/openssl/krb5_asn.h similarity index 100% rename from extern/uWebSocket/include/openssl/krb5_asn.h rename to extern/uWebSocket/includelibs/openssl/krb5_asn.h diff --git a/extern/uWebSocket/include/openssl/kssl.h b/extern/uWebSocket/includelibs/openssl/kssl.h similarity index 100% rename from extern/uWebSocket/include/openssl/kssl.h rename to extern/uWebSocket/includelibs/openssl/kssl.h diff --git a/extern/uWebSocket/include/openssl/lhash.h b/extern/uWebSocket/includelibs/openssl/lhash.h similarity index 100% rename from extern/uWebSocket/include/openssl/lhash.h rename to extern/uWebSocket/includelibs/openssl/lhash.h diff --git a/extern/uWebSocket/include/openssl/md4.h b/extern/uWebSocket/includelibs/openssl/md4.h similarity index 100% rename from extern/uWebSocket/include/openssl/md4.h rename to extern/uWebSocket/includelibs/openssl/md4.h diff --git a/extern/uWebSocket/include/openssl/md5.h b/extern/uWebSocket/includelibs/openssl/md5.h similarity index 100% rename from extern/uWebSocket/include/openssl/md5.h rename to extern/uWebSocket/includelibs/openssl/md5.h diff --git a/extern/uWebSocket/include/openssl/mdc2.h b/extern/uWebSocket/includelibs/openssl/mdc2.h similarity index 100% rename from extern/uWebSocket/include/openssl/mdc2.h rename to extern/uWebSocket/includelibs/openssl/mdc2.h diff --git a/extern/uWebSocket/include/openssl/modes.h b/extern/uWebSocket/includelibs/openssl/modes.h similarity index 100% rename from extern/uWebSocket/include/openssl/modes.h rename to extern/uWebSocket/includelibs/openssl/modes.h diff --git a/extern/uWebSocket/include/openssl/obj_mac.h b/extern/uWebSocket/includelibs/openssl/obj_mac.h similarity index 100% rename from extern/uWebSocket/include/openssl/obj_mac.h rename to extern/uWebSocket/includelibs/openssl/obj_mac.h diff --git a/extern/uWebSocket/include/openssl/objects.h b/extern/uWebSocket/includelibs/openssl/objects.h similarity index 100% rename from extern/uWebSocket/include/openssl/objects.h rename to extern/uWebSocket/includelibs/openssl/objects.h diff --git a/extern/uWebSocket/include/openssl/ocsp.h b/extern/uWebSocket/includelibs/openssl/ocsp.h similarity index 100% rename from extern/uWebSocket/include/openssl/ocsp.h rename to extern/uWebSocket/includelibs/openssl/ocsp.h diff --git a/extern/uWebSocket/include/openssl/opensslconf.h b/extern/uWebSocket/includelibs/openssl/opensslconf.h similarity index 100% rename from extern/uWebSocket/include/openssl/opensslconf.h rename to extern/uWebSocket/includelibs/openssl/opensslconf.h diff --git a/extern/uWebSocket/include/openssl/opensslv.h b/extern/uWebSocket/includelibs/openssl/opensslv.h similarity index 100% rename from extern/uWebSocket/include/openssl/opensslv.h rename to extern/uWebSocket/includelibs/openssl/opensslv.h diff --git a/extern/uWebSocket/include/openssl/ossl_typ.h b/extern/uWebSocket/includelibs/openssl/ossl_typ.h similarity index 100% rename from extern/uWebSocket/include/openssl/ossl_typ.h rename to extern/uWebSocket/includelibs/openssl/ossl_typ.h diff --git a/extern/uWebSocket/include/openssl/pem.h b/extern/uWebSocket/includelibs/openssl/pem.h similarity index 100% rename from extern/uWebSocket/include/openssl/pem.h rename to extern/uWebSocket/includelibs/openssl/pem.h diff --git a/extern/uWebSocket/include/openssl/pem2.h b/extern/uWebSocket/includelibs/openssl/pem2.h similarity index 100% rename from extern/uWebSocket/include/openssl/pem2.h rename to extern/uWebSocket/includelibs/openssl/pem2.h diff --git a/extern/uWebSocket/include/openssl/pkcs12.h b/extern/uWebSocket/includelibs/openssl/pkcs12.h similarity index 100% rename from extern/uWebSocket/include/openssl/pkcs12.h rename to extern/uWebSocket/includelibs/openssl/pkcs12.h diff --git a/extern/uWebSocket/include/openssl/pkcs7.h b/extern/uWebSocket/includelibs/openssl/pkcs7.h similarity index 100% rename from extern/uWebSocket/include/openssl/pkcs7.h rename to extern/uWebSocket/includelibs/openssl/pkcs7.h diff --git a/extern/uWebSocket/include/openssl/pqueue.h b/extern/uWebSocket/includelibs/openssl/pqueue.h similarity index 100% rename from extern/uWebSocket/include/openssl/pqueue.h rename to extern/uWebSocket/includelibs/openssl/pqueue.h diff --git a/extern/uWebSocket/include/openssl/rand.h b/extern/uWebSocket/includelibs/openssl/rand.h similarity index 100% rename from extern/uWebSocket/include/openssl/rand.h rename to extern/uWebSocket/includelibs/openssl/rand.h diff --git a/extern/uWebSocket/include/openssl/rc2.h b/extern/uWebSocket/includelibs/openssl/rc2.h similarity index 100% rename from extern/uWebSocket/include/openssl/rc2.h rename to extern/uWebSocket/includelibs/openssl/rc2.h diff --git a/extern/uWebSocket/include/openssl/rc4.h b/extern/uWebSocket/includelibs/openssl/rc4.h similarity index 100% rename from extern/uWebSocket/include/openssl/rc4.h rename to extern/uWebSocket/includelibs/openssl/rc4.h diff --git a/extern/uWebSocket/include/openssl/ripemd.h b/extern/uWebSocket/includelibs/openssl/ripemd.h similarity index 100% rename from extern/uWebSocket/include/openssl/ripemd.h rename to extern/uWebSocket/includelibs/openssl/ripemd.h diff --git a/extern/uWebSocket/include/openssl/rsa.h b/extern/uWebSocket/includelibs/openssl/rsa.h similarity index 100% rename from extern/uWebSocket/include/openssl/rsa.h rename to extern/uWebSocket/includelibs/openssl/rsa.h diff --git a/extern/uWebSocket/include/openssl/safestack.h b/extern/uWebSocket/includelibs/openssl/safestack.h similarity index 100% rename from extern/uWebSocket/include/openssl/safestack.h rename to extern/uWebSocket/includelibs/openssl/safestack.h diff --git a/extern/uWebSocket/include/openssl/seed.h b/extern/uWebSocket/includelibs/openssl/seed.h similarity index 100% rename from extern/uWebSocket/include/openssl/seed.h rename to extern/uWebSocket/includelibs/openssl/seed.h diff --git a/extern/uWebSocket/include/openssl/sha.h b/extern/uWebSocket/includelibs/openssl/sha.h similarity index 100% rename from extern/uWebSocket/include/openssl/sha.h rename to extern/uWebSocket/includelibs/openssl/sha.h diff --git a/extern/uWebSocket/include/openssl/srp.h b/extern/uWebSocket/includelibs/openssl/srp.h similarity index 100% rename from extern/uWebSocket/include/openssl/srp.h rename to extern/uWebSocket/includelibs/openssl/srp.h diff --git a/extern/uWebSocket/include/openssl/srtp.h b/extern/uWebSocket/includelibs/openssl/srtp.h similarity index 100% rename from extern/uWebSocket/include/openssl/srtp.h rename to extern/uWebSocket/includelibs/openssl/srtp.h diff --git a/extern/uWebSocket/include/openssl/ssl.h b/extern/uWebSocket/includelibs/openssl/ssl.h similarity index 100% rename from extern/uWebSocket/include/openssl/ssl.h rename to extern/uWebSocket/includelibs/openssl/ssl.h diff --git a/extern/uWebSocket/include/openssl/ssl2.h b/extern/uWebSocket/includelibs/openssl/ssl2.h similarity index 100% rename from extern/uWebSocket/include/openssl/ssl2.h rename to extern/uWebSocket/includelibs/openssl/ssl2.h diff --git a/extern/uWebSocket/include/openssl/ssl23.h b/extern/uWebSocket/includelibs/openssl/ssl23.h similarity index 100% rename from extern/uWebSocket/include/openssl/ssl23.h rename to extern/uWebSocket/includelibs/openssl/ssl23.h diff --git a/extern/uWebSocket/include/openssl/ssl3.h b/extern/uWebSocket/includelibs/openssl/ssl3.h similarity index 100% rename from extern/uWebSocket/include/openssl/ssl3.h rename to extern/uWebSocket/includelibs/openssl/ssl3.h diff --git a/extern/uWebSocket/include/openssl/stack.h b/extern/uWebSocket/includelibs/openssl/stack.h similarity index 100% rename from extern/uWebSocket/include/openssl/stack.h rename to extern/uWebSocket/includelibs/openssl/stack.h diff --git a/extern/uWebSocket/include/openssl/symhacks.h b/extern/uWebSocket/includelibs/openssl/symhacks.h similarity index 100% rename from extern/uWebSocket/include/openssl/symhacks.h rename to extern/uWebSocket/includelibs/openssl/symhacks.h diff --git a/extern/uWebSocket/include/openssl/tls1.h b/extern/uWebSocket/includelibs/openssl/tls1.h similarity index 100% rename from extern/uWebSocket/include/openssl/tls1.h rename to extern/uWebSocket/includelibs/openssl/tls1.h diff --git a/extern/uWebSocket/include/openssl/ts.h b/extern/uWebSocket/includelibs/openssl/ts.h similarity index 100% rename from extern/uWebSocket/include/openssl/ts.h rename to extern/uWebSocket/includelibs/openssl/ts.h diff --git a/extern/uWebSocket/include/openssl/txt_db.h b/extern/uWebSocket/includelibs/openssl/txt_db.h similarity index 100% rename from extern/uWebSocket/include/openssl/txt_db.h rename to extern/uWebSocket/includelibs/openssl/txt_db.h diff --git a/extern/uWebSocket/include/openssl/ui.h b/extern/uWebSocket/includelibs/openssl/ui.h similarity index 100% rename from extern/uWebSocket/include/openssl/ui.h rename to extern/uWebSocket/includelibs/openssl/ui.h diff --git a/extern/uWebSocket/include/openssl/ui_compat.h b/extern/uWebSocket/includelibs/openssl/ui_compat.h similarity index 100% rename from extern/uWebSocket/include/openssl/ui_compat.h rename to extern/uWebSocket/includelibs/openssl/ui_compat.h diff --git a/extern/uWebSocket/include/openssl/whrlpool.h b/extern/uWebSocket/includelibs/openssl/whrlpool.h similarity index 100% rename from extern/uWebSocket/include/openssl/whrlpool.h rename to extern/uWebSocket/includelibs/openssl/whrlpool.h diff --git a/extern/uWebSocket/include/openssl/x509.h b/extern/uWebSocket/includelibs/openssl/x509.h similarity index 100% rename from extern/uWebSocket/include/openssl/x509.h rename to extern/uWebSocket/includelibs/openssl/x509.h diff --git a/extern/uWebSocket/include/openssl/x509_vfy.h b/extern/uWebSocket/includelibs/openssl/x509_vfy.h similarity index 100% rename from extern/uWebSocket/include/openssl/x509_vfy.h rename to extern/uWebSocket/includelibs/openssl/x509_vfy.h diff --git a/extern/uWebSocket/include/openssl/x509v3.h b/extern/uWebSocket/includelibs/openssl/x509v3.h similarity index 100% rename from extern/uWebSocket/include/openssl/x509v3.h rename to extern/uWebSocket/includelibs/openssl/x509v3.h diff --git a/extern/uWebSocket/include/tree.h b/extern/uWebSocket/includelibs/tree.h similarity index 100% rename from extern/uWebSocket/include/tree.h rename to extern/uWebSocket/includelibs/tree.h diff --git a/extern/uWebSocket/include/uv-errno.h b/extern/uWebSocket/includelibs/uv-errno.h similarity index 100% rename from extern/uWebSocket/include/uv-errno.h rename to extern/uWebSocket/includelibs/uv-errno.h diff --git a/extern/uWebSocket/include/uv-threadpool.h b/extern/uWebSocket/includelibs/uv-threadpool.h similarity index 100% rename from extern/uWebSocket/include/uv-threadpool.h rename to extern/uWebSocket/includelibs/uv-threadpool.h diff --git a/extern/uWebSocket/include/uv-version.h b/extern/uWebSocket/includelibs/uv-version.h similarity index 100% rename from extern/uWebSocket/include/uv-version.h rename to extern/uWebSocket/includelibs/uv-version.h diff --git a/extern/uWebSocket/include/uv-win.h b/extern/uWebSocket/includelibs/uv-win.h similarity index 99% rename from extern/uWebSocket/include/uv-win.h rename to extern/uWebSocket/includelibs/uv-win.h index 4c6c50a29c..c2fd219c23 100644 --- a/extern/uWebSocket/include/uv-win.h +++ b/extern/uWebSocket/includelibs/uv-win.h @@ -23,11 +23,6 @@ # define _WIN32_WINNT 0x0600 #endif -#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) -typedef intptr_t ssize_t; -# define _SSIZE_T_ -# define _SSIZE_T_DEFINED -#endif #include diff --git a/extern/uWebSocket/include/uv.h b/extern/uWebSocket/includelibs/uv.h similarity index 100% rename from extern/uWebSocket/include/uv.h rename to extern/uWebSocket/includelibs/uv.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a0b1e820a..dd3aecd704 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -534,9 +534,7 @@ list(APPEND SM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} "${SM_SRC_DIR}/generated" ) -list(APPEND SM_INCLUDE_DIRS -"${SM_EXTERN_DIR}/uWebSocket/include" -) + if(NOT APPLE) list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/glew-1.5.8/include"