Adjust build

Author: raub

.github/workflows/build.yml

@@ -66,7 +66,7 @@ jobs:
         run: npm ci
 
       - name: Ubuntu Install Wayland
-        if: matrix.os == 'ubuntu-22.04'
+        if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-22.04-arm'
         run: sudo apt-get install -y libwayland-dev libgles2-mesa-dev
 
       - name: Build Current Binary

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
         run: npm ci
 
       - name: Ubuntu Install Wayland
-        if: matrix.os == 'ubuntu-22.04'
+        if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-22.04-arm'
         run: sudo apt-get install -y libwayland-dev libgles2-mesa-dev
 
       - name: Build Current Binary

js/window.js

@@ -568,7 +568,7 @@ class Window extends EventEmitter {
 	_requestAnimationFrame(cb) {
 		return setImmediate(() => {
 			glfw.pollEvents();
-			cb(Date.now());
+			cb(performance.now());
 			this.swapBuffers();
 		});
 	}

src/binding.gyp

@@ -9,22 +9,6 @@
 		'includes': ['../node_modules/addon-tools-raub/utils/common.gypi'],
 		'sources': [
 			'cpp/bindings.cpp',
-			'cpp/glfw-clipboard.cpp',
-			'cpp/glfw-console.cpp',
-			'cpp/glfw-context.cpp',
-			'cpp/glfw-cursor.cpp',
-			'cpp/glfw-events.cpp',
-			'cpp/glfw-info.cpp',
-			'cpp/glfw-init.cpp',
-			'cpp/glfw-input.cpp',
-			'cpp/glfw-joystick.cpp',
-			'cpp/glfw-monitors.cpp',
-			'cpp/glfw-platform.cpp',
-			'cpp/glfw-time.cpp',
-			'cpp/glfw-timers.cpp',
-			'cpp/glfw-version.cpp',
-			'cpp/glfw-vulkan.cpp',
-			'cpp/glfw-window.cpp',
 		],
 		'include_dirs': [
 			'<(gl_include)',

src/cpp/bindings.cpp

@@ -1,20 +1,19 @@
-#include "glfw-clipboard.hpp"
-#include "glfw-console.hpp"
-#include "glfw-context.hpp"
-#include "glfw-cursor.hpp"
-#include "glfw-events.hpp"
-#include "glfw-info.hpp"
-#include "glfw-init.hpp"
-#include "glfw-input.hpp"
-#include "glfw-joystick.hpp"
-#include "glfw-monitors.hpp"
-#include "glfw-platform.hpp"
-#include "glfw-time.hpp"
-#include "glfw-timers.hpp"
-#include "glfw-version.hpp"
-#include "glfw-vulkan.hpp"
-#include "glfw-window.hpp"
-
+#include "glfw-clipboard.cpp"
+#include "glfw-console.cpp"
+#include "glfw-context.cpp"
+#include "glfw-cursor.cpp"
+#include "glfw-events.cpp"
+#include "glfw-info.cpp"
+#include "glfw-init.cpp"
+#include "glfw-input.cpp"
+#include "glfw-joystick.cpp"
+#include "glfw-monitors.cpp"
+#include "glfw-platform.cpp"
+#include "glfw-time.cpp"
+#include "glfw-timers.cpp"
+#include "glfw-version.cpp"
+#include "glfw-vulkan.cpp"
+#include "glfw-window.cpp"
 
 #define JS_GLFW_CONSTANT(name)                                                \
 	exports.Set(#name, static_cast<double>(GLFW_ ## name));

src/cpp/glfw-clipboard.cpp

@@ -8,7 +8,7 @@ DBG_EXPORT JS_METHOD(setClipboardString) { NAPI_ENV; THIS_WINDOW;
 	REQ_STR_ARG(1, str);
 
 	glfwSetClipboardString(window, str.c_str());
-	RET_UNDEFINED;
+	RET_GLFW_VOID;
 }
 
 

src/cpp/glfw-clipboard.hpp

@@ -1,5 +1,4 @@
-#ifndef _GLFW_CLIPBOARD_HPP_
-#define _GLFW_CLIPBOARD_HPP_
+#pragma once
 
 #include "glfw-common.hpp"
 
@@ -8,6 +7,3 @@ namespace glfw {
 	DBG_EXPORT JS_METHOD(setClipboardString);
 	DBG_EXPORT JS_METHOD(getClipboardString);
 } // namespace glfw
-
-
-#endif /* _GLFW_CLIPBOARD_HPP_ */

src/cpp/glfw-common.hpp

@@ -1,5 +1,4 @@
-#ifndef _GLFW_COMMON_HPP_
-#define _GLFW_COMMON_HPP_
+#pragma once
 
 #include <addon-tools.hpp>
 
@@ -34,5 +33,9 @@
 #define STATE_ENV                                                             \
 	Napi::Env env = state->emitter.Env();
 
+#define RET_GLFW_VOID                                                         \
+	return glfw::undefined;
 
-#endif /* _GLFW_COMMON_HPP_ */
+namespace glfw {
+	Napi::Value undefined;
+}

src/cpp/glfw-console.cpp

@@ -4,20 +4,20 @@
 
 namespace glfw {
 
-DBG_EXPORT JS_METHOD(hideConsole) { NAPI_ENV;
+DBG_EXPORT JS_METHOD(hideConsole) {
 	#ifdef _WIN32
 		auto wnd = FindWindowA("ConsoleWindowClass", nullptr);
 		ShowWindow(wnd, 0);
 	#endif
-	RET_UNDEFINED;
+	RET_GLFW_VOID;
 }
 
-DBG_EXPORT JS_METHOD(showConsole) { NAPI_ENV;
+DBG_EXPORT JS_METHOD(showConsole) {
 	#ifdef _WIN32
 		auto wnd = FindWindowA("ConsoleWindowClass", nullptr);
 		ShowWindow(wnd, 1);
 	#endif
-	RET_UNDEFINED;
+	RET_GLFW_VOID;
 }
 
 } // namespace glfw

src/cpp/glfw-console.hpp

@@ -1,5 +1,4 @@
-#ifndef _GLFW_CONSOLE_HPP_
-#define _GLFW_CONSOLE_HPP_
+#pragma once
 
 #include "glfw-common.hpp"
 
@@ -8,6 +7,3 @@ namespace glfw {
 	DBG_EXPORT JS_METHOD(hideConsole);
 	DBG_EXPORT JS_METHOD(showConsole);
 } // namespace glfw
-
-
-#endif /* _GLFW_CONSOLE_HPP_ */