Use EmscriptenApplication on emscripten

Signed-off-by: Squareys <squareys@googlemail.com>
mosra · May 22, 2019 · c9cd997 · c9cd997
1 parent 76b75bc
commit c9cd997
Show file tree

Hide file tree

Showing 24 changed files with 102 additions and 15 deletions.
diff --git a/src/arealights/AreaLightsExample.cpp b/src/arealights/AreaLightsExample.cpp
@@ -47,7 +47,11 @@
 #include <Magnum/GL/Texture.h>
 #include <Magnum/GL/TextureFormat.h>
 #include <Magnum/GL/Version.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/Shaders/Flat.h>
 #include <Magnum/Text/Alignment.h>
 #include <Magnum/Trade/AbstractImporter.h>

diff --git a/src/arealights/CMakeLists.txt b/src/arealights/CMakeLists.txt
@@ -40,14 +40,16 @@ endif()
 find_package(Magnum REQUIRED
     GL
     Shaders
-    Trade
-    Sdl2Application)
+    Trade)
 find_package(MagnumExtras REQUIRED Ui)
 
 if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
     find_package(MagnumPlugins REQUIRED
         DdsImporter
         StbTrueTypeFont)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
 endif()
 
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)

diff --git a/src/audio/AudioExample.cpp b/src/audio/AudioExample.cpp
@@ -42,7 +42,11 @@
 #include <Magnum/GL/Mesh.h>
 #include <Magnum/GL/Renderer.h>
 #include <Magnum/MeshTools/Compile.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/Primitives/Cone.h>
 #include <Magnum/Primitives/Cylinder.h>
 #include <Magnum/Shaders/Flat.h>
@@ -180,8 +184,8 @@ AudioExample::AudioExample(const Arguments& arguments):
     Debug{} << "HRTF specifier:" << _context.hrtfSpecifierString();
 
     /* Loop at 60 Hz max */
-    setSwapInterval(1);
     #ifndef CORRADE_TARGET_EMSCRIPTEN
+    setSwapInterval(1);
     setMinimalLoopPeriod(16);
     #endif
 }

diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt
@@ -44,11 +44,13 @@ find_package(Magnum REQUIRED
     Primitives
     SceneGraph
     Shaders
-    Trade
-    Sdl2Application)
+    Trade)
 
 if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
     find_package(MagnumPlugins REQUIRED StbVorbisAudioImporter)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
 endif()
 
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)

diff --git a/src/box2d/Box2DExample.cpp b/src/box2d/Box2DExample.cpp
@@ -37,7 +37,11 @@
 #include <Magnum/Math/ConfigurationValue.h>
 #include <Magnum/Math/DualComplex.h>
 #include <Magnum/MeshTools/Compile.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/Primitives/Square.h>
 #include <Magnum/SceneGraph/Camera.h>
 #include <Magnum/SceneGraph/Drawable.h>
@@ -166,7 +170,10 @@ Box2DExample::Box2DExample(const Arguments& arguments): Platform::Application{ar
         }
     }
 
+    #ifndef CORRADE_TARGET_EMSCRIPTEN
     setSwapInterval(1);
+    #endif
+
     #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_ANDROID)
     setMinimalLoopPeriod(16);
     #endif

diff --git a/src/box2d/CMakeLists.txt b/src/box2d/CMakeLists.txt
@@ -42,11 +42,17 @@ find_package(Magnum REQUIRED
     MeshTools
     Primitives
     SceneGraph
-    Sdl2Application
     Shaders
     Trade)
 find_package(Box2D REQUIRED)
 
+if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
+    find_package(MagnumPlugins REQUIRED StbVorbisAudioImporter)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
+endif()
+
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
 
 add_executable(magnum-box2d Box2DExample.cpp)

diff --git a/src/bullet/BulletExample.cpp b/src/bullet/BulletExample.cpp
@@ -42,7 +42,11 @@
 #include <Magnum/Math/Constants.h>
 #include <Magnum/MeshTools/Compile.h>
 #include <Magnum/MeshTools/Transform.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/Primitives/Cube.h>
 #include <Magnum/Primitives/UVSphere.h>
 #include <Magnum/SceneGraph/Camera.h>
@@ -215,8 +219,8 @@ BulletExample::BulletExample(const Arguments& arguments): Platform::Application(
     }
 
     /* Loop at 60 Hz max */
-    setSwapInterval(1);
     #ifndef CORRADE_TARGET_EMSCRIPTEN
+    setSwapInterval(1);
     setMinimalLoopPeriod(16);
     #endif
     _timeline.start();

diff --git a/src/bullet/CMakeLists.txt b/src/bullet/CMakeLists.txt
@@ -42,11 +42,16 @@ find_package(Magnum REQUIRED
     MeshTools
     Primitives
     SceneGraph
-    Sdl2Application
     Shaders
     Trade)
 find_package(MagnumIntegration REQUIRED Bullet)
 
+if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
+endif()
+
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
 
 add_executable(magnum-bullet BulletExample.cpp)

diff --git a/src/imgui/CMakeLists.txt b/src/imgui/CMakeLists.txt
@@ -40,9 +40,17 @@ if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/../../modules/")
 endif()
 
-find_package(Magnum REQUIRED GL Sdl2Application)
+find_package(Magnum REQUIRED GL)
 find_package(MagnumIntegration REQUIRED ImGui)
 
+if(CORRADE_TARGET_ANDROID)
+    find_package(Magnum REQUIRED AndroidApplication)
+elseif(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
+endif()
+
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
 
 # Bundle a better font

diff --git a/src/imgui/ImGuiExample.cpp b/src/imgui/ImGuiExample.cpp
@@ -39,6 +39,8 @@
 
 #ifdef CORRADE_TARGET_ANDROID
 #include <Magnum/Platform/AndroidApplication.h>
+#elif defined(CORRADE_TARGET_EMSCRIPTEN)
+#include <Magnum/Platform/EmscriptenApplication.h>
 #else
 #include <Magnum/Platform/Sdl2Application.h>
 #endif

diff --git a/src/mouseinteraction/CMakeLists.txt b/src/mouseinteraction/CMakeLists.txt
@@ -42,8 +42,13 @@ find_package(Magnum REQUIRED
     MeshTools
     Primitives
     SceneGraph
-    Shaders
-    Sdl2Application)
+    Shaders)
+
+if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
+endif()
 
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
 

diff --git a/src/mouseinteraction/MouseInteractionExample.cpp b/src/mouseinteraction/MouseInteractionExample.cpp
@@ -36,7 +36,11 @@
 #include <Magnum/GL/Renderer.h>
 #include <Magnum/Math/FunctionsBatch.h>
 #include <Magnum/MeshTools/Compile.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/Primitives/Grid.h>
 #include <Magnum/SceneGraph/Camera.h>
 #include <Magnum/SceneGraph/Drawable.h>

diff --git a/src/picking/CMakeLists.txt b/src/picking/CMakeLists.txt
@@ -33,8 +33,13 @@ find_package(Magnum REQUIRED
     GL
     MeshTools
     Primitives
-    SceneGraph
-    Sdl2Application)
+    SceneGraph)
+
+if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
+endif()
 
 project(MagnumPickingExample)
 

diff --git a/src/picking/PickingExample.cpp b/src/picking/PickingExample.cpp
@@ -47,7 +47,11 @@
 #include <Magnum/Math/Color.h>
 #include <Magnum/MeshTools/CompressIndices.h>
 #include <Magnum/MeshTools/Interleave.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/Primitives/Cube.h>
 #include <Magnum/Primitives/Plane.h>
 #include <Magnum/Primitives/UVSphere.h>

diff --git a/src/primitives/CMakeLists.txt b/src/primitives/CMakeLists.txt
@@ -44,6 +44,8 @@ find_package(Magnum REQUIRED
 
 if(CORRADE_TARGET_ANDROID)
     find_package(Magnum REQUIRED AndroidApplication)
+elseif(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
 else()
     find_package(Magnum REQUIRED Sdl2Application)
 endif()

diff --git a/src/primitives/PrimitivesExample.cpp b/src/primitives/PrimitivesExample.cpp
@@ -35,6 +35,8 @@
 #include <Magnum/MeshTools/CompressIndices.h>
 #ifdef CORRADE_TARGET_ANDROID
 #include <Magnum/Platform/AndroidApplication.h>
+#elif defined(CORRADE_TARGET_EMSCRIPTEN)
+#include <Magnum/Platform/EmscriptenApplication.h>
 #else
 #include <Magnum/Platform/Sdl2Application.h>
 #endif

diff --git a/src/text/CMakeLists.txt b/src/text/CMakeLists.txt
@@ -40,8 +40,13 @@ find_package(Magnum REQUIRED
     GL
     Shaders
     Text
-    Trade
-    Sdl2Application)
+    Trade)
+
+if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
+endif()
 
 if(MAGNUM_BUILD_STATIC)
     find_package(Magnum REQUIRED TgaImporter MagnumFont)

diff --git a/src/text/TextExample.cpp b/src/text/TextExample.cpp
@@ -34,7 +34,11 @@
 #include <Magnum/GL/Mesh.h>
 #include <Magnum/GL/Renderer.h>
 #include <Magnum/Math/Complex.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/Shaders/DistanceFieldVector.h>
 #include <Magnum/Trade/AbstractImporter.h>
 #include <Magnum/Text/AbstractFont.h>

diff --git a/src/textured-triangle/CMakeLists.txt b/src/textured-triangle/CMakeLists.txt
@@ -44,6 +44,8 @@ endif()
 
 if(CORRADE_TARGET_ANDROID)
     find_package(Magnum REQUIRED AndroidApplication)
+elseif(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
 else()
     find_package(Magnum REQUIRED Sdl2Application)
 endif()

diff --git a/src/textured-triangle/TexturedTriangleExample.cpp b/src/textured-triangle/TexturedTriangleExample.cpp
@@ -37,6 +37,8 @@
 #include <Magnum/GL/TextureFormat.h>
 #ifdef CORRADE_TARGET_ANDROID
 #include <Magnum/Platform/AndroidApplication.h>
+#elif defined(CORRADE_TARGET_EMSCRIPTEN)
+#include <Magnum/Platform/EmscriptenApplication.h>
 #else
 #include <Magnum/Platform/Sdl2Application.h>
 #endif

diff --git a/src/triangle/CMakeLists.txt b/src/triangle/CMakeLists.txt
@@ -40,6 +40,8 @@ find_package(Magnum REQUIRED GL Shaders)
 
 if(CORRADE_TARGET_ANDROID)
     find_package(Magnum REQUIRED AndroidApplication)
+elseif(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
 else()
     find_package(Magnum REQUIRED Sdl2Application)
 endif()

diff --git a/src/triangle/TriangleExample.cpp b/src/triangle/TriangleExample.cpp
@@ -32,6 +32,8 @@
 #include <Magnum/GL/Mesh.h>
 #ifdef CORRADE_TARGET_ANDROID
 #include <Magnum/Platform/AndroidApplication.h>
+#elif defined(CORRADE_TARGET_EMSCRIPTEN)
+#include <Magnum/Platform/EmscriptenApplication.h>
 #else
 #include <Magnum/Platform/Sdl2Application.h>
 #endif

diff --git a/src/viewer/CMakeLists.txt b/src/viewer/CMakeLists.txt
@@ -45,6 +45,8 @@ find_package(Magnum REQUIRED
 
 if(CORRADE_TARGET_ANDROID)
     find_package(Magnum REQUIRED AndroidApplication)
+elseif(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
 else()
     find_package(Magnum REQUIRED Sdl2Application)
 endif()

diff --git a/src/viewer/ViewerExample.cpp b/src/viewer/ViewerExample.cpp
@@ -41,6 +41,8 @@
 #include <Magnum/MeshTools/Compile.h>
 #ifdef CORRADE_TARGET_ANDROID
 #include <Magnum/Platform/AndroidApplication.h>
+#elif defined(CORRADE_TARGET_EMSCRIPTEN)
+#include <Magnum/Platform/EmscriptenApplication.h>
 #else
 #include <Magnum/Platform/Sdl2Application.h>
 #endif