xcode : changed to native architecture build by default

[openjpeg.git] / mj2 / Makefile.nix

diff --git a/mj2/Makefile.nix b/mj2/Makefile.nix
index 7c962fdd8a2fcfc122a9e59aff3bf020658ad322..4a76c59a80d9d05b96dcf9d82a03ab5992f063cd 100644 (file)
--- a/mj2/Makefile.nix
+++ b/mj2/Makefile.nix
@@ -1,4 +1,4 @@
-#jpwl Makefile
+#mj2 Makefile.nix
 include ../config.nix
 
 CFLAGS = -Wall
@@ -7,11 +7,6 @@ INSTALL_BIN = $(prefix)/bin
 USERLIBS = -lm
 INCLUDE = -I.. -I. -I../libopenjpeg
 
-ifeq ($(WITH_JPWL),yes)
-USERLIBS += ../jpwl/libopenjpeg_JPWL.a
-#CFLAGS += -DUSE_JPWL
-endif
-
 ifeq ($(WITH_LCMS2),yes)
 INCLUDE += $(LCMS2_INCLUDE)
 USERLIBS += $(LCMS2_LIB)
@@ -30,11 +25,11 @@ all: frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
        wrap_j2k_in_mj2 ../bin
 
 frames_to_mj2: frames_to_mj2.c ../libopenjpeg.a
-       $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c \
+       $(CC) $(CFLAGS) ../codec/compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c \
        -o frames_to_mj2 ../libopenjpeg.a $(USERLIBS)
 
 mj2_to_frames: mj2_to_frames.c ../libopenjpeg.a
-       $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c \
+       $(CC) $(CFLAGS) ../codec/compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c \
        -o mj2_to_frames ../libopenjpeg.a $(USERLIBS)
 
 extract_j2k_from_mj2: extract_j2k_from_mj2.c ../libopenjpeg.a