From b2c44985e740d0a0ea86b7b9f4cc849258ac2340 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 20 Dec 2012 23:13:50 +1100 Subject: Fix linking ANGLE on MinGW-w64 64-bit The MinGW-w64 32-bit .def files shouldn't be used with MinGW-w64 64-bit. Rename .def files from _mingw.def to _mingw32.def and only use them if QT_ARCH is i386. Change-Id: I5dc2a87f7d2ed59bf954faf2983d0787ed9e00e9 Reviewed-by: Kai Koehne Reviewed-by: Patrick von Reth Reviewed-by: Friedemann Kleint --- src/3rdparty/angle/src/libEGL/libEGL_mingw.def | 36 ----------------------- src/3rdparty/angle/src/libEGL/libEGL_mingw32.def | 36 +++++++++++++++++++++++ src/3rdparty/angle/src/libEGL/libEGLd_mingw.def | 36 ----------------------- src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def | 36 +++++++++++++++++++++++ 4 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 src/3rdparty/angle/src/libEGL/libEGL_mingw.def create mode 100644 src/3rdparty/angle/src/libEGL/libEGL_mingw32.def delete mode 100644 src/3rdparty/angle/src/libEGL/libEGLd_mingw.def create mode 100644 src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def (limited to 'src/3rdparty/angle/src/libEGL') diff --git a/src/3rdparty/angle/src/libEGL/libEGL_mingw.def b/src/3rdparty/angle/src/libEGL/libEGL_mingw.def deleted file mode 100644 index 8128e7c4f0..0000000000 --- a/src/3rdparty/angle/src/libEGL/libEGL_mingw.def +++ /dev/null @@ -1,36 +0,0 @@ -LIBRARY libEGL -EXPORTS - eglBindAPI@4 @14 - eglBindTexImage@12 @20 - eglChooseConfig@20 @7 - eglCopyBuffers@12 @33 - eglCreateContext@16 @23 - eglCreatePbufferFromClientBuffer@20 @18 - eglCreatePbufferSurface@12 @10 - eglCreatePixmapSurface@16 @11 - eglCreateWindowSurface@16 @9 - eglDestroyContext@8 @24 - eglDestroySurface@8 @12 - eglGetConfigAttrib@16 @8 - eglGetConfigs@16 @6 - eglGetCurrentContext@0 @26 - eglGetCurrentDisplay@0 @28 - eglGetCurrentSurface@4 @27 - eglGetDisplay@4 @2 - eglGetError@0 @1 - eglGetProcAddress@4 @34 - eglInitialize@12 @3 - eglMakeCurrent@16 @25 - eglQueryAPI@0 @15 - eglQueryContext@16 @29 - eglQueryString@8 @5 - eglQuerySurface@16 @13 - eglReleaseTexImage@12 @21 - eglReleaseThread@0 @17 - eglSurfaceAttrib@16 @19 - eglSwapBuffers@8 @32 - eglSwapInterval@8 @22 - eglTerminate@4 @4 - eglWaitClient@0 @16 - eglWaitGL@0 @30 - eglWaitNative@4 @31 diff --git a/src/3rdparty/angle/src/libEGL/libEGL_mingw32.def b/src/3rdparty/angle/src/libEGL/libEGL_mingw32.def new file mode 100644 index 0000000000..8128e7c4f0 --- /dev/null +++ b/src/3rdparty/angle/src/libEGL/libEGL_mingw32.def @@ -0,0 +1,36 @@ +LIBRARY libEGL +EXPORTS + eglBindAPI@4 @14 + eglBindTexImage@12 @20 + eglChooseConfig@20 @7 + eglCopyBuffers@12 @33 + eglCreateContext@16 @23 + eglCreatePbufferFromClientBuffer@20 @18 + eglCreatePbufferSurface@12 @10 + eglCreatePixmapSurface@16 @11 + eglCreateWindowSurface@16 @9 + eglDestroyContext@8 @24 + eglDestroySurface@8 @12 + eglGetConfigAttrib@16 @8 + eglGetConfigs@16 @6 + eglGetCurrentContext@0 @26 + eglGetCurrentDisplay@0 @28 + eglGetCurrentSurface@4 @27 + eglGetDisplay@4 @2 + eglGetError@0 @1 + eglGetProcAddress@4 @34 + eglInitialize@12 @3 + eglMakeCurrent@16 @25 + eglQueryAPI@0 @15 + eglQueryContext@16 @29 + eglQueryString@8 @5 + eglQuerySurface@16 @13 + eglReleaseTexImage@12 @21 + eglReleaseThread@0 @17 + eglSurfaceAttrib@16 @19 + eglSwapBuffers@8 @32 + eglSwapInterval@8 @22 + eglTerminate@4 @4 + eglWaitClient@0 @16 + eglWaitGL@0 @30 + eglWaitNative@4 @31 diff --git a/src/3rdparty/angle/src/libEGL/libEGLd_mingw.def b/src/3rdparty/angle/src/libEGL/libEGLd_mingw.def deleted file mode 100644 index 1c72413f89..0000000000 --- a/src/3rdparty/angle/src/libEGL/libEGLd_mingw.def +++ /dev/null @@ -1,36 +0,0 @@ -LIBRARY libEGLd -EXPORTS - eglBindAPI@4 @14 - eglBindTexImage@12 @20 - eglChooseConfig@20 @7 - eglCopyBuffers@12 @33 - eglCreateContext@16 @23 - eglCreatePbufferFromClientBuffer@20 @18 - eglCreatePbufferSurface@12 @10 - eglCreatePixmapSurface@16 @11 - eglCreateWindowSurface@16 @9 - eglDestroyContext@8 @24 - eglDestroySurface@8 @12 - eglGetConfigAttrib@16 @8 - eglGetConfigs@16 @6 - eglGetCurrentContext@0 @26 - eglGetCurrentDisplay@0 @28 - eglGetCurrentSurface@4 @27 - eglGetDisplay@4 @2 - eglGetError@0 @1 - eglGetProcAddress@4 @34 - eglInitialize@12 @3 - eglMakeCurrent@16 @25 - eglQueryAPI@0 @15 - eglQueryContext@16 @29 - eglQueryString@8 @5 - eglQuerySurface@16 @13 - eglReleaseTexImage@12 @21 - eglReleaseThread@0 @17 - eglSurfaceAttrib@16 @19 - eglSwapBuffers@8 @32 - eglSwapInterval@8 @22 - eglTerminate@4 @4 - eglWaitClient@0 @16 - eglWaitGL@0 @30 - eglWaitNative@4 @31 diff --git a/src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def b/src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def new file mode 100644 index 0000000000..1c72413f89 --- /dev/null +++ b/src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def @@ -0,0 +1,36 @@ +LIBRARY libEGLd +EXPORTS + eglBindAPI@4 @14 + eglBindTexImage@12 @20 + eglChooseConfig@20 @7 + eglCopyBuffers@12 @33 + eglCreateContext@16 @23 + eglCreatePbufferFromClientBuffer@20 @18 + eglCreatePbufferSurface@12 @10 + eglCreatePixmapSurface@16 @11 + eglCreateWindowSurface@16 @9 + eglDestroyContext@8 @24 + eglDestroySurface@8 @12 + eglGetConfigAttrib@16 @8 + eglGetConfigs@16 @6 + eglGetCurrentContext@0 @26 + eglGetCurrentDisplay@0 @28 + eglGetCurrentSurface@4 @27 + eglGetDisplay@4 @2 + eglGetError@0 @1 + eglGetProcAddress@4 @34 + eglInitialize@12 @3 + eglMakeCurrent@16 @25 + eglQueryAPI@0 @15 + eglQueryContext@16 @29 + eglQueryString@8 @5 + eglQuerySurface@16 @13 + eglReleaseTexImage@12 @21 + eglReleaseThread@0 @17 + eglSurfaceAttrib@16 @19 + eglSwapBuffers@8 @32 + eglSwapInterval@8 @22 + eglTerminate@4 @4 + eglWaitClient@0 @16 + eglWaitGL@0 @30 + eglWaitNative@4 @31 -- cgit v1.2.3