The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2071 from Sonicadvance1/Android_fix_unittests

Browse Source 
[Android] Fix building unit tests.
This commit is contained in:
Lioncash 2015-02-18 21:19:18 -05:00
commit bdca0dac29
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/UnitTests/CMakeLists.txt
View File

@ -2,6 +2,9 @@ set(LIBS core gtest)
if(APPLE) if(APPLE)
list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY}) list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY})
endif() endif()
if(ANDROID)
set(LIBS ${LIBS} android log)
endif()
macro(add_dolphin_test target srcs) macro(add_dolphin_test target srcs)
# Since this is a Core dependency, it can't be linked as a library and has # 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 # to be linked as an object file. Otherwise CMake inserts the library after

3
Source/UnitTests/VideoCommon/CMakeLists.txt
View File

@ -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) add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp)
endif()