piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions 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

33
CMakeLists.txt
View File

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

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

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