Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/Cipher_code

[Cipher_code.git] / CipherImg / Makefile

diff --git a/CipherImg/Makefile b/CipherImg/Makefile
index a70f48efce8cf1d8a7143ad101428216fe494957..05459366ca3cec25ba2825da2282247149c299ae 100644 (file)
--- a/CipherImg/Makefile
+++ b/CipherImg/Makefile
@@ -3,12 +3,10 @@ C=gcc
 
 uname_m := $(shell uname -m)
 ifeq ($(uname_m),armv7l)
-       CFLAGS=-O3  -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -lrt `pk
-g-config --cflags --libs glib-2.0`
+       CFLAGS=-O3  -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -lrt `pkg-config --cflags --libs glib-2.0`
 else
        ifeq ($(uname_m),armv6l)
-               CFLAGS=-O3   -march=armv6 -mfpu=vfp -mfloat-abi=hard -lrt `pkg-config --cflags -
--libs glib-2.0`
+               CFLAGS=-O3   -march=armv6 -mfpu=vfp -mfloat-abi=hard -lrt `pkg-config --cflags --libs glib-2.0`
        else
                CFLAGS=-O3 `pkg-config --cflags --libs glib-2.0`
        endif
@@ -19,6 +17,8 @@ endif
 %.o: %.c 
        $(C) -c -o $@ $< $(CFLAGS)
 
+%.o: %.cpp
+       $(CXX) -c -o $@ $< $(CFLAGS)
 
 test_sub_perm: test_sub_perm.o
        $(CXX)  -o $@ $^ $(CFLAGS)