Changes required for dynamic graphics backend

Change-Id: I86b6bc05b0103485cc576f543169edc9da3db370

diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt
index e031ae07659f81fe23fb13e7c5e0af995561b9fc..fda111bc4a52f7958ac7fa302e472fd8215ae759 100755 (executable)
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@ -159,10 +159,15 @@ SET(TEST_HARNESS_SOURCES
   test-text-geometry-utils.cpp
 )
 
+# Need to link directly with glesv2 and egl as we override some GL/EGL functions in toolkit-direct-rendering-egl.cpp
+# As the GLES backend is dynamically loaded, if we don't link directly then the GLES backend uses the REAL function
+# rather than the overloaded one in the test suite
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
   dali2-core
   dali2-adaptor
   dali2-toolkit
+  glesv2
+  egl
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
@@ -189,6 +194,7 @@ ADD_CUSTOM_COMMAND(
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
+    -Wl,--no-as-needed # Force linking to library even if linker thinks we don't need it, this ensures EGL libraries are loaded at test startup
     ${${CAPI_LIB}_LIBRARIES}
     -lpthread --coverage -ldl
 )

diff --git a/build/tizen/dali-physics/CMakeLists.txt b/build/tizen/dali-physics/CMakeLists.txt
index 7e5f6809a4cee2bfbb42a3bab02d827d28b7d56e..32e1e4db91da1ad4b7a9c1dd90e8ce30309538e4 100644 (file)
--- a/build/tizen/dali-physics/CMakeLists.txt
+++ b/build/tizen/dali-physics/CMakeLists.txt
@@ -92,6 +92,8 @@ MESSAGE(STATUS "2D sources (GLES): ${physics2d_gles_src_files}")
 MESSAGE(STATUS "3D sources: ${physics3d_src_files}")
 MESSAGE(STATUS "3D sources (GLES): ${physics3d_gles_src_files}")
 
+PKG_CHECK_MODULES(OPENGLES glesv2 egl)
+
 ADD_LIBRARY("${name}-2d" SHARED ${physics2d_src_files})
 TARGET_LINK_LIBRARIES("${name}-2d"
   ${DALICORE_LDFLAGS}
@@ -104,6 +106,7 @@ ADD_LIBRARY("${name}-2d-gles" SHARED ${physics2d_gles_src_files})
 TARGET_LINK_LIBRARIES("${name}-2d-gles"
   ${DALICORE_LDFLAGS}
   ${DALIADAPTOR_LDFLAGS}
+  ${OPENGLES_LDFLAGS}
   dali2-toolkit
   chipmunk
   ${COVERAGE})
@@ -122,6 +125,7 @@ ADD_LIBRARY("${name}-3d-gles" SHARED ${physics3d_gles_src_files})
 TARGET_LINK_LIBRARIES("${name}-3d-gles"
   ${DALICORE_LDFLAGS}
   ${DALIADAPTOR_LDFLAGS}
+  ${OPENGLES_LDFLAGS}
   dali2-toolkit
   bullet3
   ${COVERAGE})