Skip to content

Commit

Permalink
Merge pull request #1 from CleverRaven/master
Browse files Browse the repository at this point in the history
Fork update
  • Loading branch information
mqrause authored Oct 12, 2019
2 parents a495d62 + 5483ad5 commit 50bc2fb
Show file tree
Hide file tree
Showing 652 changed files with 172,428 additions and 77,333 deletions.
3 changes: 3 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ misc-*,\
modernize-*,\
performance-*,\
readability-*,\
-cata-text-style,\
-bugprone-misplaced-widening-cast,\
-bugprone-narrowing-conversions,\
-bugprone-unused-return-value,\
Expand Down Expand Up @@ -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
6 changes: 6 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
branches:
- master
types: [opened, edited, synchronize]
jobs:
validate:
name: Validate PR
Expand All @@ -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'
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Main project build script
cmake_minimum_required(VERSION 3.0.0)
cmake_minimum_required(VERSION 3.1.4)

PROJECT(CataclysmDDA)

Expand Down Expand Up @@ -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
Expand Down
46 changes: 23 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 50bc2fb

Please sign in to comment.