Skip to content

Commit

Permalink
Remove preprocessor definitions handled in Platform.h from makefiles,…
Browse files Browse the repository at this point in the history
… remove obsolete function alias on Linux

Resolves twhl-community#61
twhl-community#59

(cherry picked from commit 5f45923)
  • Loading branch information
SamVanheer authored and LogicAndTrick committed Dec 24, 2021
1 parent 0b23b18 commit 16198cf
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion common/Platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ typedef int BOOL;
#define MAX_PATH PATH_MAX

#define stricmp strcasecmp
#define _strnicmp strncasecmp
#define strnicmp strncasecmp
#define _alloca alloca

Expand Down
2 changes: 1 addition & 1 deletion linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion linux/Makefile.hl_cdll
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 16198cf

Please sign in to comment.