diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/SCsub | 2 | ||||
| -rw-r--r-- | drivers/gles2/rasterizer_gles2.cpp | 2 | ||||
| -rw-r--r-- | drivers/unix/os_unix.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index bd339dedb5..ca1b885028 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -75,7 +75,7 @@ if len(list) > 0: drivers_base=[]
env.add_source_files(drivers_base,"*.cpp")
-lib_list.insert(0, env.Library("drivers", drivers_base))
+lib_list.insert(0, env.Library("drivers", drivers_base, LIBSUFFIX=env['platform_libsuffix']))
env.Prepend(LIBS=lib_list)
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index f0583121c6..d29ecd64bb 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -7511,7 +7511,7 @@ void RasterizerGLES2::init() { pvr_supported=extensions.has("GL_IMG_texture_compression_pvrtc"); etc_supported=extensions.has("GL_OES_compressed_ETC1_RGB8_texture"); use_depth24 = extensions.has("GL_OES_depth24"); - s3tc_supported = extensions.has("GL_EXT_texture_compression_dxt1") || extensions.has("GL_EXT_texture_compression_s3tc"); + s3tc_supported = extensions.has("GL_EXT_texture_compression_dxt1") || extensions.has("GL_EXT_texture_compression_s3tc") || extensions.has("WEBGL_compressed_texture_s3tc"); use_half_float = extensions.has("GL_OES_vertex_half_float"); diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index f684c63b3b..399d0247fc 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -394,7 +394,8 @@ String OS_Unix::get_executable_path() const { memset(buf,0,256); readlink("/proc/self/exe", buf, sizeof(buf)); //print_line("Exec path is:"+String(buf)); - String b = buf; + String b; + b.parse_utf8(buf); if (b=="") { WARN_PRINT("Couldn't get executable path from /proc/self/exe, using argv[0]"); return OS::get_executable_path(); |