From 1c69379b8d86f059f8a761e6d3e047fad48f2460 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Sun, 19 Aug 2012 11:48:09 -0300 Subject: [PATCH] Fix compilation with OpenGL ES 2.0 --- src/framework/cmake/FindEGL.cmake | 2 +- src/framework/cmake/FindOpenGLES1.cmake | 2 +- src/framework/cmake/FindOpenGLES2.cmake | 2 +- tools/make_snapshot.sh | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/framework/cmake/FindEGL.cmake b/src/framework/cmake/FindEGL.cmake index dcae3c7c..931420bc 100644 --- a/src/framework/cmake/FindEGL.cmake +++ b/src/framework/cmake/FindEGL.cmake @@ -4,7 +4,7 @@ # EGL_LIBRARY - the EGL library FIND_PATH(EGL_INCLUDE_DIR NAMES EGL/egl.h) -FIND_LIBRARY(EGL_LIBRARY NAMES EGL) +FIND_LIBRARY(EGL_LIBRARY NAMES EGL.dll EGL) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR) MARK_AS_ADVANCED(EGL_LIBRARY EGL_INCLUDE_DIR) \ No newline at end of file diff --git a/src/framework/cmake/FindOpenGLES1.cmake b/src/framework/cmake/FindOpenGLES1.cmake index 17099df4..b3d8fff4 100644 --- a/src/framework/cmake/FindOpenGLES1.cmake +++ b/src/framework/cmake/FindOpenGLES1.cmake @@ -4,7 +4,7 @@ # OPENGLES1_LIBRARY - the OpenGL ES 1.0 library FIND_PATH(OPENGLES1_INCLUDE_DIR NAMES GLES/gl.h) -FIND_LIBRARY(OPENGLES1_LIBRARY NAMES GLESv1_CM GLES_CM) +FIND_LIBRARY(OPENGLES1_LIBRARY NAMES GLESv1_CM.dll GLES_CM.dll GLESv1_CM GLES_CM) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGLES2 DEFAULT_MSG OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR) MARK_AS_ADVANCED(OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR) \ No newline at end of file diff --git a/src/framework/cmake/FindOpenGLES2.cmake b/src/framework/cmake/FindOpenGLES2.cmake index 20f94fb7..b2cf080c 100644 --- a/src/framework/cmake/FindOpenGLES2.cmake +++ b/src/framework/cmake/FindOpenGLES2.cmake @@ -4,7 +4,7 @@ # OPENGLES2_LIBRARY - the OpenGL ES 2.0 library FIND_PATH(OPENGLES2_INCLUDE_DIR NAMES GLES2/gl2.h) -FIND_LIBRARY(OPENGLES2_LIBRARY NAMES GLESv2) +FIND_LIBRARY(OPENGLES2_LIBRARY NAMES GLESv2.dll GLESv2) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR) MARK_AS_ADVANCED(OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR) \ No newline at end of file diff --git a/tools/make_snapshot.sh b/tools/make_snapshot.sh index 0dc5868a..dd345100 100755 --- a/tools/make_snapshot.sh +++ b/tools/make_snapshot.sh @@ -6,6 +6,7 @@ gitroot="git://github.com/edubart/otclient.git" name="otclient" workdir="$HOME/$name-builds" mingwplatform="i486-mingw32" +mingwbin="/usr/$mingwplatform/bin" makejobs=4 [ "$1" == "--replace" ] && replace=true || replace=false @@ -135,6 +136,10 @@ cd $pkgname # copy otclient files cp -R $workdir/otclient/mods . cp -R $workdir/otclient/modules . +cp $mingwbin/libEGL.dll . +cp $mingwbin/libGLESv2.dll . +cp $mingwbin/d3dcompiler_43.dll . +cp $mingwbin/d3dx9_43.dll . cp $workdir/otclient/build.win32/otclient.exe . cp $workdir/otclient/build.win32/otclient.map . cp $workdir/otclient/build.win32dx9/otclient.exe otclient_dx9.exe