mirror of
https://github.com/zoriya/Bomberman.git
synced 2026-06-08 03:50:47 +00:00
Trying to fix windows compilation
This commit is contained in:
@@ -9,8 +9,8 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
# - os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
# name: Linux
|
name: Linux
|
||||||
# - os: macOS-latest
|
# - os: macOS-latest
|
||||||
# name: MacOS
|
# name: MacOS
|
||||||
- os: windows-latest
|
- os: windows-latest
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
name: Linux Build (Epitech Container)
|
|
||||||
on: [push, pull_request]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
testbox:
|
|
||||||
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container:
|
|
||||||
image: epitechcontent/epitest-docker:latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
submodules: true
|
|
||||||
- name: Build
|
|
||||||
run: |
|
|
||||||
mkdir build && cd build
|
|
||||||
cmake ..
|
|
||||||
cmake --build .
|
|
||||||
- name: CheckBinaryName
|
|
||||||
shell: bash
|
|
||||||
run: test -f build/bomberman
|
|
||||||
+3
-3
@@ -13,10 +13,10 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray)
|
|||||||
add_subdirectory(${PROJECT_SOURCE_DIR}/lib/LuaGate)
|
add_subdirectory(${PROJECT_SOURCE_DIR}/lib/LuaGate)
|
||||||
|
|
||||||
if (EMSCRIPTEN)
|
if (EMSCRIPTEN)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets")
|
||||||
set(CMAKE_EXECUTABLE_SUFFIX ".html")
|
set(CMAKE_EXECUTABLE_SUFFIX ".html")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(SOURCES
|
set(SOURCES
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ set(SRC
|
|||||||
)
|
)
|
||||||
|
|
||||||
include(FindLua)
|
include(FindLua)
|
||||||
|
if (NOT LUA_FOUND AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/lua.hpp)
|
||||||
|
set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/)
|
||||||
|
set(LUA_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(LuaGate STATIC ${SRC} ${HEADERS})
|
add_library(LuaGate STATIC ${SRC} ${HEADERS})
|
||||||
target_include_directories(LuaGate PUBLIC ${LUA_INCLUDE_DIR})
|
target_include_directories(LuaGate PUBLIC ${LUA_INCLUDE_DIR})
|
||||||
|
|||||||
Reference in New Issue
Block a user