diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/packaging/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/depends/target/Toolchain_binaddons.cmake.in | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 89d81a5c6f..992c9f36e1 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -135,9 +135,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so find $(PREFIX)/lib/@APP_NAME_LC@/system -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; cd xbmc/obj/local/$(CPU)/; find . -name "*.so" -not -name "lib*.so" | sed "s/\.\///" | xargs -I@ mv @ lib@ cp -fp xbmc/obj/local/$(CPU)/*.so xbmc/lib/$(CPU)/ -ifeq (@CMAKE_BUILD_TYPE@,Release) $(STRIP) --strip-unneeded xbmc/lib/$(CPU)/*.so -endif install -p $(GDBPATH) ./xbmc/libs/$(CPU)/gdbserver echo "set solib-search-path ./obj/local/$(CPU)" > ./xbmc/libs/$(CPU)/gdb.setup echo "directory $(TOOLCHAIN)/sysroot/usr/include $(NDKROOT)/sources/android/native_app_glue" \ diff --git a/tools/depends/target/Toolchain_binaddons.cmake.in b/tools/depends/target/Toolchain_binaddons.cmake.in index 98494b49fe..a5101803f8 100644 --- a/tools/depends/target/Toolchain_binaddons.cmake.in +++ b/tools/depends/target/Toolchain_binaddons.cmake.in @@ -16,6 +16,7 @@ elseif("${OS}" STREQUAL "osx") set(CORE_SYSTEM_NAME osx) elseif("${OS}" STREQUAL "ios") set(CORE_SYSTEM_NAME ios) + set(CMAKE_SYSTEM_NAME Darwin) elseif("${PLATFORM}" STREQUAL "raspberry-pi") set(CORE_SYSTEM_NAME rbpi) list(APPEND CMAKE_FIND_ROOT_PATH @use_firmware@/opt/vc) |