mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-23 05:19:56 +00:00
Include ARM files in ext/libpng17/CMakeLists.txt for ARM processors
Needed when building atlas/zimtool.It fixes this error: ``` /usr/bin/ld: png17/libpng17.a(pngrutil.c.o): in function `png_read_process_IDAT': pngrutil.c:(.text+0x548c): undefined reference to `png_init_filter_functions_neon' collect2: error: ld returned 1 exit status make[2]: *** [CMakeFiles/zimtool.dir/build.make:134: build/zimtool] Error 1 make[1]: *** [CMakeFiles/Makefile2:128: CMakeFiles/zimtool.dir/all] Error 2 make[1]: *** Waiting for unfinished jobs.... ```
This commit is contained in:
parent
adaa9fbbb4
commit
31bf179879
@ -1,6 +1,7 @@
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
cmake_minimum_required(VERSION 3.8)
|
||||
project(libpng17)
|
||||
|
||||
add_library(png17
|
||||
add_library(png17 STATIC
|
||||
pngconf.h
|
||||
pngdebug.h
|
||||
png.c
|
||||
@ -18,9 +19,24 @@ add_library(png17
|
||||
pngrutil.c
|
||||
pngset.c
|
||||
pngstruct.h
|
||||
pngtest.c
|
||||
pngtrans.c
|
||||
pngwio.c
|
||||
pngwrite.c
|
||||
pngwtran.c
|
||||
pngwutil.c)
|
||||
pngwutil.c
|
||||
)
|
||||
|
||||
# Add arm files for ARM processors
|
||||
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm(64)?|aarch64")
|
||||
set (ARM_FILES arm/arm_init.c
|
||||
)
|
||||
|
||||
# Check if it's 32 bit
|
||||
if("${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
|
||||
list(APPEND ARM_FILES arm/filter_neon.S)
|
||||
else()
|
||||
list(APPEND ARM_FILES arm/filter_neon_intrinsics.c)
|
||||
endif()
|
||||
|
||||
target_sources(png17 PRIVATE ${ARM_FILES})
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user