merge

src/Environment.cpp

@@ -1,4 +1,4 @@
-#include "Environment.h"
+#include "Environment.h"
 
 #include "utils/Utils.h"
 
@@ -9,7 +9,7 @@
 #include <GL/gl.h>
 #endif
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #include <emscripten/html5.h>
 #endif
 
@@ -26,7 +26,7 @@ bool Environment::enableLogging = true;
 
 SDL_Window* Environment::window = nullptr;
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 bool Environment::isFullscreen = false;
 #else
 bool Environment::isFullscreen = true;
@@ -71,7 +71,7 @@ void Environment::computeProjectionDimensions()
 }
 
 void Environment::setFullscreen(bool enable) {
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 	if (enable) {
 		EmscriptenFullscreenStrategy strategy{};
 		strategy.scaleMode = EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH;