1.1 --- a/core/Makefile	Tue Nov 25 19:10:52 2008 +1300
     1.2 +++ b/core/Makefile	Thu Nov 27 01:13:51 2008 -0600
     1.3 @@ -5,8 +5,7 @@
     1.4  SRCDS_BASE = ~/srcds
     1.5  HL2SDK_ORIG = ../../hl2sdk
     1.6  HL2SDK_OB = ../../hl2sdk-ob
     1.7 -SOURCEMM14 = ../../sourcemm-1.4
     1.8 -SOURCEMM16 = ../../sourcemm-1.6
     1.9 +MMSOURCE17 = ../../mmsource-1.7
    1.10  
    1.11  #####################################
    1.12  ### EDIT BELOW FOR OTHER PROJECTS ###
    1.13 @@ -51,7 +50,7 @@
    1.14  	HL2SDK = $(HL2SDK_ORIG)
    1.15  	HL2PUB = $(HL2SDK_ORIG)/public
    1.16  	HL2LIB = $(HL2SDK_ORIG)/linux_sdk
    1.17 -	METAMOD = $(SOURCEMM14)
    1.18 +	METAMOD = $(MMSOURCE17)/core-legacy
    1.19  	INCLUDE += -I$(HL2SDK)/public/dlls
    1.20  	SRCDS = $(SRCDS_BASE)
    1.21  	BINARY = sourcemod.1.ep1.so
    1.22 @@ -62,7 +61,7 @@
    1.23  	HL2PUB = $(HL2SDK_OB)/public
    1.24  	HL2LIB = $(HL2SDK_OB)/lib/linux
    1.25  	CFLAGS += -DORANGEBOX_BUILD
    1.26 -	METAMOD = $(SOURCEMM16)
    1.27 +	METAMOD = $(MMSOURCE17)/core
    1.28  	INCLUDE += -I$(HL2SDK)/public/game/server
    1.29  	SRCDS = $(SRCDS_BASE)/orangebox
    1.30  	BINARY = sourcemod.2.ep2.so
    1.31 @@ -71,14 +70,10 @@
    1.32  
    1.33  LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
    1.34  	tier0_i486.so -lpthread -static-libgcc
    1.35 -
    1.36 -INCLUDE_SMSDK = -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
    1.37 -
    1.38 -INCLUDE_SM16 = -I. -I.. -I$(SOURCEMM16)/sourcehook $(INCLUDE_SMSDK)
    1.39  	
    1.40  INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
    1.41  	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook \
    1.42 -	-I$(METAMOD)/sourcemm -Isystems $(INCLUDE_SMSDK)
    1.43 +	-I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
    1.44  
    1.45  CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
    1.46  	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror \