gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update make_snapshop.sh

This commit is contained in:
Eduardo Bart 2013-11-13 14:33:29 -02:00
parent b07a77f705
commit 28786a3570
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/framework/cmake/FindEGL.cmake
View File

@ -6,11 +6,11 @@
FIND_PATH(EGL_INCLUDE_DIR NAMES EGL/egl.h)
SET(_EGL_STATIC_LIBS libEGL.a)
SET(_EGL_SHARED_LIBS libEGL.dll.a EGL)
IF(USE_STATIC_LIBS)
FIND_LIBRARY(EGL_LIBRARY NAMES ${_EGL_STATIC_LIBS} ${_EGL_SHARED_LIBS})
ELSE()
#IF(USE_STATIC_LIBS)
# FIND_LIBRARY(EGL_LIBRARY NAMES ${_EGL_STATIC_LIBS} ${_EGL_SHARED_LIBS})
#ELSE()
FIND_LIBRARY(EGL_LIBRARY NAMES ${_EGL_SHARED_LIBS} ${_EGL_STATIC_LIBS})
ENDIF()
#ENDIF()
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
MARK_AS_ADVANCED(EGL_LIBRARY EGL_INCLUDE_DIR)

8
src/framework/cmake/FindOpenGLES1.cmake
View File

@ -4,7 +4,13 @@
# OPENGLES1_LIBRARY - the OpenGL ES 1.0 library
FIND_PATH(OPENGLES1_INCLUDE_DIR NAMES GLES/gl.h)
FIND_LIBRARY(OPENGLES1_LIBRARY NAMES GLESv1_CM.dll GLES_CM.dll GLESv1_CM GLES_CM)
SET(_OPENGLES1_STATIC_LIBS libGLESv1_CM.a libGLES_CM.a)
SET(_OPENGLES1_SHARED_LIBS libGLESv1_CM.dll.a libGLES_CM.dll.a GLESv1_CM GLES_CM)
#IF(USE_STATIC_LIBS)
# FIND_LIBRARY(OPENGLES1_LIBRARY NAMES ${_OPENGLES1_STATIC_LIBS} ${_OPENGLES1_SHARED_LIBS})
#ELSE()
FIND_LIBRARY(OPENGLES1_LIBRARY NAMES ${_OPENGLES1_SHARED_LIBS} ${_OPENGLES1_STATIC_LIBS})
#ENDIF()
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGLES2 DEFAULT_MSG OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR)
MARK_AS_ADVANCED(OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR)

8
src/framework/cmake/FindOpenGLES2.cmake
View File

@ -6,11 +6,11 @@
FIND_PATH(OPENGLES2_INCLUDE_DIR NAMES GLES2/gl2.h)
SET(_OPENGLES2_STATIC_LIBS libGLESv2.a)
SET(_OPENGLES2_SHARED_LIBS libGLESv2.dll.a GLESv2)
IF(USE_STATIC_LIBS)
FIND_LIBRARY(OPENGLES2_LIBRARY NAMES ${_OPENGLES2_STATIC_LIBS} ${_OPENGLES2_SHARED_LIBS})
ELSE()
#IF(USE_STATIC_LIBS)
# FIND_LIBRARY(OPENGLES2_LIBRARY NAMES ${_OPENGLES2_STATIC_LIBS} ${_OPENGLES2_SHARED_LIBS})
#ELSE()
FIND_LIBRARY(OPENGLES2_LIBRARY NAMES ${_OPENGLES2_SHARED_LIBS} ${_OPENGLES2_STATIC_LIBS})
ENDIF()
#ENDIF()
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
MARK_AS_ADVANCED(OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)

19
tools/make_snapshot.sh
View File

@ -50,10 +50,11 @@ if $rebuild; then
rm -rf build.win32dx9
rm -rf build.win64dx9
rm -rf build.linux32
#rm -rf build.linux64
rm -rf build.linux64
fi
WIN32_EXTRA_LIBS="-Wl,-Bstatic -lgcc -lstdc++ -lpthread"
WIN32_EXTRA_LIBS="-Wl,-Bstatic -lgcc -lstdc++ -lpthread -Wl,-Bdynamic"
# compile for win64
mkdir -p build.win64
@ -86,8 +87,8 @@ make -j$makejobs || exit
cd ..
# compile for win64dx9
mkdir -p build.win64
cd build.win64
mkdir -p build.win64dx9
cd build.win64dx9
if $rebuild; then
x86_64-w64-mingw32-cmake \
-DCMAKE_BUILD_TYPE=Release \
@ -214,11 +215,11 @@ mkdir mods
cp $workdir/otclient/mods/README.txt mods/
cp -R $workdir/otclient/modules .
cp -R $workdir/otclient/data .
#cp $mingwbin/libEGL.dll .
#cp $mingwbin/libGLESv2.dll .
#cp $mingwbin/d3dcompiler_43.dll .
#cp $mingwbin/d3dx9_43.dll .
#cp $mingwbin/wrap_oal.dll .
cp $mingwbin/libEGL.dll .
cp $mingwbin/libGLESv2.dll .
cp $mingwbin/d3dcompiler_43.dll .
cp $mingwbin/d3dx9_43.dll .
cp $mingwbin/wrap_oal.dll .
cp $workdir/otclient/build.win32/otclient.exe otclient-32.exe
cp $workdir/otclient/build.win32dx9/otclient.exe otclient_dx9-32.exe
cp $workdir/otclient/build.win64/otclient.exe otclient-64.exe