Revert "Merge branch 'master' into npc_magic"

This reverts commit fc5c1fe, reversing
changes made to 51f5a66.

.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,12 +50,6 @@ 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.

Makefile

@@ -586,20 +586,15 @@ else
   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),)
-      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
+    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
 
   # Link to ncurses if we're using a non-tiles, Linux build
@@ -616,8 +611,8 @@ else
       endif
 
       ifdef OSXCROSS
-        LDFLAGS += -L$(LIBSDIR)/$(NCURSES_PREFIX)/lib
-        CXXFLAGS += -I$(LIBSDIR)/$(NCURSES_PREFIX)/include
+        LDFLAGS += -L$(LIBSDIR)/ncurses/lib
+        CXXFLAGS += -I$(LIBSDIR)/ncurses/include
       endif # OSXCROSS
     endif # HAVE_NCURSES5CONFIG
   endif # HAVE_PKGCONFIG