CC = $(shell wx-config-2.8 --cxx)\r
AR = ar\r
\r
-CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL\r
+CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT -DOPJ_INICONFIG -DUSE_JPSEC -DOPJ_MANYFORMATS $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL\r
\r
-OPJV_SRCS = source/imagj2k.cpp source/imagmj2.cpp source/wxj2kparser.cpp source/imagjp2.cpp source/OPJViewer.cpp source/wxjp2parser.cpp\r
+OPJV_SRCS = source/imagjpeg2000.cpp source/wxj2kparser.cpp source/OPJViewer.cpp source/wxjp2parser.cpp source/OPJDialogs.cpp source/OPJThreads.cpp source/OPJAbout.cpp ../codec/index.c\r
\r
MODULES = $(OPJV_SRCS:.cpp=.o)\r
\r
all: opjviewer lib\r
\r
.cpp.o:\r
- $(CC) $(CFLAGS) -c $< -o $@\r
+ $(CC) $(CFLAGS) -c $< -o $@\r
\r
lib:\r
- cd ../jpwl; make\r
+ cd ../jpwl; make\r
\r
opjviewer: $(OPJV_SRCS) lib\r
- $(CC) $(CFLAGS) -I .. $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)\r
+ $(CC) $(CFLAGS) -I .. -I ../codec -I ../libopenjpeg $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)\r
\r
\r
clean:\r
- rm -f OPJViewer *.o *.a\r
- cd ../libopenjpeg; rm -f *.o\r
+ rm -f OPJViewer *.o *.a\r
+ cd ../libopenjpeg; rm -f *.o\r
\r
\r
\r