diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mostly fixes for Android

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-04-22 18:27:25 +01:00
parent 2550fc5b87
commit c0a45cf42c
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -114,9 +114,16 @@ get_git_head_revision(GIT_HEAD GIT_SHA1)
git_describe(GIT_DESCRIBE) git_describe(GIT_DESCRIBE)
if (ANDROID) if (ANDROID)
IF(DEFINED ENV{ANDROID_SDK})
set (ANDROID_SDK $ENV{ANDROID_SDK})
ELSEIF( NOT DEFINED ANDROID_SDK)
message("ANDROID_SDK is not defined. You must tell CMake where to find the SDK")
# exit early
return()
ENDIF()
set (ANDROIDDLLS "android" "log") set (ANDROIDDLLS "android" "log")
set (ANDROID_ANT ant) set (ANDROID_ANT ${ANDROID_SDK}/tools/ant)
set (ANDROID_SDK_TOOL $ENV{ANDROID_SDK}/tools/android) set (ANDROID_SDK_TOOL ${ANDROID_SDK}/tools/android)
else() else()
set(YAP_STARTUP startup.yss) set(YAP_STARTUP startup.yss)
endif() endif()
@ -216,12 +223,6 @@ set_target_properties(libYap
OUTPUT_NAME Yap OUTPUT_NAME Yap
) )
if (ANDROID)
set_target_properties(libYap
PROPERTIES OUTPUT_NAME libayap
)
endif (ANDROID)
set(CMAKE_TOP_BINARY_DIR ${CMAKE_BINARY_DIR}) set(CMAKE_TOP_BINARY_DIR ${CMAKE_BINARY_DIR})
set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl) set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl)
@ -233,11 +234,11 @@ set ( prefix "${CMAKE_INSTALL_PREFIX}")
set ( exec_prefix "${prefix}") set ( exec_prefix "${prefix}")
set ( libdir "${exec_prefix}/libs/${ANDROID_ABI}") set ( libdir "${exec_prefix}/libs/${ANDROID_ABI}")
set ( dlls "${libdir}") set ( dlls "${libdir}")
set ( includedir "${prefix}/assets/include") set ( includedir "${prefix}/include")
set ( datarootdir "${prefix}/assets/share") set ( datarootdir "${prefix}/share")
set ( libpl "${datarootdir}/Yap") set ( libpl "${datarootdir}/Yap")
set ( datadir "${datarootdir}") set ( datadir "${datarootdir}")
set ( mandir "${datarootdir}/assets/man") set ( mandir "${datarootdir}/man")
set ( bindir "${exec_prefix}/bin") set ( bindir "${exec_prefix}/bin")
set ( docdir "${exec_prefix}/share/doc/Yap") set ( docdir "${exec_prefix}/share/doc/Yap")
else() else()

1
compile_commands.json Symbolic link
View File

@ -0,0 +1 @@
Debug/compile_commands.json