mirror of
https://github.com/zoriya/Bomberman.git
synced 2026-05-29 17:02:11 +00:00
seperate std buld from build for web
This commit is contained in:
+2
-1
@@ -4,4 +4,5 @@ cmake-build-debug
|
||||
.vscode
|
||||
build/*
|
||||
docs/*
|
||||
emsdk/
|
||||
emsdk/
|
||||
build_web/
|
||||
@@ -1,6 +1,4 @@
|
||||
#! /bin/bash
|
||||
rm -rf build
|
||||
PRJECTDIR=`pwd`
|
||||
EMSDK_PATH=./emsdk
|
||||
if [[ ! -d ./emsdk ]]; then
|
||||
git clone https://github.com/emscripten-core/emsdk.git
|
||||
@@ -8,6 +6,6 @@ fi
|
||||
./emsdk/emsdk install latest
|
||||
./emsdk/emsdk activate latest
|
||||
source ./emsdk/emsdk_env.sh
|
||||
mkdir -p build
|
||||
emcmake cmake -S . -B build -DPLATFORM=Web &&
|
||||
cmake --build build
|
||||
mkdir -p build_web
|
||||
emcmake cmake -S . -B build_web -DPLATFORM=Web &&
|
||||
cmake --build build_web
|
||||
@@ -114,9 +114,9 @@ namespace WAL
|
||||
{
|
||||
Callback<Wal &, T &> update(callback);
|
||||
|
||||
#ifdef PLATFORM_WEB
|
||||
#if defined(PLATFORM_WEB)
|
||||
void *paramPtr[3] = {(void *)this, (void *)&update, (void *)&state};
|
||||
return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration<T>, (void *)paramPtr, 0, 1);
|
||||
return emscripten_set_main_loop_arg((em_arg_callback_func)runIteration<T>, (void *)paramPtr, 0, 1);
|
||||
#else
|
||||
return this->run(update, state);
|
||||
#endif
|
||||
@@ -151,9 +151,9 @@ namespace WAL
|
||||
template<typename T>
|
||||
static void runIteration(void *param)
|
||||
{
|
||||
void **paramsPtr = (void **)param;
|
||||
static const Callback<Wal &, T &> callback = *((Callback<Wal &, T &> *)paramsPtr[1]);
|
||||
static void **paramsPtr = (void **)param;
|
||||
static Wal *wal = (Wal *)paramsPtr[0];
|
||||
static const Callback<Wal &, T &> callback = *((Callback<Wal &, T &> *)paramsPtr[1]);
|
||||
static T *state = (T *)paramsPtr[2];
|
||||
static auto lastTick = std::chrono::steady_clock::now();
|
||||
static std::chrono::nanoseconds fBehind(0);
|
||||
|
||||
Reference in New Issue
Block a user