Merge pull request #4 from CleverRaven/master

Catchup to current mainline

.clang-tidy

@@ -18,6 +18,7 @@ misc-*,\
 modernize-*,\
 performance-*,\
 readability-*,\
+-cata-text-style,\
 -bugprone-misplaced-widening-cast,\
 -bugprone-narrowing-conversions,\
 -bugprone-unused-return-value,\
@@ -61,5 +62,7 @@ FormatStyle:     none
 CheckOptions:
   - key: readability-uppercase-literal-suffix.NewSuffixes
     value: 'L;UL;LL;ULL'
+  - key: cata-text-style.EscapeUnicode
+    value: 0
 
 # vim:tw=0

.github/pull_request_template.md

@@ -32,9 +32,9 @@ See the [Changelog Guidelines](https://github.com/CleverRaven/Cataclysm-DDA/blob
 #### Purpose of change
 <!--
 If there's an existing issue describing the problem this PR addresses or the feature it adds, please link it like: ```#1234```
-If it *fully* resolves an issue, link it like: ```Fixes #1234```
+If it *fully* resolves an issue, link it like: Fixes #1234
 Even if the issue describes the problem, please provide a few-sentence summary here.
-Example: ```Fixes #1234 - XL mutants cannot wear arm/leg splints due to missing OVERSIZE flag.```
+Example: Fixes #1234 - XL mutants cannot wear arm/leg splints due to missing OVERSIZE flag.
 If there is no related issue, please describe the issue you are addressing, including how to trigger a bug if this is a bugfix.
 Don't put the backticks around the `#` and issue or pull request number to allow the GitHub automatically reference to it.
 -->
@@ -50,6 +50,12 @@ The easier you make your solution to understand, the faster it can get merged.
 A clear and concise description of any alternative solutions or features you've considered.
 -->
 
+#### Testing
+<!--
+Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.
+Also include testing suggestions for reviewers and maintainers.
+-->
+
 #### Additional context
 <!--
 Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here.

.github/workflows/pr-validator.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
     - master
+    types: [opened, edited, synchronize]
 jobs:
   validate:
     name: Validate PR
@@ -12,3 +13,4 @@ jobs:
         uses: CleverRaven/pr-validator@master
         with:
           description-regex: '(\n|^)\s*`{0,3}SUMMARY: +(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*(\n|$)'
+          description-regex-flags: 'i'

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Main project build script
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.1.4)
 
 PROJECT(CataclysmDDA)
 
@@ -225,10 +225,12 @@ ELSE()
 		-Wpedantic")
 	# Compact the whitespace in the warning string
 	string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} -std=c++14")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")
 	SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
 ENDIF()
 
+SET(CMAKE_CXX_STANDARD 14)
+
 # Force out-of-source build
 IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	MESSAGE(FATAL_ERROR

Makefile

@@ -581,43 +581,43 @@ ifdef TILES
     ODIR = $(ODIRTILES)
   endif
 else
+  ifeq ($(LOCALIZE),1)
+    NCURSES_PREFIX = ncursesw
+  else
+    NCURSES_PREFIX = ncurses
+  endif
+  ifdef OSXCROSS
+    NCURSES_PREFIX = ncurses
+  endif
   # ONLY when not cross-compiling, check for pkg-config or ncurses5-config
   # When doing a cross-compile, we can't rely on the host machine's -configs
   ifeq ($(CROSS),)
-    ifneq ($(shell pkg-config --libs ncurses 2>/dev/null),)
-      HAVE_PKGCONFIG = 1
-    endif
-    ifneq ($(shell which ncurses5-config 2>/dev/null),)
-      HAVE_NCURSES5CONFIG = 1
-    endif
+      ifeq ($(OSXCROSS),)
+        ifneq ($(shell pkg-config --libs $(NCURSES_PREFIX) 2>/dev/null),)
+          HAVE_PKGCONFIG = 1
+        endif
+        ifneq ($(shell which $(NCURSES_PREFIX)5-config 2>/dev/null),)
+          HAVE_NCURSES5CONFIG = 1
+        endif
+      endif
   endif
 
   # Link to ncurses if we're using a non-tiles, Linux build
   ifeq ($(HAVE_PKGCONFIG),1)
-    ifeq ($(LOCALIZE),1)
-      CXXFLAGS += $(shell pkg-config --cflags ncursesw)
-      LDFLAGS += $(shell pkg-config --libs ncursesw)
-    else
-      CXXFLAGS += $(shell pkg-config --cflags ncurses)
-      LDFLAGS += $(shell pkg-config --libs ncurses)
-    endif
+    CXXFLAGS += $(shell pkg-config --cflags $(NCURSES_PREFIX))
+    LDFLAGS += $(shell pkg-config --libs $(NCURSES_PREFIX))
   else
     ifeq ($(HAVE_NCURSES5CONFIG),1)
-      ifeq ($(LOCALIZE),1)
-        CXXFLAGS += $(shell ncursesw5-config --cflags)
-        LDFLAGS += $(shell ncursesw5-config --libs)
-      else
-        CXXFLAGS += $(shell ncurses5-config --cflags)
-        LDFLAGS += $(shell ncurses5-config --libs)
-      endif
+      CXXFLAGS += $(shell $(NCURSES_PREFIX)5-config --cflags)
+      LDFLAGS += $(shell $(NCURSES_PREFIX)5-config --libs)
     else
       ifneq ($(TARGETSYSTEM),WINDOWS)
-        LDFLAGS += -lncurses
+        LDFLAGS += -l$(NCURSES_PREFIX)
       endif
 
       ifdef OSXCROSS
-        LDFLAGS += -L$(LIBSDIR)/ncurses/lib
-        CXXFLAGS += -I$(LIBSDIR)/ncurses/include
+        LDFLAGS += -L$(LIBSDIR)/$(NCURSES_PREFIX)/lib
+        CXXFLAGS += -I$(LIBSDIR)/$(NCURSES_PREFIX)/include
       endif # OSXCROSS
     endif # HAVE_NCURSES5CONFIG
   endif # HAVE_PKGCONFIG