Navigation Menu

Skip to content

Commit

Permalink
Fixed bug 4623 - better CMakeLists for JPEG
Browse files Browse the repository at this point in the history
  • Loading branch information
1bsyl committed Aug 20, 2019
1 parent 065fe39 commit e4c8787
Showing 1 changed file with 17 additions and 26 deletions.
43 changes: 17 additions & 26 deletions external/jpeg-9b/CMakeLists.txt
@@ -1,33 +1,24 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.3.2)
project(jpeg C)

add_library(jpeg SHARED)
target_sources(jpeg PRIVATE
jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c
jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c
jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c
jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c
jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c
jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c
jfdctfst.c jfdctint.c jidctflt.c jquant1.c
jquant2.c jutils.c jmemmgr.c
jmem-android.c)

if (ANDROID)

add_library(jpeg SHARED)
target_sources(jpeg PRIVATE
jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c
jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c
jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c
jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c
jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c
jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c
jfdctfst.c jfdctint.c jidctflt.c jquant1.c
jquant2.c jutils.c jmemmgr.c
jmem-android.c)
target_sources(jpeg PRIVATE jidctint.c jidctfst.c)

# FIXME : include asm for ARM
# target_sources(jpeg PRIVATE jidctint.c jidctfst.S)

target_sources(jpeg PRIVATE jidctint.c jidctfst.c)

# FIXME : include asm for ARM
# target_sources(jpeg PRIVATE jidctint.c jidctfst.S)

add_definitions(-DAVOID_TABLES -O3 -fstrict-aliasing -fprefetch-loop-arrays)

target_include_directories(jpeg PUBLIC .)
target_link_libraries(jpeg PRIVATE)

else()

endif()
target_compile_definitions(jpeg PRIVATE -DAVOID_TABLES)

target_include_directories(jpeg PUBLIC .)

0 comments on commit e4c8787

Please sign in to comment.