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

Merge branch 'master' into android-new-control-input-overlay

Browse Source
This commit is contained in:
Ryan Houdek 2013-11-24 17:10:24 -06:00
commit cb3dd6b94b
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -289,6 +289,10 @@ if(ANDROID)
set(USE_WAYLAND 0) set(USE_WAYLAND 0)
set(USE_UPNP 0) set(USE_UPNP 0)
set(USE_GLES3 1) set(USE_GLES3 1)
if(ANDROID_NDK_ABI_NAME STREQUAL "armeabi-v7a")
message("Enabling hard-float")
add_definitions(-mhard-float)
endif()
endif() endif()
# For now GLES and EGL are tied to each other. # For now GLES and EGL are tied to each other.
@ -332,13 +336,6 @@ add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
# externals. # externals.
include(CheckLib) include(CheckLib)
include(CheckCXXSourceRuns) include(CheckCXXSourceRuns)
if(NOT ANDROID)
include(FindOpenGL)
include_directories(${OPENGL_INCLUDE_DIR})
if(NOT OPENGL_GLU_FOUND)
message(FATAL_ERROR "GLU is required but not found")
endif()
if(OPENMP) if(OPENMP)
include(FindOpenMP OPTIONAL) include(FindOpenMP OPTIONAL)
@ -353,6 +350,14 @@ if(NOT ANDROID)
message("OpenMP parallelization disabled") message("OpenMP parallelization disabled")
endif() endif()
if(NOT ANDROID)
include(FindOpenGL)
include_directories(${OPENGL_INCLUDE_DIR})
if(NOT OPENGL_GLU_FOUND)
message(FATAL_ERROR "GLU is required but not found")
endif()
include(FindALSA OPTIONAL) include(FindALSA OPTIONAL)
if(ALSA_FOUND) if(ALSA_FOUND)
add_definitions(-DHAVE_ALSA=1) add_definitions(-DHAVE_ALSA=1)

1
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -187,6 +187,7 @@ if(ANDROID)
target_link_libraries(${DOLPHIN_EXE} target_link_libraries(${DOLPHIN_EXE}
log log
android android
"-Wl,--no-warn-mismatch"
"-Wl,--whole-archive" "-Wl,--whole-archive"
${LIBS} ${LIBS}
"-Wl,--no-whole-archive" "-Wl,--no-whole-archive"