From fd229a20deb1c55b9160b39f44a0aa4eb88d2807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 7 Oct 2017 12:56:29 +0200 Subject: [PATCH] 1.81: Updated Makefile --- Makefile | 2 +- createrelease | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 89a77f5be..4db2e3b1f 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ ifeq (clang++, $(findstring clang++,$(CXX))) CPPCHK_GLIBCXX_DEBUG= endif ifndef CXXFLAGS - CXXFLAGS=-include lib/cxx11emu.h -pedantic -Wall -Wextra -Wabi -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wshadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar $(CPPCHK_GLIBCXX_DEBUG) -g + CXXFLAGS=-std=c++0x -O2 -include lib/cxx11emu.h -DNDEBUG -Wall -Wno-sign-compare endif ifeq (g++, $(findstring g++,$(CXX))) diff --git a/createrelease b/createrelease index 6c7034fc4..65d4e497d 100755 --- a/createrelease +++ b/createrelease @@ -17,12 +17,12 @@ # git log --format='%aN' 1.81..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less # # Update version numbers in: -# sed -i "s/1.[0-9][0-9].99/1.80/" cli/main.cpp -# sed -i "s/1.[0-9][0-9].99/1.80/" cmake/versions.cmake -# sed -i "s/MINOR [0-9][0-9]/MINOR 80/" lib/version.h -# sed -i "s/1.[0-9][0-9] dev/1.80/" man/manual.docbook -# sed -i "s/1.[0-9][0-9] dev/1.80/" win_installer/productInfo.wxi -# sed -i "s/1.[0-9][0-9].99/1.80/" win_installer/productInfo.wxi +# sed -i "s/1.[0-9][0-9].99/1.81/" cli/main.cpp +# sed -i "s/1.[0-9][0-9].99/1.81/" cmake/versions.cmake +# sed -i "s/MINOR [0-9][0-9]/MINOR 81/" lib/version.h +# sed -i "s/1.[0-9][0-9] dev/1.81/" man/manual.docbook +# sed -i "s/1.[0-9][0-9] dev/1.81/" win_installer/productInfo.wxi +# sed -i "s/1.[0-9][0-9].99/1.81/" win_installer/productInfo.wxi # Verify: # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]* # git commit -a -m "1.43: Set versions"