Skip to content

S
swiftshader
Commit cb122582 by Nicolas Capens
Options

Use versioned shared library names.

crbug.com/336438
parent c6e8ab13
Showing with 10 additions and 10 deletions
src/GLES2/libEGL/libEGL.cbp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug x86"> <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 object_output="obj/x86/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Release x86"> <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 object_output="obj/x86/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Debug x64"> <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 object_output="obj/x64/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Release x64"> <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 object_output="obj/x64/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
......
src/GLES2/libEGL/main.cpp
...@@ -84,7 +84,7 @@ CONSTRUCTOR static bool eglAttachProcess() ...@@ -84,7 +84,7 @@ CONSTRUCTOR static bool eglAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLESv2_lib = "libGLESv2.dll"; const char *libGLESv2_lib = "libGLESv2.dll";
#else #else
const char *libGLESv2_lib = "libGLESv2.so"; const char *libGLESv2_lib = "libGLESv2.so.2";
#endif #endif
libGLESv2 = loadLibrary(libGLESv2_lib); libGLESv2 = loadLibrary(libGLESv2_lib);
......
src/GLES2/libGLESv2/libGLESv2.cbp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug x86"> <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 object_output="obj/x86/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Release x86"> <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 object_output="obj/x86/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Debug x64"> <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 object_output="obj/x64/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Release x64"> <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 object_output="obj/x64/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
......
src/Reactor/Nucleus.cpp
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <fstream> #include <fstream>
#if defined(__x86_64__) #if defined(__x86_64__) && defined(_WIN32)
extern "C" void X86CompilationCallback() extern "C" void X86CompilationCallback()
{ {
assert(false); // UNIMPLEMENTED assert(false); // UNIMPLEMENTED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment