From 0f41290b0fbe29dd777591f5c700464691d2ec3e Mon Sep 17 00:00:00 2001
From: "arthur.jamet" <arthur.jamet@epitech.eu>
Date: Mon, 31 May 2021 09:17:13 +0200
Subject: [PATCH] seperate std buld from build for web

---
 .gitignore              | 3 ++-
 emsdk.sh                | 8 +++-----
 lib/wal/sources/Wal.hpp | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06e5830c..9e44c2a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ cmake-build-debug
 .vscode
 build/*
 docs/*
-emsdk/
\ No newline at end of file
+emsdk/
+build_web/
\ No newline at end of file
diff --git a/emsdk.sh b/emsdk.sh
index 70cd7654..b5975bba 100755
--- a/emsdk.sh
+++ b/emsdk.sh
@@ -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
\ No newline at end of file
+mkdir -p build_web
+emcmake cmake -S . -B build_web -DPLATFORM=Web &&
+cmake --build build_web
\ No newline at end of file
diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp
index 7b9ea705..a2feacbe 100644
--- a/lib/wal/sources/Wal.hpp
+++ b/lib/wal/sources/Wal.hpp
@@ -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);