turbojpegl.c=turbojpeg.c

This commit is contained in:
DRC
2011-05-26 10:45:06 +00:00
parent 67810edcf7
commit 395bf7e218
3 changed files with 3 additions and 3 deletions

View File

@@ -170,7 +170,7 @@ if(WITH_SIMD)
add_dependencies(jpeg-static simd) add_dependencies(jpeg-static simd)
endif() endif()
set(TURBOJPEG_SOURCES turbojpegl.c transupp.c jdatadst-tj.c jdatasrc-tj.c) set(TURBOJPEG_SOURCES turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c)
if(WITH_JAVA) if(WITH_JAVA)
set(TURBOJPEG_SOURCES ${TURBOJPEG_SOURCES} turbojpeg-jni.c) set(TURBOJPEG_SOURCES ${TURBOJPEG_SOURCES} turbojpeg-jni.c)
include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
@@ -185,7 +185,7 @@ target_link_libraries(turbojpeg jpeg-static)
set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "") set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "")
add_library(turbojpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS} add_library(turbojpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS}
turbojpegl.c transupp.c jdatadst-tj.c jdatasrc-tj.c) turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c)
if(NOT MSVC) if(NOT MSVC)
set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
endif() endif()

View File

@@ -34,7 +34,7 @@ libjpeg_la_SOURCES += jdarith.c
endif endif
libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \ libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpeg.c turbojpeg.h \
transupp.c transupp.h jdatadst-tj.c jdatasrc-tj.c transupp.c transupp.h jdatadst-tj.c jdatasrc-tj.c
SUBDIRS = java SUBDIRS = java