0c4866a37e68932406e330bebb7565f2f8437112 — octaspire 8 months ago 9b6170e master v0.489.6
Fix compiler warnings and an error on some plugins in NetBSD
M dev/include/octaspire/dern/octaspire_dern_config.h => dev/include/octaspire/dern/octaspire_dern_config.h +1 -1
@@ 19,7 19,7 @@
 
 #define OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "0"
 #define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "489"
-#define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "5"
+#define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "6"
 
 #define OCTASPIRE_DERN_CONFIG_VERSION_STR "Octaspire Dern version " \
     OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "." \

M release/octaspire-dern-amalgamated.c => release/octaspire-dern-amalgamated.c +1 -1
@@ 26448,7 26448,7 @@
 
 #define OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "0"
 #define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "489"
-#define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "5"
+#define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "6"
 
 #define OCTASPIRE_DERN_CONFIG_VERSION_STR "Octaspire Dern version " \
     OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "." \

M release/plugins/dern_sdl2.c => release/plugins/dern_sdl2.c +57 -0
@@ 4183,6 4183,11 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     glColor4ub(r, g, b, a);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(r);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(g);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(b);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(a);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 4302,6 4307,11 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     glClearColor(r, g, b, a);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(r);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(g);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(b);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(a);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 4408,6 4418,9 @@
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return result;
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(x);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(y);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 4652,6 4665,10 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     glTranslatef(x, y, z);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(x);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(y);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(z);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 4717,6 4734,8 @@
         num[3], num[4], num[5],
         num[6], num[7], num[8]);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(num);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 4879,6 4898,8 @@
             (error != GL_NO_ERROR) ? dern_sdl2_glError_to_cstr(error) : "");
     }
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(args);
+
     octaspire_helpers_verify_true(octaspire_dern_vm_pop_value(vm, result));
 
     octaspire_helpers_verify_true(


@@ 5000,6 5021,11 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     gluPerspective(fovy, aspect, zNear, zFar);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(fovy);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(aspect);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(zNear);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(zFar);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 5119,6 5145,11 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     glViewport(x, y, width, height);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(x);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(y);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(width);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(height);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 5178,6 5209,8 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     glClearDepth(depth);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(depth);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 5297,6 5330,11 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     glRotatef(angle, x, y, z);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(angle);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(x);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(y);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(z);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 5396,6 5434,10 @@
 #ifdef OCTASPIRE_DERN_SDL2_PLUGIN_USE_OPENGL2_LIBRARY
     glVertex3f(x, y, z);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(x);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(y);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(z);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 5476,6 5518,9 @@
     glBindTexture(GL_TEXTURE_2D, dern_sdl2_private_gltextures[0]);
     glTexCoord2f(s, t);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(s);
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(t);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_from_c_string(
         vm,


@@ 5554,6 5599,8 @@
     glDisable(GL_LIGHTING);
     glEnable(GL_BLEND);
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(args);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_format(
         vm,


@@ 5705,6 5752,8 @@
     }
     glEnd();
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(args);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_format(
         vm,


@@ 5801,6 5850,8 @@
     glEnd();
     glPopMatrix();
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(args);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_format(
         vm,


@@ 5898,6 5949,8 @@
     glEnd();
     glPopMatrix();
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(args);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_format(
         vm,


@@ 5992,6 6045,8 @@
     glEnd();
     glPopMatrix();
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(args);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_format(
         vm,


@@ 6068,6 6123,8 @@
     glVertex2f(args[2], args[3]);
     glEnd();
 #else
+    OCTASPIRE_HELPERS_UNUSED_PARAMETER(args);
+
     octaspire_helpers_verify_true(stackLength == octaspire_dern_vm_get_stack_length(vm));
     return octaspire_dern_vm_create_new_value_error_format(
         vm,

M release/plugins/external/nuklear/nuklear_sdl_gl2.h => release/plugins/external/nuklear/nuklear_sdl_gl2.h +1 -1
@@ 13,7 13,7 @@
 #ifndef NK_SDL_GL2_H_
 #define NK_SDL_GL2_H_
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__NetBSD__)
 #include "SDL.h"
 #else
 #include <SDL2/SDL.h>