Unverified Commit 379d0dc7 authored by Rob Loach's avatar Rob Loach
Browse files

Update

parent 13df6a96
......@@ -9,6 +9,7 @@ SOURCES_CXX := $(wildcard \
$(CORE_DIR)/src/love/Types/Input/*.cpp \
)
FLAGS += -Wfatal-errors
FLAGS += -I$(CORE_DIR)/vendor
# semver
FLAGS += -I$(CORE_DIR)/vendor/semver
......@@ -194,13 +195,43 @@ endif
# Lua
FLAGS += -I$(CORE_DIR)/vendor/libretro-deps/lua/src
#SOURCES_C +=
SOURCES_C += \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lauxlib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lapi.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lbaselib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lcode.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/ldebug.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/ldo.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/ldump.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lfunc.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lgc.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/llex.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lmem.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lobject.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lopcodes.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lparser.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lstate.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lstring.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/ltable.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/ltm.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lundump.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lvm.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lzio.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/ldblib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/liolib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lmathlib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/loslib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/ltablib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/lstrlib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/loadlib.c \
$(CORE_DIR)/vendor/libretro-deps/lua/src/linit.c
# LuaJIT
FLAGS += -I$(CORE_DIR)/vendor/libretro-deps/luajit/src
#SOURCES_C +=$(wildcard \
# $(CORE_DIR)/vendor/libretro-deps/luajit/src/*.c \
#)
SOURCES_C += \
$(CORE_DIR)/vendor/libretro-deps/luajit/src/lib_ffi.c \
$(CORE_DIR)/vendor/libretro-deps/luajit/src/lib_jit.c \
$(CORE_DIR)/vendor/libretro-deps/luajit/src/lib_bit.c
# sol2
FLAGS += -I$(CORE_DIR)/vendor/sol2/single/sol
......
......@@ -597,6 +597,9 @@ void script::load() {
}
}
#endif
m_lua.open_libraries(sol::lib::base);
m_lua.script("print('Hello World!')");
}
void script::reset() {
......
// lua.hpp
// Lua header files for C++
// <<extern "C">> not supplied automatically because Lua also compiles as C++
extern "C" {
#include "lua.h"
#include "lualib.h"
#include "lauxlib.h"
}
/* This is a generated file. DO NOT EDIT! */
FFDEF(assert)
FFDEF(type)
FFDEF(next)
FFDEF(pairs)
FFDEF(ipairs_aux)
FFDEF(ipairs)
FFDEF(getmetatable)
FFDEF(setmetatable)
FFDEF(getfenv)
FFDEF(setfenv)
FFDEF(rawget)
FFDEF(rawset)
FFDEF(rawequal)
FFDEF(unpack)
FFDEF(select)
FFDEF(tonumber)
FFDEF(tostring)
FFDEF(error)
FFDEF(pcall)
FFDEF(xpcall)
FFDEF(loadfile)
FFDEF(load)
FFDEF(loadstring)
FFDEF(dofile)
FFDEF(gcinfo)
FFDEF(collectgarbage)
FFDEF(newproxy)
FFDEF(print)
FFDEF(coroutine_status)
FFDEF(coroutine_running)
FFDEF(coroutine_create)
FFDEF(coroutine_yield)
FFDEF(coroutine_resume)
FFDEF(coroutine_wrap_aux)
FFDEF(coroutine_wrap)
FFDEF(math_abs)
FFDEF(math_floor)
FFDEF(math_ceil)
FFDEF(math_sqrt)
FFDEF(math_log10)
FFDEF(math_exp)
FFDEF(math_sin)
FFDEF(math_cos)
FFDEF(math_tan)
FFDEF(math_asin)
FFDEF(math_acos)
FFDEF(math_atan)
FFDEF(math_sinh)
FFDEF(math_cosh)
FFDEF(math_tanh)
FFDEF(math_frexp)
FFDEF(math_modf)
FFDEF(math_deg)
FFDEF(math_rad)
FFDEF(math_log)
FFDEF(math_atan2)
FFDEF(math_pow)
FFDEF(math_fmod)
FFDEF(math_ldexp)
FFDEF(math_min)
FFDEF(math_max)
FFDEF(math_random)
FFDEF(math_randomseed)
FFDEF(bit_tobit)
FFDEF(bit_bnot)
FFDEF(bit_bswap)
FFDEF(bit_lshift)
FFDEF(bit_rshift)
FFDEF(bit_arshift)
FFDEF(bit_rol)
FFDEF(bit_ror)
FFDEF(bit_band)
FFDEF(bit_bor)
FFDEF(bit_bxor)
FFDEF(bit_tohex)
FFDEF(string_len)
FFDEF(string_byte)
FFDEF(string_char)
FFDEF(string_sub)
FFDEF(string_rep)
FFDEF(string_reverse)
FFDEF(string_lower)
FFDEF(string_upper)
FFDEF(string_dump)
FFDEF(string_find)
FFDEF(string_match)
FFDEF(string_gmatch_aux)
FFDEF(string_gmatch)
FFDEF(string_gsub)
FFDEF(string_format)
FFDEF(table_foreachi)
FFDEF(table_foreach)
FFDEF(table_getn)
FFDEF(table_maxn)
FFDEF(table_insert)
FFDEF(table_remove)
FFDEF(table_concat)
FFDEF(table_sort)
FFDEF(io_method_close)
FFDEF(io_method_read)
FFDEF(io_method_write)
FFDEF(io_method_flush)
FFDEF(io_method_seek)
FFDEF(io_method_setvbuf)
FFDEF(io_method_lines)
FFDEF(io_method___gc)
FFDEF(io_method___tostring)
FFDEF(io_open)
FFDEF(io_popen)
FFDEF(io_tmpfile)
FFDEF(io_close)
FFDEF(io_read)
FFDEF(io_write)
FFDEF(io_flush)
FFDEF(io_input)
FFDEF(io_output)
FFDEF(io_lines)
FFDEF(io_type)
FFDEF(os_execute)
FFDEF(os_remove)
FFDEF(os_rename)
FFDEF(os_tmpname)
FFDEF(os_getenv)
FFDEF(os_exit)
FFDEF(os_clock)
FFDEF(os_date)
FFDEF(os_time)
FFDEF(os_difftime)
FFDEF(os_setlocale)
FFDEF(debug_getregistry)
FFDEF(debug_getmetatable)
FFDEF(debug_setmetatable)
FFDEF(debug_getfenv)
FFDEF(debug_setfenv)
FFDEF(debug_getinfo)
FFDEF(debug_getlocal)
FFDEF(debug_setlocal)
FFDEF(debug_getupvalue)
FFDEF(debug_setupvalue)
FFDEF(debug_upvalueid)
FFDEF(debug_upvaluejoin)
FFDEF(debug_sethook)
FFDEF(debug_gethook)
FFDEF(debug_debug)
FFDEF(debug_traceback)
FFDEF(jit_on)
FFDEF(jit_off)
FFDEF(jit_flush)
FFDEF(jit_status)
FFDEF(jit_attach)
FFDEF(jit_util_funcinfo)
FFDEF(jit_util_funcbc)
FFDEF(jit_util_funck)
FFDEF(jit_util_funcuvname)
FFDEF(jit_util_traceinfo)
FFDEF(jit_util_traceir)
FFDEF(jit_util_tracek)
FFDEF(jit_util_tracesnap)
FFDEF(jit_util_tracemc)
FFDEF(jit_util_traceexitstub)
FFDEF(jit_util_ircalladdr)
FFDEF(jit_opt_start)
FFDEF(ffi_meta___index)
FFDEF(ffi_meta___newindex)
FFDEF(ffi_meta___eq)
FFDEF(ffi_meta___len)
FFDEF(ffi_meta___lt)
FFDEF(ffi_meta___le)
FFDEF(ffi_meta___concat)
FFDEF(ffi_meta___call)
FFDEF(ffi_meta___add)
FFDEF(ffi_meta___sub)
FFDEF(ffi_meta___mul)
FFDEF(ffi_meta___div)
FFDEF(ffi_meta___mod)
FFDEF(ffi_meta___pow)
FFDEF(ffi_meta___unm)
FFDEF(ffi_meta___tostring)
FFDEF(ffi_meta___pairs)
FFDEF(ffi_meta___ipairs)
FFDEF(ffi_clib___index)
FFDEF(ffi_clib___newindex)
FFDEF(ffi_clib___gc)
FFDEF(ffi_callback_free)
FFDEF(ffi_callback_set)
FFDEF(ffi_cdef)
FFDEF(ffi_new)
FFDEF(ffi_cast)
FFDEF(ffi_typeof)
FFDEF(ffi_istype)
FFDEF(ffi_sizeof)
FFDEF(ffi_alignof)
FFDEF(ffi_offsetof)
FFDEF(ffi_errno)
FFDEF(ffi_string)
FFDEF(ffi_copy)
FFDEF(ffi_fill)
FFDEF(ffi_abi)
FFDEF(ffi_metatype)
FFDEF(ffi_gc)
FFDEF(ffi_load)
#undef FFDEF
#ifndef FF_NUM_ASMFUNC
#define FF_NUM_ASMFUNC 62
#endif
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