Fix build error for 64bit architecture

Change-Id: I43babdbfe40fb035e8719ecaffdb385f53b13e4c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc968c7..b4f61c8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ PROJECT(coregl C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include_KHR")
 SET(COREGL_VERSION_MAJOR 4)
 SET(COREGL_VERSION_MINOR 0)
@@ -14,6 +13,13 @@ 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}")
+SET(BUILD_ARCH "$ENV{RPM_ARCH}")
+
+IF(${BUILD_ARCH} MATCHES "aarch64")
+SET(LIBDIR "/usr/lib64")
+ELSE(${BUILD_ARCH} MATCHES "aarch64")
+SET(LIBDIR "/usr/lib")
+ENDIF(${BUILD_ARCH} MATCHES "aarch64")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include_KHR)
 
@@ -25,6 +31,9 @@ ADD_DEFINITIONS("-D_COREGL_COMPILE_DATE=\"${COMPILE_DATE}\"")
 IF(USE_ADRENO)
 ADD_DEFINITIONS("-D_COREGL_VENDOR_EGL_LIB_PATH=\"/usr/lib/egl/libEGL.so\"")
 ADD_DEFINITIONS("-D_COREGL_VENDOR_GL_LIB_PATH=\"/usr/lib/egl/libGLESv2.so\"")
+ELSE(USE_ADRENO)
+ADD_DEFINITIONS("-D_COREGL_VENDOR_EGL_LIB_PATH=\"${LIBDIR}/driver/libEGL.so\"")
+ADD_DEFINITIONS("-D_COREGL_VENDOR_GL_LIB_PATH=\"${LIBDIR}/driver/libGLESv2.so\"")
 ENDIF(USE_ADRENO)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")

diff --git a/include_KHR/EGL/eglplatform.h b/include_KHR/EGL/eglplatform.h
index eb69422..5f82bba 100644 (file)
--- a/include_KHR/EGL/eglplatform.h
+++ b/include_KHR/EGL/eglplatform.h
@@ -111,7 +111,7 @@ typedef void *EGLNativePixmapType;
 #else
 /* 20140708-sw815.ha: enable compilation even for unsupported platforms */
 /* #error "Platform not recognized" */
-typedef int   EGLNativeDisplayType;
+typedef void *EGLNativeDisplayType;
 typedef void *EGLNativeWindowType;
 typedef void *EGLNativePixmapType;
 

diff --git a/packaging/coregl.spec b/packaging/coregl.spec
index f4ef326..6556b14 100644 (file)
--- a/packaging/coregl.spec
+++ b/packaging/coregl.spec
@@ -4,7 +4,7 @@ Name:                   coregl
 Summary:               CoreGL FastPath Optimization
 Version:               0.1.10
 Release:               02
-ExclusiveArch: %arm
+ExclusiveArch: %arm aarch64
 Group:                 Graphics
 License:               Apache 2.0
 URL:                   http://www.tizen.org