Use the mspcore version of getenv

diff --git a/source/backends/opengl/device_backend.cpp b/source/backends/opengl/device_backend.cpp
index c13a7f0435babb82c6b715729c8c4f73587f467b..1b2ad57a19576e24c976445d04094da88b578160 100644 (file)
--- a/source/backends/opengl/device_backend.cpp
+++ b/source/backends/opengl/device_backend.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/environ.h>
 #include <msp/gl/extensions/arb_enhanced_layouts.h>
 #include <msp/gl/extensions/arb_explicit_attrib_location.h>
 #include <msp/gl/extensions/arb_explicit_uniform_location.h>
@@ -47,9 +48,10 @@ void OpenGLDevice::fill_info()
 
                Version ver(gl_ver.substr(0, gl_ver.find(' ')));
 
-               if(const char *force_ver_ptr = getenv("MSPGL_FORCE_VERSION"))
+               string force_ver_str = getenv("MSPGL_FORCE_VERSION");
+               if(!force_ver_str.empty())
                {
-                       Version force_ver(force_ver_ptr);
+                       Version force_ver(force_ver_str);
                        if(force_ver<ver)
                                ver = force_ver;
                }

diff --git a/source/backends/opengl/extension.cpp b/source/backends/opengl/extension.cpp
index 84f8bd0a32d0789eb7dd340411b4b92ec73e701a..82661c70eb418f254bea16fd151bcd3dc55252ad 100644 (file)
--- a/source/backends/opengl/extension.cpp
+++ b/source/backends/opengl/extension.cpp
@@ -8,6 +8,7 @@
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
+#include <msp/core/environ.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "device.h"
@@ -105,9 +106,10 @@ bool is_disabled(const string &ext)
 
        if(!init_done)
        {
-               if(const char *disable_ptr = getenv("MSPGL_DISABLE_EXTENSIONS"))
+               string disable_str = getenv("MSPGL_DISABLE_EXTENSIONS");
+               if(!disable_str.empty())
                {
-                       vector<string> disable = split(disable_ptr);
+                       vector<string> disable = split(disable_str);
                        disabled_exts.insert(disable.begin(), disable.end());
                }
 
@@ -164,9 +166,10 @@ inline Version _get_glsl_version()
 
        Version ver(glsl_ver.substr(0, glsl_ver.find(' ')));
 
-       if(const char *force_ver_ptr = getenv("MSPGL_FORCE_GLSL_VERSION"))
+       string force_ver_str = getenv("MSPGL_FORCE_GLSL_VERSION");
+       if(!force_ver_str.empty())
        {
-               Version force_ver(force_ver_ptr);
+               Version force_ver(force_ver_str);
                if(force_ver<ver)
                        ver = force_ver;
        }