Merge pull request #2071 from Sonicadvance1/Android_fix_unittests

[Android] Fix building unit tests.
dolphin-emu · Feb 19, 2015 · bdca0da · bdca0da
2 parents 2906f64 + 0567b28
commit bdca0da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt
@@ -2,6 +2,9 @@ set(LIBS core gtest)
 if(APPLE)
 	list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY})
 endif()
+if(ANDROID)
+	set(LIBS ${LIBS} android log)
+endif()
 macro(add_dolphin_test target srcs)
 	# Since this is a Core dependency, it can't be linked as a library and has
 	# to be linked as an object file. Otherwise CMake inserts the library after

diff --git a/Source/UnitTests/VideoCommon/CMakeLists.txt b/Source/UnitTests/VideoCommon/CMakeLists.txt
@@ -1,4 +1 @@
-# This test currently doesn't link correctly when EGL is enabled due to issues with the GLInterface design
-if(NOT USE_EGL)
-	add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp)
-endif()
+add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp)