Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More cmake fixes #2400

Merged
merged 10 commits into from
Jan 24, 2021
Merged

More cmake fixes #2400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a6f7f8
CMake: Guard Policy check
Ghabry Oct 12, 2020
29a55ff
Fix fPIC for libretro-common
Ghabry Oct 12, 2020
28d68ad
mingw: Fix crossbuild (case sensitivity issue)
Ghabry Oct 13, 2020
351c72d
Update libretro-common to 149afd5
Ghabry Jan 14, 2021
22ead28
Ports powered by devkitPro require active GNU extensions to build
Ghabry Sep 8, 2020
a6cdb99
libretro: Search pthread library instead of hardcoding (Fixes Windows…
Ghabry Oct 13, 2020
1b43992
CMake: Fix Android dependencies. Depends on "log" and pixman depends …
Ghabry Oct 13, 2020
659383c
CMake: Fix linking of the testrunner when building libretro (depends …
Ghabry Jan 14, 2021
1503502
CMake: Defines for 3DS, Vita and Switch must be always set when the p…
Ghabry Oct 15, 2020
0c86e3b
libretro: Add LibretroClock
Ghabry Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CMake: Fix Android dependencies. Depends on "log" and pixman depends … 
…on "cpufeatures"
  • Loading branch information
@Ghabry
Ghabry committed Jan 14, 2021
commit 1b43992363e6cbe64feba6a0b5e661311e9e621a
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,10 @@ if(NOT PLAYER_BUILD_EXECUTABLE AND BUILD_SHARED_LIBS)
set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()

if(ANDROID)
target_link_libraries(${PROJECT_NAME} log)
endif()

if(WIN32)
target_sources(${PROJECT_NAME} PRIVATE
src/registry.cpp
Expand Down
12 changes: 12 additions & 0 deletions builds/cmake/Modules/FindPixman.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Pixman
REQUIRED_VARS PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR)

if(ANDROID)
enable_language(C)
# armeabi-v7a requires this
add_library(cpufeatures STATIC
${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
endif()

if(PIXMAN_FOUND)
set(PIXMAN_INCLUDE_DIRS ${PIXMAN_INCLUDE_DIR})

Expand Down Expand Up @@ -83,6 +90,11 @@ if(PIXMAN_FOUND)
set_property(TARGET PIXMAN::PIXMAN APPEND PROPERTY
IMPORTED_LOCATION "${PIXMAN_LIBRARY}")
endif()

if(ANDROID)
set_property(TARGET PIXMAN::PIXMAN APPEND PROPERTY
INTERFACE_LINK_LIBRARIES cpufeatures)
endif()
endif()
endif()

Expand Down