Use versioned shared library names.
crbug.com/336438
diff --git a/src/GLES2/libEGL/libEGL.cbp b/src/GLES2/libEGL/libEGL.cbp
index 5609d21..72049bf 100644
--- a/src/GLES2/libEGL/libEGL.cbp
+++ b/src/GLES2/libEGL/libEGL.cbp
@@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug x86">
- <Option output="./../../bin/x86/Debug/libEGL.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x86/Debug/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
@@ -22,7 +22,7 @@
</Linker>
</Target>
<Target title="Release x86">
- <Option output="./../../bin/x86/Release/libEGL.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x86/Release/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Release/" />
<Option type="3" />
<Option compiler="gcc" />
@@ -40,7 +40,7 @@
</Linker>
</Target>
<Target title="Debug x64">
- <Option output="./../../bin/x64/Debug/libEGL.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x64/Debug/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
@@ -56,7 +56,7 @@
</Linker>
</Target>
<Target title="Release x64">
- <Option output="./../../bin/x64/Release/libEGL.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x64/Release/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Release/" />
<Option type="3" />
<Option compiler="gcc" />
diff --git a/src/GLES2/libEGL/main.cpp b/src/GLES2/libEGL/main.cpp
index 52a7dde..7ddac11 100644
--- a/src/GLES2/libEGL/main.cpp
+++ b/src/GLES2/libEGL/main.cpp
@@ -84,7 +84,7 @@
#if defined(_WIN32)
const char *libGLESv2_lib = "libGLESv2.dll";
#else
- const char *libGLESv2_lib = "libGLESv2.so";
+ const char *libGLESv2_lib = "libGLESv2.so.2";
#endif
libGLESv2 = loadLibrary(libGLESv2_lib);
diff --git a/src/GLES2/libGLESv2/libGLESv2.cbp b/src/GLES2/libGLESv2/libGLESv2.cbp
index 443c986..4239476 100644
--- a/src/GLES2/libGLESv2/libGLESv2.cbp
+++ b/src/GLES2/libGLESv2/libGLESv2.cbp
@@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug x86">
- <Option output="./../../bin/x86/Debug/libGLESv2.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x86/Debug/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
@@ -23,7 +23,7 @@
</Linker>
</Target>
<Target title="Release x86">
- <Option output="./../../bin/x86/Release/libGLESv2.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x86/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Release/" />
<Option type="3" />
<Option compiler="gcc" />
@@ -47,7 +47,7 @@
</Linker>
</Target>
<Target title="Debug x64">
- <Option output="./../../bin/x64/Debug/libGLESv2.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x64/Debug/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
@@ -64,7 +64,7 @@
</Linker>
</Target>
<Target title="Release x64">
- <Option output="./../../bin/x64/Release/libGLESv2.so" prefix_auto="0" extension_auto="0" />
+ <Option output="./../../bin/x64/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Release/" />
<Option type="3" />
<Option compiler="gcc" />
diff --git a/src/Reactor/Nucleus.cpp b/src/Reactor/Nucleus.cpp
index fec9421..c5377a8 100644
--- a/src/Reactor/Nucleus.cpp
+++ b/src/Reactor/Nucleus.cpp
@@ -34,7 +34,7 @@
#include <fstream>
-#if defined(__x86_64__)
+#if defined(__x86_64__) && defined(_WIN32)
extern "C" void X86CompilationCallback()
{
assert(false); // UNIMPLEMENTED
