Merge branch 'moteus_rock'

This commit is contained in:
Thijs Schreijer 2015-03-02 13:26:20 +01:00
commit 148a56f26c

View File

@ -14,10 +14,19 @@ dependencies = {
"lua >= 5.1", "luasocket" "lua >= 5.1", "luasocket"
} }
external_dependencies = { external_dependencies = {
OPENSSL = { platforms = {
header = "openssl/ssl.h", unix = {
library = "ssl", OPENSSL = {
}, header = "openssl/ssl.h",
library = "ssl"
}
},
windows = {
OPENSSL = {
header = "openssl/ssl.h",
}
},
}
} }
build = { build = {
type = "builtin", type = "builtin",
@ -69,9 +78,10 @@ build = {
}, },
libdirs = { libdirs = {
"$(OPENSSL_LIBDIR)", "$(OPENSSL_LIBDIR)",
"$(OPENSSL_BINDIR)",
}, },
libraries = { libraries = {
"ssl", "crypto", "ws2_32", "libeay32", "ssleay32", "ws2_32"
}, },
incdirs = { incdirs = {
"$(OPENSSL_INCDIR)", "src/", "src/luasocket" "$(OPENSSL_INCDIR)", "src/", "src/luasocket"