Build and code cleanup (#1226)

- Separate `JsRuntimeDispatcher` into its own target `JsRuntimeInternal`
as it will depend on arcana in a future PR.
- Make the build style more consistent across different CMakeLists.txt

Author: bghgary

Apps/Playground/Android/app/CMakeLists.txt

@@ -41,29 +41,28 @@ set(BABYLON_NATIVE_PLAYGROUND_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")
 add_subdirectory(${BABYLON_NATIVE_PLAYGROUND_DIR}/../../ ${BABYLON_NATIVE_PLAYGROUND_DIR}/../../build/Android_${CMAKE_ANDROID_ARCH_ABI}/)
 
 add_library(BabylonNativeJNI SHARED
-            src/main/cpp/BabylonNativeJNI.cpp)
+    src/main/cpp/BabylonNativeJNI.cpp)
 
 target_include_directories(BabylonNativeJNI
-        PRIVATE
-        ${BABYLON_NATIVE_PLAYGROUND_DIR}/Shared)
+    PRIVATE ${BABYLON_NATIVE_PLAYGROUND_DIR}/Shared)
 
 target_link_libraries(BabylonNativeJNI
-        GLESv3
-        android
-        EGL
-        log
-        -lz
-        AppRuntime
-        NativeEngine
-        NativeInput
-        NativeXr
-        NativeOptimizations
-        Console
-        Canvas
-        Window
-        ScriptLoader
-        XMLHttpRequest
-        NativeCamera
-        AndroidExtensions
-        ChromeDevTools
-        )
+    GLESv3
+    android
+    EGL
+    log
+    -lz
+    AndroidExtensions
+    AppRuntime
+    Canvas
+    Console
+    ChromeDevTools
+    GraphicsDevice
+    NativeCamera
+    NativeEngine
+    NativeInput
+    NativeOptimizations
+    NativeXr
+    ScriptLoader
+    XMLHttpRequest
+    Window)

Apps/Playground/CMakeLists.txt

@@ -108,16 +108,17 @@ target_include_directories(Playground PRIVATE "Source" ".")
 
 target_link_to_dependencies(Playground
     PRIVATE AppRuntime
-    PRIVATE NativeCapture
+    PRIVATE Canvas
     PRIVATE ChromeDevTools
+    PRIVATE Console
+    PRIVATE GraphicsDevice
+    PRIVATE NativeCapture
     PRIVATE NativeEngine
     PRIVATE NativeInput
     PRIVATE NativeOptimizations
-    PRIVATE Console
-    PRIVATE Window
     PRIVATE ScriptLoader
+    PRIVATE Window
     PRIVATE XMLHttpRequest
-    PRIVATE Canvas
     ${ADDITIONAL_LIBRARIES}
     ${BABYLON_NATIVE_PLAYGROUND_EXTENSION_LIBRARIES})
 

Apps/UnitTests/CMakeLists.txt

@@ -17,11 +17,9 @@ set(NPM_SCRIPTS
 set(HEADERS
     "Shared/Tests.h")
 
-set(ADDITIONAL_LIBRARIES "")
-
 if(APPLE)
     find_library(JSCORE_LIBRARY JavaScriptCore)
-    set(ADDITIONAL_LIBRARIES ${JSCORE_LIBRARY})
+    set(ADDITIONAL_LIBRARIES PRIVATE ${JSCORE_LIBRARY})
     set(TEST_APP "Apple/App.mm")
 elseif(UNIX AND NOT ANDROID)
     set(TEST_APP "X11/App.cpp")
@@ -32,14 +30,15 @@ endif()
 add_executable(UnitTests ${LOCAL_SCRIPTS} ${NPM_SCRIPTS} ${TEST_APP} ${HEADERS})
 
 target_link_to_dependencies(UnitTests
-    UrlLib
-    AppRuntime
-    XMLHttpRequest
-    NativeEngine
-    ScriptLoader
-    Console
-    Window
-    Canvas
+    PRIVATE AppRuntime
+    PRIVATE Canvas
+    PRIVATE Console
+    PRIVATE GraphicsDevice
+    PRIVATE NativeEngine
+    PRIVATE ScriptLoader
+    PRIVATE UrlLib
+    PRIVATE Window
+    PRIVATE XMLHttpRequest
     ${ADDITIONAL_LIBRARIES})
 
 add_test(NAME UnitTests COMMAND UnitTests)

Apps/ValidationTests/Android/app/CMakeLists.txt

@@ -21,8 +21,7 @@ cmake_minimum_required(VERSION 3.13.2)
 project(BabylonNative)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(BABYLON_NATIVE_PLATFORM "Android")
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+set(CMAKE_CXX_STANDARD 17)
 
 if (${ANDROID_JSENGINE_LIBNAME} STREQUAL "jsc")
     set(NAPI_JAVASCRIPT_ENGINE "JavaScriptCore" CACHE STRING "JavaScript engine for N-API.")
@@ -42,29 +41,22 @@ set(BABYLON_NATIVE_VALIDATIONTESTS_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")
 add_subdirectory(${BABYLON_NATIVE_VALIDATIONTESTS_DIR}/../../ ${BABYLON_NATIVE_VALIDATIONTESTS_DIR}/../../build/Android_${CMAKE_ANDROID_ARCH_ABI}/)
 
 add_library(BabylonNativeJNI SHARED
-            src/main/cpp/BabylonNativeJNI.cpp)
-
-add_definitions(-DANDROID_STL=c++_shared)
+    src/main/cpp/BabylonNativeJNI.cpp)
 
 target_link_libraries(BabylonNativeJNI
-        GLESv3
-        android
-        EGL
-        log
-        -lz
-        AndroidExtensions
-        AppRuntime
-        NativeEngine
-        NativeOptimizations
-        NativeXr
-        Console
-        Window
-        ScriptLoader
-        bgfx
-        XMLHttpRequest
-        TestUtils)
-
-configure_file(
-    "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so"
-    "${CMAKE_CURRENT_LIST_DIR}/src/main/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libc++_shared.so"
-    COPYONLY)
+    GLESv3
+    android
+    EGL
+    log
+    -lz
+    AndroidExtensions
+    AppRuntime
+    Console
+    GraphicsDevice
+    NativeEngine
+    NativeOptimizations
+    NativeXr
+    ScriptLoader
+    TestUtils
+    XMLHttpRequest
+    Window)

Apps/ValidationTests/CMakeLists.txt

@@ -110,19 +110,17 @@ if(WINDOWS_STORE)
 endif()
 
 target_link_to_dependencies(ValidationTests
-    PRIVATE bgfx
-    PRIVATE bimg
-    PRIVATE bx
     PRIVATE AppRuntime
+    PRIVATE Canvas
+    PRIVATE Console
+    PRIVATE GraphicsDevice
     PRIVATE NativeEngine
     PRIVATE NativeOptimizations
-    PRIVATE Console
-    PRIVATE Window
     PRIVATE ScriptLoader
-    PRIVATE Canvas
     PRIVATE TestUtils
-    ${ADDITIONAL_LIBRARIES}
-    PRIVATE XMLHttpRequest)
+    PRIVATE Window
+    PRIVATE XMLHttpRequest
+    ${ADDITIONAL_LIBRARIES})
 
 if(APPLE)
     target_link_libraries(ValidationTests PRIVATE "-framework MetalKit")

Core/AppRuntime/CMakeLists.txt

@@ -24,7 +24,7 @@ endif()
 
 target_link_to_dependencies(AppRuntime
     PRIVATE arcana
-    PUBLIC JsRuntime)
+    PRIVATE JsRuntime)
 
 target_compile_definitions(AppRuntime
     PRIVATE NOMINMAX)

Core/AppRuntime/Include/Babylon/AppRuntime.h

@@ -1,8 +1,7 @@
 #pragma once
 
 #include "Dispatchable.h"
-
-#include <Babylon/JsRuntime.h>
+#include <napi/napi.h>
 
 #include <memory>
 #include <functional>
@@ -11,6 +10,7 @@
 namespace Babylon
 {
     class WorkQueue;
+
     class AppRuntime final
     {
     public:

Core/AppRuntime/Source/AppRuntime.cpp

@@ -1,5 +1,6 @@
 #include "AppRuntime.h"
 #include "WorkQueue.h"
+#include <Babylon/JsRuntime.h>
 
 namespace Babylon
 {

Core/AppRuntime/Source/AppRuntime_Chakra.cpp

@@ -1,5 +1,7 @@
 #include "AppRuntime.h"
 
+#include <napi/env.h>
+
 #include <jsrt.h>
 
 #include <gsl/gsl>
@@ -21,28 +23,29 @@ namespace Babylon
     void AppRuntime::RunEnvironmentTier(const char*)
     {
         using DispatchFunction = std::function<void(std::function<void()>)>;
-        DispatchFunction dispatchFunction{
+        DispatchFunction dispatchFunction =
             [this](std::function<void()> action) {
                 Dispatch([action = std::move(action)](Napi::Env) {
                     action();
                 });
-            }};
+            };
 
         JsRuntimeHandle jsRuntime;
         ThrowIfFailed(JsCreateRuntime(JsRuntimeAttributeNone, nullptr, &jsRuntime));
         JsContextRef context;
         ThrowIfFailed(JsCreateContext(jsRuntime, &context));
         ThrowIfFailed(JsSetCurrentContext(context));
-        ThrowIfFailed(JsSetPromiseContinuationCallback([](JsValueRef task, void* callbackState) {
-            ThrowIfFailed(JsAddRef(task, nullptr));
-            auto* dispatch = reinterpret_cast<DispatchFunction*>(callbackState);
-            dispatch->operator()([task]() {
-                JsValueRef undefined;
-                ThrowIfFailed(JsGetUndefinedValue(&undefined));
-                ThrowIfFailed(JsCallFunction(task, &undefined, 1, nullptr));
-                ThrowIfFailed(JsRelease(task, nullptr));
-            });
-        },
+        ThrowIfFailed(JsSetPromiseContinuationCallback(
+            [](JsValueRef task, void* callbackState) {
+                ThrowIfFailed(JsAddRef(task, nullptr));
+                auto* dispatch = reinterpret_cast<DispatchFunction*>(callbackState);
+                dispatch->operator()([task]() {
+                    JsValueRef undefined;
+                    ThrowIfFailed(JsGetUndefinedValue(&undefined));
+                    ThrowIfFailed(JsCallFunction(task, &undefined, 1, nullptr));
+                    ThrowIfFailed(JsRelease(task, nullptr));
+                });
+            },
             &dispatchFunction));
         ThrowIfFailed(JsProjectWinRTNamespace(L"Windows"));
 

Core/AppRuntime/Source/AppRuntime_JSI.cpp

@@ -1,7 +1,8 @@
 #include "AppRuntime.h"
 #include "WorkQueue.h"
 
-#include <napi/env.h>
+#include <Babylon/JsRuntime.h>
+
 #include <V8JsiRuntime.h>
 #include <ScriptStore.h>