Unverified Commit 17d37d96 authored by Rob Loach's avatar Rob Loach
Browse files

Disable luasocket

parent 828c16d0
......@@ -73,26 +73,26 @@ SOURCES_C += $(CORE_DIR)/libretro-common/formats/png/rpng_decode.c \
# Lua UTF-8
SOURCES_C += $(CORE_DIR)/deps/luautf8/lutf8lib.c
# LuaSocket
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/auxiliar.c \
$(CORE_DIR)/deps/luasocket/libluasocket/buffer.c \
$(CORE_DIR)/deps/luasocket/libluasocket/except.c \
$(CORE_DIR)/deps/luasocket/libluasocket/inet.c \
$(CORE_DIR)/deps/luasocket/libluasocket/io.c \
$(CORE_DIR)/deps/luasocket/libluasocket/luasocket.c \
$(CORE_DIR)/deps/luasocket/libluasocket/mime.c \
$(CORE_DIR)/deps/luasocket/libluasocket/options.c \
$(CORE_DIR)/deps/luasocket/libluasocket/select.c \
$(CORE_DIR)/deps/luasocket/libluasocket/tcp.c \
$(CORE_DIR)/deps/luasocket/libluasocket/timeout.c \
$(CORE_DIR)/deps/luasocket/libluasocket/udp.c \
$(CORE_DIR)/deps/luasocket/libluasocket/unix.c \
$(CORE_DIR)/deps/luasocket/luasocket.c
ifeq ($(system_platform),unix)
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c
else
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/wsocket.c
endif
# LuaSocket (Disabled)
#SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/auxiliar.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/buffer.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/except.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/inet.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/io.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/luasocket.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/mime.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/options.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/select.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/tcp.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/timeout.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/udp.c \
# $(CORE_DIR)/deps/luasocket/libluasocket/unix.c \
# $(CORE_DIR)/deps/luasocket/luasocket.c
#ifeq ($(system_platform),unix)
# SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c
#else
# SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/wsocket.c
#endif
ifeq ($(WANT_UNZIP),1)
SOURCES_C += $(CORE_DIR)/deps/zlib/ioapi.c \
......
......@@ -28,7 +28,7 @@
#include "deps/luautf8/lutf8lib.h"
// LuaSocket
#include "deps/luasocket/luasocket.h"
//#include "deps/luasocket/luasocket.h"
#include <stdio.h>
#include <stdlib.h>
......@@ -237,7 +237,7 @@ void lutro_init()
lutro_preload(L, luaopen_luautf8, "utf8");
// LuaSocket
_o_open(L);
//_o_open(L);
#ifdef HAVE_INOTIFY
lutro_preload(L, lutro_live_preload, "lutro.live");
......
......@@ -3,7 +3,7 @@ package.path = package.path .. './test/?.lua;./test/unit/?.lua;./test/unit/luaun
-- Dependencies
unit = require 'luaunit'
http = require 'socket.http'
-- http = require 'socket.http'
function UTF8Test()
local utf8 = require("utf8")
......@@ -68,11 +68,11 @@ function lutro.filesystem.getUserDirectoryTest()
unit.assertEquals(homeDir, luaHomeDir)
end
function http.requestTest()
local http = require('socket.http')
local result = http.request('http://buildbot.libretro.com/assets/frontend/info/lutro_libretro.info')
unit.assertStrContains(result, 'display_name = "LUA Engine (Lutro)"')
end
-- function http.requestTest()
-- local http = require('socket.http')
-- local result = http.request('http://buildbot.libretro.com/assets/frontend/info/lutro_libretro.info')
-- unit.assertStrContains(result, 'display_name = "LUA Engine (Lutro)"')
-- end
function lutro.getVersionTest()
local major, minor, revision, codename = lutro.getVersion()
......@@ -181,7 +181,7 @@ end
-- Runs all the defined tests.
function runTests()
http.requestTest()
--http.requestTest()
lutro.keyboard.getKeyFromScancodeTest()
lutro.keyboard.getScancodeFromKeyTest()
lutro.filesystem.getUserDirectoryTest()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment