diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:18:54 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:18:54 +0000 |
commit | 1610a1f6aa54ad1d97926c1d8605720933059df7 (patch) | |
tree | 798e7e0a8fc53429b26d536ecb6ec1a176923ded /editor | |
parent | 99eb1b4c7590cc6a8328245e6ec1427ca4d16555 (diff) | |
download | netpbm-mirror-1610a1f6aa54ad1d97926c1d8605720933059df7.tar.gz netpbm-mirror-1610a1f6aa54ad1d97926c1d8605720933059df7.tar.xz netpbm-mirror-1610a1f6aa54ad1d97926c1d8605720933059df7.zip |
Update Advanced series to Release 10.67
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2221 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'editor')
-rw-r--r-- | editor/pamflip/Makefile | 14 | ||||
-rw-r--r-- | editor/pamflip/pamflip.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/editor/pamflip/Makefile b/editor/pamflip/Makefile index 83e961a7..ce3345f1 100644 --- a/editor/pamflip/Makefile +++ b/editor/pamflip/Makefile @@ -13,13 +13,15 @@ SUBDIRS = MERGEBINARIES = pamflip -BINARIES = pamflip +PORTBINARIES = pamflip + +BINARIES = $(PORTBINARIES) SCRIPTS = -PAMFLIP_OBJECTS = pamflip.o pamflip_sse.o +ADDL_OBJECTS = pamflip_sse.o -OBJECTS = $(PAMFLIP_OBJECTS) +OBJECTS = pamflip.o $(ADDL_OBJECTS) MERGE_OBJECTS = $(OBJECTS:%.o=%.o2) @@ -29,8 +31,6 @@ include $(SRCDIR)/common.mk all: $(BINARIES) $(SUBDIRS:%=%/all) pamflip_sse.o pamflip_sse.o2: CFLAGS_TARGET = $(CFLAGS_SSE) +pamflip.o pamflip.o2: CFLAGS_TARGET = $(CFLAGS_SSE) -pamflip: $(PAMFLIP_OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ $(PAMFLIP_OBJECTS) \ - $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) +pamflip:%:%.o $(ADDL_OBJECTS) diff --git a/editor/pamflip/pamflip.c b/editor/pamflip/pamflip.c index b1d114c9..ade05601 100644 --- a/editor/pamflip/pamflip.c +++ b/editor/pamflip/pamflip.c @@ -78,7 +78,7 @@ enum xformType {LEFTRIGHT, TOPBOTTOM, TRANSPOSE}; #ifndef SIMD_PBM_TRANSPOSITION - #if HAVE_GCC_SSE2 && WANT_SSE && defined(__SSE2__) + #if WANT_SSE && defined(__SSE2__) #define SIMD_PBM_TRANSPOSITION 1 #else #define SIMD_PBM_TRANSPOSITION 0 |