Merge.
authorScott Ehlert <ds@alliedmods.net>
Sat Apr 30 22:42:40 2011 -0500 (2011-04-30)
changeset 751566717d57a09
parent 750 506985824237
parent 749 274c463721ee
child 752 eeea4ed7c45d
Merge.
     1.1 --- a/core/Makefile	Sat Apr 30 22:41:54 2011 -0500
     1.2 +++ b/core/Makefile	Sat Apr 30 22:42:40 2011 -0500
     1.3 @@ -11,17 +11,21 @@
     1.4  ### EDIT BELOW FOR OTHER PROJECTS ###
     1.5  #####################################
     1.6  
     1.7 -OBJECTS = metamod.cpp 				\
     1.8 -		  metamod_util.cpp 			\
     1.9 -		  metamod_console.cpp 		\
    1.10 -		  metamod_oslink.cpp 		\
    1.11 -		  metamod_plugins.cpp 		\
    1.12 -		  sourcehook/sourcehook.cpp \
    1.13 -		  sourcehook/sourcehook_hookmangen.cpp \
    1.14 -		  provider/console.cpp 		\
    1.15 -		  provider/provider_ep2.cpp \
    1.16 -		  vsp_bridge.cpp			\
    1.17 -		  gamedll_bridge.cpp
    1.18 +OBJECTS = metamod.cpp \
    1.19 +		metamod_util.cpp \
    1.20 +		metamod_console.cpp \
    1.21 +		metamod_oslink.cpp \
    1.22 +		metamod_plugins.cpp \
    1.23 +		sourcehook/sourcehook.cpp \
    1.24 +		sourcehook/sourcehook_hookmangen.cpp \
    1.25 +		sourcehook/sourcehook_impl_chookidman.cpp \
    1.26 +		sourcehook/sourcehook_impl_chookmaninfo.cpp \
    1.27 +		sourcehook/sourcehook_impl_cproto.cpp \
    1.28 +		sourcehook/sourcehook_impl_cvfnptr.cpp \
    1.29 +		provider/console.cpp \
    1.30 +		provider/provider_ep2.cpp \
    1.31 +		vsp_bridge.cpp \
    1.32 +		gamedll_bridge.cpp
    1.33  
    1.34  ##############################################
    1.35  ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
    1.36 @@ -86,7 +90,7 @@
    1.37  LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \
    1.38  	-static-libgcc
    1.39  
    1.40 -INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
    1.41 +INCLUDE += -I. -I.. -I../public -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
    1.42  	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -Isourcehook -I../loader
    1.43  
    1.44  CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \