walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

This commit is contained in:
Winfried 2010-10-13 14:49:39 +00:00
parent 106da2f51e
commit 03133377fa
5 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.nix
View File

@ -33,10 +33,6 @@ INSTALL_INCLUDE = $(prefix)/include/$(headerdir)
# Converts cr/lf to just lf # Converts cr/lf to just lf
DOS2UNIX = dos2unix DOS2UNIX = dos2unix
ifeq ($(WITH_JPWL),yes)
COMPILERFLAGS += -DUSE_JPWL
endif
ifeq ($(WITH_LCMS1),yes) ifeq ($(WITH_LCMS1),yes)
INCLUDE += $(LCMS1_INCLUDE) INCLUDE += $(LCMS1_INCLUDE)
LIBRARIES += $(LCMS1_LIB) LIBRARIES += $(LCMS1_LIB)

5
codec/Makefile.am
View File

@ -2,11 +2,6 @@ COMPILERFLAGS = -Wall
USERLIBS = -lm USERLIBS = -lm
INCLUDES = -I.. -I. -I../libopenjpeg INCLUDES = -I.. -I. -I../libopenjpeg
if with_libjpwl
USERLIBS += -L../jpwl -lopenjpeg_JPWL
COMPILERFLAGS += -DUSE_JPWL
endif
if with_libtiff if with_libtiff
INCLUDES += @tiffincludes@ INCLUDES += @tiffincludes@
USERLIBS += @tifflibs@ USERLIBS += @tifflibs@

5
codec/Makefile.nix
View File

@ -13,11 +13,6 @@ INCLUDE += $(TIFF_INCLUDE)
USERLIBS += $(TIFF_LIB) USERLIBS += $(TIFF_LIB)
endif endif
ifeq ($(WITH_JPWL),yes)
USERLIBS += ../jpwl/libopenjpeg_JPWL.a
CFLAGS += -DUSE_JPWL
endif
ifeq ($(WITH_PNG),yes) ifeq ($(WITH_PNG),yes)
INCLUDE += $(PNG_INCLUDE) INCLUDE += $(PNG_INCLUDE)
USERLIBS += $(PNG_LIB) USERLIBS += $(PNG_LIB)

10
configure.ac
View File

@ -127,6 +127,10 @@ if test "x$with_libpng" = xyes ; then
else else
if test -n "$LIBPNG_CONFIG" ; then if test -n "$LIBPNG_CONFIG" ; then
pnglibs="`$LIBPNG_CONFIG --ldflags` -lz $LIB_MATH" pnglibs="`$LIBPNG_CONFIG --ldflags` -lz $LIB_MATH"
else
if test -n "$PKGCONFIG" ; then
pnglibs="`$PKGCONFIG --libs libpng` $LIB_MATH"
fi
fi fi
fi fi
if test -n "$pnglibs" ; then if test -n "$pnglibs" ; then
@ -190,7 +194,7 @@ if test "x$with_libtiff" = xyes ; then
LIBS="$tifflibs" LIBS="$tifflibs"
with_libtiff="no" with_libtiff="no"
# #
AC_CHECK_FUNC(TIFFOpen, true, tifflibs="") AC_CHECK_LIB(tiff, TIFFOpen, , tifflibs="",)
# #
if test -n "$tifflibs" ; then if test -n "$tifflibs" ; then
if test "$tiff_header_found" = "yes" ; then if test "$tiff_header_found" = "yes" ; then
@ -267,7 +271,7 @@ if test "x$with_liblcms2" = xyes ; then
LIBS="$lcms2libs" LIBS="$lcms2libs"
with_liblcms2="no" with_liblcms2="no"
# #
AC_CHECK_FUNC(cmsOpenProfileFromFile, true, lcms2libs="") AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile, ,lcms2libs="",)
# #
if test -n "$lcms2libs" ; then if test -n "$lcms2libs" ; then
if test "$lcms2_header_found" = "yes" ; then if test "$lcms2_header_found" = "yes" ; then
@ -342,7 +346,7 @@ if [[ -z "$lcms2libs" ]] ; then
LIBS="$lcms1libs" LIBS="$lcms1libs"
with_liblcms1="no" with_liblcms1="no"
# #
AC_CHECK_FUNC(cmsOpenProfileFromFile, true, lcms1libs="") AC_CHECK_LIB(lcms, cmsOpenProfileFromFile, ,lcms1libs="",)
# #
if test -n "$lcms1libs" ; then if test -n "$lcms1libs" ; then
if test "$lcms1_header_found" = "yes" ; then if test "$lcms1_header_found" = "yes" ; then

9
libopenjpeg/Makefile.am
View File

@ -12,11 +12,6 @@ libopenjpeg_la_LDFLAGS = -no-undefined \
libopenjpeg_la_LIBADD = @LDLIBS@ libopenjpeg_la_LIBADD = @LDLIBS@
#Cygwin needs this:
if with_libjpwl
libopenjpeg_la_LIBADD += ../jpwl/libopenjpeg_JPWL.la
endif
SRCS = bio.c cio.c dwt.c event.c image.c j2k.c j2k_lib.c jp2.c jpt.c \ SRCS = bio.c cio.c dwt.c event.c image.c j2k.c j2k_lib.c jp2.c jpt.c \
mct.c mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c opj_convert.c mct.c mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c opj_convert.c
@ -37,10 +32,6 @@ dos2unix:
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
if with_libjpwl
COMPILERFLAGS += -DUSE_JPWL
endif
if with_liblcms1 if with_liblcms1
INCLUDES += @lcms1includes@ INCLUDES += @lcms1includes@
endif endif