From d0037604a8af4c1ac0b6b6bcc96f1b1766e07c84 Mon Sep 17 00:00:00 2001 From: Haegeun Park Date: Thu, 9 May 2013 23:35:20 -0700 Subject: [PATCH] [Title] Renamed EGL/GL wrapper library [Issue#] [Problem] [Cause] [Solution] - This modification only affects in cmake. -- libEGL.so.3.0 -> libEGL.so.1.4 -- libGLESv2.so.3.0 -> libGLESv2.so.2.0 --- CMakeLists.txt | 23 +++++++++++++++-------- packaging/coregl.spec | 4 ++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0df7946..05c0ed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,15 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") -SET(VERSION_MAJOR 3) -SET(VERSION "${VERSION_MAJOR}.0") +SET(COREGL_VERSION_MAJOR 3) +SET(COREGL_VERSION_MINOR 0) +SET(EGL_VERSION_MAJOR 1) +SET(EGL_VERSION_MINOR 4) +SET(GLES2_VERSION_MAJOR 2) +SET(GLES2_VERSION_MINOR 0) +SET(COREGL_VERSION "${COREGL_VERSION_MAJOR}.${COREGL_VERSION_MINOR}") +SET(EGL_VERSION "${EGL_VERSION_MAJOR}.${EGL_VERSION_MINOR}") +SET(GLES2_VERSION "${GLES2_VERSION_MAJOR}.${GLES2_VERSION_MINOR}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) @@ -76,20 +83,20 @@ FOREACH(flag ${pkg_common_CFLAGS}) ENDFOREACH(flag) ADD_LIBRARY(${COREGL} SHARED ${SRCS_common}) -SET_TARGET_PROPERTIES(${COREGL} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${COREGL} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${COREGL} PROPERTIES SOVERSION ${COREGL_VERSION_MAJOR}) +SET_TARGET_PROPERTIES(${COREGL} PROPERTIES VERSION ${COREGL_VERSION}) #SET_TARGET_PROPERTIES(${COREGL} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_common}) TARGET_LINK_LIBRARIES(${COREGL} ${pkg_common_LDFLAGS} ${dlog_LIBRARIES} "-ldl -g -O2 -fvisibility=hidden -Wall -std=c99 -lpthread") ADD_LIBRARY(${EGL} SHARED ${EGL_SRCS_common}) -SET_TARGET_PROPERTIES(${EGL} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${EGL} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${EGL} PROPERTIES SOVERSION ${EGL_VERSION_MAJOR}) +SET_TARGET_PROPERTIES(${EGL} PROPERTIES VERSION ${EGL_VERSION}) #SET_TARGET_PROPERTIES(${COREGL} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_common}) TARGET_LINK_LIBRARIES(${EGL} ${pkg_common_LDFLAGS} ${dlog_LIBRARIES} "-ldl -g -O2 -fvisibility=hidden -Wall -std=c99 -lpthread") ADD_LIBRARY(${GLES2} SHARED ${GLES2_SRCS_common}) -SET_TARGET_PROPERTIES(${GLES2} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${GLES2} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${GLES2} PROPERTIES SOVERSION ${GLES2_VERSION_MAJOR}) +SET_TARGET_PROPERTIES(${GLES2} PROPERTIES VERSION ${GLES2_VERSION}) #SET_TARGET_PROPERTIES(${COREGL} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_common}) TARGET_LINK_LIBRARIES(${GLES2} ${pkg_common_LDFLAGS} ${dlog_LIBRARIES} "-ldl -g -O2 -fvisibility=hidden -Wall -std=c99 -lpthread") diff --git a/packaging/coregl.spec b/packaging/coregl.spec index f6eb057..15b83fb 100644 --- a/packaging/coregl.spec +++ b/packaging/coregl.spec @@ -39,8 +39,8 @@ mkdir -p %{buildroot}/usr/lib mkdir -p %{buildroot}/usr/include/EGL mkdir -p %{buildroot}/usr/include/GLES2 cp %{_builddir}/%{name}-%{version}/libCOREGL.so.3.0 %{buildroot}%{_libdir}/libCOREGL.so.3.0 -cp %{_builddir}/%{name}-%{version}/libEGL.so.3.0 %{buildroot}%{_libdir}/libEGL.so.1.4 -cp %{_builddir}/%{name}-%{version}/libGLESv2.so.3.0 %{buildroot}%{_libdir}/libGLESv2.so.2.0 +cp %{_builddir}/%{name}-%{version}/libEGL.so.1.4 %{buildroot}%{_libdir}/libEGL.so.1.4 +cp %{_builddir}/%{name}-%{version}/libGLESv2.so.2.0 %{buildroot}%{_libdir}/libGLESv2.so.2.0 %clean rm -rf %{buildroot} -- 2.7.4