mirror/Lua
1
0
Fork 0
mirror of https://github.com/walterschell/Lua.git synced 2024-11-22 05:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from walterschell/WIP/fix-emscripten

Browse Source 
Fixes emscripten
This commit is contained in:
Walter Schell 2021-01-16 10:17:28 -05:00 committed by GitHub
commit e01a929b9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build-emscripten.yml vendored
View File

@ -11,20 +11,13 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: mymindstorm/setup-emsdk@v7 - uses: mymindstorm/setup-emsdk@v7
with:
# Make sure to set a version number!
version: 1.38.40
# This is the name of the cache folder.
# The cache folder will be placed in the build directory,
# so make sure it doesn't conflict with anything!
actions-cache-folder: 'emsdk-cache'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Create Build Environment - name: Create Build Environment
# Some projects don't allow in-source building, so create a separate build directory # Some projects don't allow in-source building, so create a separate build directory
# We'll use this as our working directory for all subsequent commands # We'll use this as our working directory for all subsequent commands
run: cmake -E make_directory ${{github.workspace}}/build run: emcmake cmake -E make_directory ${{github.workspace}}/build
- name: Configure CMake - name: Configure CMake
# Use a bash shell so we can use the same syntax for environment variable # Use a bash shell so we can use the same syntax for environment variable
@ -40,5 +33,5 @@ jobs:
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build
shell: bash shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>" # Execute the build. You can specify a specific target with "--target <NAME>"
run: emcmake cmake --build . --config $BUILD_TYPE run: cmake --build . --config $BUILD_TYPE

23
lua-5.4.0/CMakeLists.txt
View File

@ -39,18 +39,21 @@ target_include_directories(lua_static PUBLIC "include")
if(UNIX) if(UNIX)
set(LUA_DEFINITIONS) set(LUA_DEFINITIONS)
find_library(LIBM m) if(NOT EMSCRIPTEN)
#TODO: Redo this with find_package find_library(LIBM m)
if(NOT LIBM) #TODO: Redo this with find_package
message(FATAL_ERROR "libm not found and requred by lua") if(NOT LIBM)
endif() message(FATAL_ERROR "libm not found and requred by lua")
target_link_libraries(lua_static INTERFACE ${LIBM}) endif()
target_link_libraries(lua_static INTERFACE ${LIBM})
list(APPEND LUA_DEFINITIONS LUA_USE_POSIX) list(APPEND LUA_DEFINITIONS LUA_USE_POSIX)
if(LUA_SUPPORT_DL) if(LUA_SUPPORT_DL)
target_compile_definitions(lua_static PRIVATE "LUA_USE_DLOPEN") target_compile_definitions(lua_static PRIVATE "LUA_USE_DLOPEN")
target_link_libraries(lua_static INTERFACE dl) target_link_libraries(lua_static INTERFACE dl)
endif()
endif() endif()
target_compile_definitions(lua_static target_compile_definitions(lua_static
PUBLIC ${LUA_DEFINITIONS} PUBLIC ${LUA_DEFINITIONS}
) )