diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-02 15:35:47 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-02 15:35:47 +0000 |
| commit | 12dfaa2d74ffae0d08cd9b8d32f9a2f9fbfe394c (patch) | |
| tree | baf714a7b5d47e61ed9dc526eae98c67053e96d3 | |
| parent | d4e5366fe64828c16c695e763e71e1b09dc68314 (diff) | |
Sorry. Reverting mistake.
| -rw-r--r-- | applications/jpip/libopenjpip/comMakefile.mk | 4 | ||||
| -rw-r--r-- | applications/jpip/util/Makefile.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/applications/jpip/libopenjpip/comMakefile.mk b/applications/jpip/libopenjpip/comMakefile.mk index 53d59b83..1401b70f 100644 --- a/applications/jpip/libopenjpip/comMakefile.mk +++ b/applications/jpip/libopenjpip/comMakefile.mk @@ -1,9 +1,9 @@ ifdef jpipserver -CFLAGS = -g -Wall -DSERVER +CFLAGS = -O3 -Wall -m32 -DSERVER LIBNAME = libopenjpip_server.a else J2KINCDIR = ../../../libopenjpeg -CFLAGS = -g -Wall -I$(J2KINCDIR) +CFLAGS = -O3 -Wall -I$(J2KINCDIR) LIBNAME = libopenjpip_local.a endif diff --git a/applications/jpip/util/Makefile.nix b/applications/jpip/util/Makefile.nix index 39397a4c..532b743d 100644 --- a/applications/jpip/util/Makefile.nix +++ b/applications/jpip/util/Makefile.nix @@ -1,12 +1,12 @@ JPIPLIBDIR = ../libopenjpip 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 J2KINCDIR = ../../../libopenjpeg -J2KLIBDIR = $(J2KINCDIR)/../bin/bin -LIBFNAME = $(JPIPLIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.so +J2KLIBDIR = $(J2KINCDIR)/.libs +LIBFNAME = $(JPIPLIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.a CFLAGS = -O3 -Wall -I$(JPIPLIBDIR) LDFLAGS = -L$(JPIPLIBDIR) -L$(J2KLIBDIR) -lm -lopenjpip_local |