From 6b30a4f852399a10acdf15cb3157ef740ac0a893 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Mon, 14 Aug 2006 20:14:02 +0000 Subject: [PATCH] Updated makefiles yet again to add GCC version checking for some cool new optimization flags --HG-- extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40281 --- sourcemm/Makefile | 10 ++++++++-- sourcemm/sample_mm/Makefile | 10 ++++++++-- sourcemm/stub_mm/Makefile | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/sourcemm/Makefile b/sourcemm/Makefile index 9b0fb04..92079cc 100644 --- a/sourcemm/Makefile +++ b/sourcemm/Makefile @@ -4,11 +4,11 @@ HL2SDK = ../hl2sdk SMM_ROOT = .. SRCDS = ~/srcds -EXTRA_FLAGS = ### EDIT BELOW FOR OTHER PROJECTS ### OPT_FLAGS = -O2 -funroll-loops -s -pipe +GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden DEBUG_FLAGS = -g -ggdb3 CPP = gcc-4.1 BINARY = server_i486.so @@ -31,7 +31,13 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse $(EXTRA_FLAGS) +GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) + +CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse + +ifeq "$(GCC_VERSION)" "4" + CFLAGS += $(GCC4_FLAGS) +endif OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) diff --git a/sourcemm/sample_mm/Makefile b/sourcemm/sample_mm/Makefile index d04852c..eac7d2d 100644 --- a/sourcemm/sample_mm/Makefile +++ b/sourcemm/sample_mm/Makefile @@ -4,11 +4,11 @@ HL2SDK = ../../hl2sdk SMM_ROOT = ../.. SRCDS = ~/srcds -EXTRA_FLAGS = ### EDIT BELOW FOR OTHER PROJECTS ### OPT_FLAGS = -O3 -funroll-loops -s -pipe +GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden DEBUG_FLAGS = -g -ggdb3 CPP = gcc-4.1 BINARY = sample_mm_i486.so @@ -30,7 +30,13 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse $(EXTRA_FLAGS) +GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) + +CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse + +ifeq "$(GCC_VERSION)" "4" + CFLAGS += $(GCC4_FLAGS) +endif OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) diff --git a/sourcemm/stub_mm/Makefile b/sourcemm/stub_mm/Makefile index 23caeba..d327487 100644 --- a/sourcemm/stub_mm/Makefile +++ b/sourcemm/stub_mm/Makefile @@ -4,11 +4,11 @@ HL2SDK = ../../hl2sdk SMM_ROOT = ../.. SRCDS = ~/srcds -EXTRA_FLAGS = ### EDIT BELOW FOR OTHER PROJECTS ### OPT_FLAGS = -O3 -funroll-loops -s -pipe +GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden DEBUG_FLAGS = -g -ggdb3 CPP = gcc-4.1 BINARY = stub_mm_i486.so @@ -30,7 +30,13 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse $(EXTRA_FLAGS) +GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) + +CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse + +ifeq "$(GCC_VERSION)" "4" + CFLAGS += $(GCC4_FLAGS) +endif OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)