diff options
| author | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-04-29 13:32:27 +0200 |
|---|---|---|
| committer | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-04-29 13:32:27 +0200 |
| commit | 604c54a740abc572827a175a7de84aaf7df2e1e6 (patch) | |
| tree | 4dccbc17f6e6b4735da5879c48ff8a2de391090f | |
| parent | bf0153c83a7533fdb38aebe77abc45e6849b8af7 (diff) | |
| parent | 1a553af26f26160b44f211cb679cac9acca69024 (diff) | |
Merge branch 'cam'
| -rw-r--r-- | cam/Dockerfile | 4 | ||||
| -rw-r--r-- | cam/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cam/Dockerfile b/cam/Dockerfile index 80ab6c6..66785fa 100644 --- a/cam/Dockerfile +++ b/cam/Dockerfile @@ -7,8 +7,8 @@ FROM debian:testing AS build RUN apt-get update && \ apt-get upgrade -V --yes && \ apt-get install -V \ - gcc \ - g++ \ + gcc-10 \ + g++-10 \ make \ git \ pkg-config \ diff --git a/cam/Makefile b/cam/Makefile index 12b2859..1ba91a5 100644 --- a/cam/Makefile +++ b/cam/Makefile @@ -6,7 +6,7 @@ CFLAGS = $(CFLAGS_W) $(CFLAGS_O) all: cam cam: cam.c - gcc $(CFLAGS) \ + gcc-10 $(CFLAGS) \ `pkg-config --cflags libalx-base libalx-cv` \ $< -o $@ \ `pkg-config --libs libalx-cv libalx-base` |