summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2015-03-23 02:37:15 +0100
committer/dev/humancontroller <devhc@example.com>2017-02-06 18:01:47 +0100
commit2740505c7d428d2114a931ba72bd172489884c01 (patch)
tree224c175bc47d08d326cc29670db390a72b7b1ac7
parentc44da35a1eb42a23223b7f950c33d2a603ce60d6 (diff)
MODERN(TM)ize the Makefile a bit
-rw-r--r--GNUmakefile19
-rw-r--r--src/master/Makefile1
2 files changed, 3 insertions, 17 deletions
diff --git a/GNUmakefile b/GNUmakefile
index f432cc88..e0460c0f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -276,20 +276,13 @@ ifneq ($(BUILD_CLIENT),0)
CURL_LIBS ?= $(shell pkg-config --silence-errors --libs libcurl)
OPENAL_CFLAGS ?= $(shell pkg-config --silence-errors --cflags openal)
OPENAL_LIBS ?= $(shell pkg-config --silence-errors --libs openal)
- SDL_CFLAGS ?= $(shell pkg-config --silence-errors --cflags sdl2|sed 's/-Dmain=SDL_main//')
+ SDL_CFLAGS ?= $(shell pkg-config --silence-errors --cflags sdl2)
SDL_LIBS ?= $(shell pkg-config --silence-errors --libs sdl2)
else
# assume they're in the system default paths (no -I or -L needed)
CURL_LIBS ?= -lcurl
OPENAL_LIBS ?= -lopenal
endif
- # Use sdl2-config if all else fails
- ifeq ($(SDL_CFLAGS),)
- ifneq ($(call bin_path, sdl2-config),)
- SDL_CFLAGS ?= $(shell sdl2-config --cflags)
- SDL_LIBS ?= $(shell sdl2-config --libs)
- endif
- endif
endif
# Add git version info
@@ -615,9 +608,7 @@ else # ifdef MINGW
ifeq ($(PLATFORM),freebsd)
# flags
- BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
- -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
- -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
+ BASE_CFLAGS = -Wall -fno-strict-aliasing -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
HAVE_VM_COMPILED = true
@@ -1058,10 +1049,6 @@ else
endif
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
-BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral
-BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
-BASE_CFLAGS += -Wdisabled-optimization
-BASE_CFLAGS += -Werror-implicit-function-declaration
ifeq ($(V),1)
echo_cmd=@:
@@ -1285,7 +1272,7 @@ makedirs:
ifndef TOOLS_CC
# A compiler which probably produces native binaries
- TOOLS_CC = gcc
+ TOOLS_CC=$(CC)
endif
TOOLS_OPTIMIZE = -g -Wall -fno-strict-aliasing
diff --git a/src/master/Makefile b/src/master/Makefile
index a3a3f879..b5160afe 100644
--- a/src/master/Makefile
+++ b/src/master/Makefile
@@ -22,7 +22,6 @@ else
MKDIR=mkdir
endif
-CC=gcc
RELEASE_CFLAGS=-Wall -O2
DEBUG_CFLAGS=-g
OBJECTS= \