diff --git a/common/Platform.h b/common/Platform.h index e82ec4554..fab7cecbb 100644 --- a/common/Platform.h +++ b/common/Platform.h @@ -125,7 +125,6 @@ typedef int BOOL; #define MAX_PATH PATH_MAX #define stricmp strcasecmp -#define _strnicmp strncasecmp #define strnicmp strncasecmp #define _alloca alloca diff --git a/linux/Makefile b/linux/Makefile index 8495bcc5c..1b9b1653d 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -89,7 +89,7 @@ endif ARCH_CFLAGS="$(ARCH_CFLAGS_I486)" -BASE_CFLAGS=-fpermissive -fno-strict-aliasing -DNDEBUG -DPOSIX -D_POSIX -DLINUX -D_LINUX -DGNUC -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_alloca=alloca -fno-exceptions -fexpensive-optimizations -D_vsnprintf=vsnprintf -DNO_MALLOC_OVERRIDE -Werror=return-type +BASE_CFLAGS=-fpermissive -fno-strict-aliasing -DNDEBUG -DPOSIX -D_POSIX -DLINUX -D_LINUX -DGNUC -DNO_MALLOC_OVERRIDE -fno-exceptions -fexpensive-optimizations -Werror=return-type BASE_CFLAGS+=-w ifeq ($(OS),Darwin) diff --git a/linux/Makefile.hl_cdll b/linux/Makefile.hl_cdll index 1c4dc7853..ceac21568 100644 --- a/linux/Makefile.hl_cdll +++ b/linux/Makefile.hl_cdll @@ -15,7 +15,7 @@ GAME_SHARED_OBJ_DIR=$(HL1_OBJ_DIR)/game_shared HL1_SERVER_OBJ_DIR=$(HL1_OBJ_DIR)/server PM_SHARED_OBJ_DIR=$(HL1_OBJ_DIR)/pm_shared -CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_DLL -DCLIENT_WEAPONS -I/usr/include/malloc -D_snwprintf=swprintf +CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_DLL -DCLIENT_WEAPONS -I/usr/include/malloc INCLUDEDIRS=-I$(HL_SRC_DIR) -I../dlls -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I../pm_shared -I../engine -I../utils/vgui/include -I ../game_shared -I../external