diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-12-08 11:06:41 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-12-08 11:06:41 +0000 |
| commit | d08a96e2517c545b8ff2d7b89c7778eb5b1fd4ba (patch) | |
| tree | 16f839d4499afc2ead2b759b22907a50bd012de3 /codec/Makefile.nix | |
| parent | 59d9b97ffe35f17c71b25a749b885054cb4727d9 (diff) | |
(thanks to Winfried for his help)
* [antonin] changed remaining "WIN32" to "_WIN32"
! [antonin] libopenjpeg has no more dependency on LCMS lib. Everything concerning color (icc profile, conversion to rgb, etc) has been put outside libopenjpeg and is used in j2k_to_image.c and mj2_to_frames.c.
- [antonin] removed "opj_convert{.c,.h}"
+ [antonin] added a directory "common/" that contains "getopt{.c,.h}" (previously in "codec/compat").
+ [antonin] added files "color{.c,.h}" in "common/" that define the code for icc profile management and sycc_to_rgb conversion
+ [antonin] added "common/format_defs.h" that contains common definitions used in image_to_j2k, j2k_to_image, j2k_dump.
Diffstat (limited to 'codec/Makefile.nix')
| -rw-r--r-- | codec/Makefile.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/codec/Makefile.nix b/codec/Makefile.nix index 129b2a4b..ace579a3 100644 --- a/codec/Makefile.nix +++ b/codec/Makefile.nix @@ -5,7 +5,7 @@ CFLAGS = -Wall INSTALL_BIN = $(prefix)/bin -INCLUDE = -I.. -I. -I../libopenjpeg +INCLUDE = -I.. -I. -I../libopenjpeg -I../common USERLIBS = -lm ifeq ($(WITH_TIFF),yes) @@ -35,15 +35,16 @@ all: j2k_to_image image_to_j2k j2k_dump install j2k_to_image image_to_j2k j2k_dump ../bin j2k_to_image: j2k_to_image.c ../libopenjpeg.a - $(CC) $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c \ + $(CC) $(CFLAGS) ../common/getopt.c index.c convert.c \ + ../common/color.c j2k_to_image.c \ -o j2k_to_image ../libopenjpeg.a $(USERLIBS) image_to_j2k: image_to_j2k.c ../libopenjpeg.a - $(CC) $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c \ + $(CC) $(CFLAGS) ../common/getopt.c index.c convert.c image_to_j2k.c \ -o image_to_j2k ../libopenjpeg.a $(USERLIBS) j2k_dump: j2k_dump.c ../libopenjpeg.a - $(CC) $(CFLAGS) compat/getopt.c index.c j2k_dump.c \ + $(CC) $(CFLAGS) ../common/getopt.c index.c j2k_dump.c \ -o j2k_dump ../libopenjpeg.a $(USERLIBS) clean: |