From 5fff7191ba4d830a441213d56c181457d033e569 Mon Sep 17 00:00:00 2001 From: Bensong Liu <bensl@microsoft.com> Date: Mon, 12 Oct 2020 10:52:09 +0800 Subject: [PATCH] update rlib version --- README.md | 2 +- src/Makefile | 11 +++++------ src/lib/rlib | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 185c242..5d32bf3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ I encrypt the `keyring-name : password` pair with GnuPG and save it as `secret-f First, build the project from source. ``` -git clone https://github.com/recolic/gnome-keyring-yubikey-unlock +git clone https://github.com/recolic/gnome-keyring-yubikey-unlock --recursive cd gnome-keyring-yubikey-unlock/src && make && cd .. ``` diff --git a/src/Makefile b/src/Makefile index a0b203b..a651889 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,11 +1,10 @@ CXX ?= g++ -CXXFLAGS := $(shell pkg-config --cflags --libs gnome-keyring-1) -I ./lib -I . +# Accepts CXXSTD >= C++14 +CXXFLAGS := $(shell pkg-config --cflags --libs gnome-keyring-1) -I ./lib -I . -std=c++14 EXTRA_FLAGS ?= -secret: rlib - $(CXX) $(CXXFLAGS) $(EXTRA_FLAGS) unlock_keyrings.cc ./lib/rlib/libr.a -o ../bin/unlock_keyrings - -rlib: - cd ./lib/rlib && make +secret: + mkdir -p ../bin/ + $(CXX) $(CXXFLAGS) $(EXTRA_FLAGS) unlock_keyrings.cc -o ../bin/unlock_keyrings diff --git a/src/lib/rlib b/src/lib/rlib index 12a6021..097d76f 160000 --- a/src/lib/rlib +++ b/src/lib/rlib @@ -1 +1 @@ -Subproject commit 12a6021287bf8f9a6adcf83f944a273d57a2f9d3 +Subproject commit 097d76f0ac43324a641857ae607c74f236363da5 -- GitLab