From aba0e602edd8947d149a3e69355719b1e63deae2 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Thu, 1 Sep 2011 11:24:08 +0000 Subject: renamed getopt.{c/h} to opj_getopt.{c/h} and forced the use of these files rather than the system ones. This fixed issue 78. Credit to Winfried. --- applications/JavaOpenJPEG/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'applications/JavaOpenJPEG/Makefile') diff --git a/applications/JavaOpenJPEG/Makefile b/applications/JavaOpenJPEG/Makefile index 9ac3e407..74d94056 100644 --- a/applications/JavaOpenJPEG/Makefile +++ b/applications/JavaOpenJPEG/Makefile @@ -5,10 +5,10 @@ CFLAGS = -O3 -lstdc++ # -g -p -pg all: j2k_to_image image_to_j2k j2k_to_image: j2k_to_image.c ../libopenjpeg.a - gcc $(CFLAGS) ../common/getopt.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + gcc $(CFLAGS) ../common/opj_getopt.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff image_to_j2k: image_to_j2k.c ../libopenjpeg.a - gcc $(CFLAGS) ../common/getopt.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + gcc $(CFLAGS) ../common/opj_getopt.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff clean: rm -f j2k_to_image image_to_j2k -- cgit v1.2.3