From 5d0b6f267e7e4c96c834fbde44399335af319343 Mon Sep 17 00:00:00 2001 From: FreeSlave Date: Sat, 6 Aug 2016 23:37:36 +0400 Subject: [PATCH] Use ?= on compilers. Remove D_LINUX from client Makefile --- cl_dll/Makefile | 6 +++--- dlls/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cl_dll/Makefile b/cl_dll/Makefile index ce174dbf..983b61c0 100644 --- a/cl_dll/Makefile +++ b/cl_dll/Makefile @@ -1,5 +1,5 @@ -CC=gcc -CXX=g++ +CC?=gcc +CXX?=g++ SRCS+=../dlls/crossbow.cpp SRCS+=../dlls/crowbar.cpp SRCS+=../dlls/egon.cpp @@ -67,7 +67,7 @@ SRCS+=./input_xash3d.cpp SRCS+=./scoreboard.cpp SRCS+=./MOTD.cpp INCLUDES = -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls -DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL +DEFINES = -Wno-write-strings -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL CFLAGS = -m32 OBJS = $(SRCS:.cpp=.o) $(SRCS_C:.c=.o) diff --git a/dlls/Makefile b/dlls/Makefile index fe84e256..c75731d5 100644 --- a/dlls/Makefile +++ b/dlls/Makefile @@ -9,8 +9,8 @@ DLLNAME=hl ARCH=i386 #make sure this is the correct compiler for your system -CC=gcc -CXX=g++ +CC?=gcc +CXX?=g++ DLL_SRCDIR=. ENGINE_SRCDIR=../engine