diff options
| author | fuzzard <fuzzard@kodi.tv> | 2023-03-10 19:33:13 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2023-03-11 06:06:45 +1000 |
| commit | 2af8b48ee6b40d5c16fc4683e9218b372259a372 (patch) | |
| tree | ca4e34055e2fa64a6f91c011baf31aefd67fb87f /tools/depends/target | |
| parent | cfd63599912b1d101c3f954e804a511456ad71ed (diff) | |
[tools/depends] add asflags as predefined flag option
Diffstat (limited to 'tools/depends/target')
| -rw-r--r-- | tools/depends/target/Toolchain.cmake.in | 1 | ||||
| -rw-r--r-- | tools/depends/target/config.site.in | 1 | ||||
| -rw-r--r-- | tools/depends/target/libass/Makefile | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in index edc914e423..76f479cf39 100644 --- a/tools/depends/target/Toolchain.cmake.in +++ b/tools/depends/target/Toolchain.cmake.in @@ -95,6 +95,7 @@ if(CORE_SYSTEM_NAME STREQUAL android) string(REPLACE ":" ";" SDK_BUILDTOOLS_PATH "@build_tools_path@") endif() +set(CMAKE_ASM_NASM_FLAGS "@platform_asflags@") set(CMAKE_C_FLAGS "@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include") set(CMAKE_CXX_FLAGS "@platform_cxxflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include") set(CMAKE_C_FLAGS_RELEASE "@platform_cflags_release@ @platform_includes@ -isystem @prefix@/@deps_dir@/include") diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in index 2034ac0151..8062539766 100644 --- a/tools/depends/target/config.site.in +++ b/tools/depends/target/config.site.in @@ -20,6 +20,7 @@ if test "@platform_os@" = "darwin_embedded" ; then export CCAS="--tag CC @prefix@/@tool_dir@/bin/gas-preprocessor.pl @CCACHE@ @CC@ -arch @use_cpu@" fi +ASFLAGS="@platform_asflags@" CFLAGS="@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include $CFLAGS" LDFLAGS="-L@prefix@/@deps_dir@/lib @platform_ldflags@ $LDFLAGS" CXXFLAGS="@platform_cxxflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include $CXXFLAGS" diff --git a/tools/depends/target/libass/Makefile b/tools/depends/target/libass/Makefile index 523d25602b..e8b7858947 100644 --- a/tools/depends/target/libass/Makefile +++ b/tools/depends/target/libass/Makefile @@ -5,10 +5,6 @@ ifeq ($(OS),android) # Android API Level 21/22 requires explicit link. # This doesnt appear to be required for API Level 23+ (Android 6+) export LDFLAGS+= -lstdc++ - - ifeq ($(CPU),i686) - export ASFLAGS+= -DPIC=1 - endif endif # configuration settings |