Skip to content

Commit cec7fa0

Browse files
committed
0.20211225: correct uname params
1 parent 518bd86 commit cec7fa0

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
APPNAME ?= jpegqs
22
MPFLAGS ?= -fopenmp
33
CFLAGS ?= -Wall -O2 $(MPFLAGS) -DAPPNAME=$(APPNAME)
4-
LIBS ?= -ljpeg -lm
4+
LDFLAGS ?= -ljpeg -lm
55
SRCS = src
66

7-
ifneq ($(shell uname --machine), i386)
7+
ifneq ($(shell uname -m), i386)
88
CFLAGS += -fPIC
99
endif
1010

@@ -16,16 +16,16 @@ PLIBS = lib$(APPNAME).a lib$(APPNAME).so.0
1616
all: $(PLIBS) $(PROGS)
1717

1818
clean:
19-
rm -rf $(PLIBS) $(PROGS) $(SRCS)/*.o
19+
rm -rf $(PLIBS) $(PROGS) $(SRCS)/*.o
2020

2121
lib$(APPNAME).a: $(SRCS)/idct.o $(SRCS)/libjpegqs.o
2222
$(AR) rcs $@ $^
2323

2424
lib$(APPNAME).so.0: $(SRCS)/idct.o $(SRCS)/libjpegqs.o
25-
$(CC) $(CFLAGS) -shared $^ -o $@ $(LIBS) -s
25+
$(CC) $(CFLAGS) -shared $^ -o $@ $(LDFLAGS) -s
2626

2727
$(APPNAME): $(SRCS)/jpegqs.o lib$(APPNAME).so.0
28-
$(CC) $(CFLAGS) $^ -o $@ $(LIBS) -s
28+
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -s
2929

3030
$(APPNAME)-static: $(SRCS)/jpegqs.c lib$(APPNAME).a
31-
$(CC) $(CFLAGS) $^ -o $@ $(LIBS) -s
31+
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -s

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ If you do not want to use OPENMP (MacOS), type:
7373
```sh
7474
make MPFLAGS=
7575
```
76+
Or when using libomp (MacOS):
77+
```sh
78+
make MPFLAGS="-Xpreprocessor -fopenmp -lomp"
79+
```
7680

7781
### With libjpeg 6b form sources
7882
```sh

0 commit comments

Comments
 (0)