Sorry. Reverting mistake.

This commit is contained in:
Mathieu Malaterre 2011-12-02 15:35:47 +00:00
parent d4e5366fe6
commit 12dfaa2d74
2 changed files with 5 additions and 5 deletions

View File

@ -1,9 +1,9 @@
ifdef jpipserver ifdef jpipserver
CFLAGS = -g -Wall -DSERVER CFLAGS = -O3 -Wall -m32 -DSERVER
LIBNAME = libopenjpip_server.a LIBNAME = libopenjpip_server.a
else else
J2KINCDIR = ../../../libopenjpeg J2KINCDIR = ../../../libopenjpeg
CFLAGS = -g -Wall -I$(J2KINCDIR) CFLAGS = -O3 -Wall -I$(J2KINCDIR)
LIBNAME = libopenjpip_local.a LIBNAME = libopenjpip_local.a
endif endif

View File

@ -1,12 +1,12 @@
JPIPLIBDIR = ../libopenjpip JPIPLIBDIR = ../libopenjpip
SLIBFNAME = $(JPIPLIBDIR)/libopenjpip_server.a SLIBFNAME = $(JPIPLIBDIR)/libopenjpip_server.a
SCFLAGS = -g -Wall -I$(JPIPLIBDIR) -DSERVER -DQUIT_SIGNAL=\"quitJPIP\" SCFLAGS = -O3 -Wall -m32 -I$(JPIPLIBDIR) -DSERVER -DQUIT_SIGNAL=\"quitJPIP\"
SLDFLAGS = -L$(JPIPLIBDIR) -lm -lfcgi -lopenjpip_server SLDFLAGS = -L$(JPIPLIBDIR) -lm -lfcgi -lopenjpip_server
J2KINCDIR = ../../../libopenjpeg J2KINCDIR = ../../../libopenjpeg
J2KLIBDIR = $(J2KINCDIR)/../bin/bin J2KLIBDIR = $(J2KINCDIR)/.libs
LIBFNAME = $(JPIPLIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.so LIBFNAME = $(JPIPLIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.a
CFLAGS = -O3 -Wall -I$(JPIPLIBDIR) CFLAGS = -O3 -Wall -I$(JPIPLIBDIR)
LDFLAGS = -L$(JPIPLIBDIR) -L$(J2KLIBDIR) -lm -lopenjpip_local LDFLAGS = -L$(JPIPLIBDIR) -L$(J2KLIBDIR) -lm -lopenjpip_local