1.81: Updated Makefile
This commit is contained in:
parent
cebf34e718
commit
fd229a20de
2
Makefile
2
Makefile
|
@ -80,7 +80,7 @@ ifeq (clang++, $(findstring clang++,$(CXX)))
|
||||||
CPPCHK_GLIBCXX_DEBUG=
|
CPPCHK_GLIBCXX_DEBUG=
|
||||||
endif
|
endif
|
||||||
ifndef CXXFLAGS
|
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
|
endif
|
||||||
|
|
||||||
ifeq (g++, $(findstring g++,$(CXX)))
|
ifeq (g++, $(findstring g++,$(CXX)))
|
||||||
|
|
|
@ -17,12 +17,12 @@
|
||||||
# git log --format='%aN' 1.81..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
|
# git log --format='%aN' 1.81..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
|
||||||
#
|
#
|
||||||
# Update version numbers in:
|
# 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.81/" cli/main.cpp
|
||||||
# sed -i "s/1.[0-9][0-9].99/1.80/" cmake/versions.cmake
|
# sed -i "s/1.[0-9][0-9].99/1.81/" cmake/versions.cmake
|
||||||
# sed -i "s/MINOR [0-9][0-9]/MINOR 80/" lib/version.h
|
# sed -i "s/MINOR [0-9][0-9]/MINOR 81/" 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.81/" 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] dev/1.81/" 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/" win_installer/productInfo.wxi
|
||||||
# Verify:
|
# Verify:
|
||||||
# grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
|
# grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
|
||||||
# git commit -a -m "1.43: Set versions"
|
# git commit -a -m "1.43: Set versions"
|
||||||
|
|
Loading…
Reference in New Issue