1.1 --- a/core/Makefile	Sat Feb 23 20:50:26 2008 +0000
     1.2 +++ b/core/Makefile	Sat Feb 23 20:54:31 2008 +0000
     1.3 @@ -33,12 +33,12 @@
     1.4  	smn_adt_trie.cpp
     1.5  OBJECTS += systems/ExtensionSys.cpp systems/ForwardSys.cpp systems/HandleSys.cpp \
     1.6  	systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp systems/PluginSys.cpp \
     1.7 -	systems/ShareSys.cpp vm/sp_vm_basecontext.cpp vm/sp_vm_engine.cpp \
     1.8 -	vm/sp_vm_function.cpp
     1.9 +	systems/ShareSys.cpp vm/sp_vm_basecontext.cpp vm/sp_vm_function.cpp
    1.10  OBJECTS += thread/ThreadWorker.cpp thread/BaseWorker.cpp thread/PosixThreads.cpp ThreadSupport.cpp
    1.11  OBJECTS_C = zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio.c \
    1.12  	   zlib/infback.c zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
    1.13  	   zlib/uncompr.c zlib/zutil.c
    1.14 +OBJECTS_SM16 = vm/sp_vm_engine.cpp
    1.15  
    1.16  ifeq "$(ENGINE)" "original"
    1.17  	HL2SDK = $(HL2SDK_ORIG)
    1.18 @@ -67,10 +67,13 @@
    1.19  LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
    1.20  	tier0_i486.so -lpthread -static-libgcc
    1.21  
    1.22 +INCLUDE_SMSDK = -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions 
    1.23 +
    1.24  INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
    1.25  	-I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(METAMOD)/sourcemm \
    1.26 -	-I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions -Isystems \
    1.27 -	-I$(HL2PUB)/mathlib
    1.28 +	-I$(HL2PUB)/mathlib -Isystems $(INCLUDE_SMSDK)
    1.29 +
    1.30 +SM16_INCLUDE = -I. -I.. -I$(SOURCEMM16)/sourcehook $(INCLUDE_SMSDK)
    1.31  
    1.32  ifeq "$(DEBUG)" "true"
    1.33  	BIN_DIR = Debug.$(ENGINE)
    1.34 @@ -95,6 +98,7 @@
    1.35  
    1.36  OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.ox)
    1.37  OBJ_LINUX_C := $(OBJECTS_C:%.c=$(BIN_DIR)/%.oc)
    1.38 +OBJ_LINUX_SM16 := $(OBJECTS_SM16:%.cpp=$(BIN_DIR)/%.ok)
    1.39  
    1.40  $(BIN_DIR)/%.ox: %.cpp
    1.41  	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
    1.42 @@ -102,6 +106,9 @@
    1.43  $(BIN_DIR)/%.oc: %.c
    1.44  	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
    1.45  
    1.46 +$(BIN_DIR)/%.ok: %.cpp
    1.47 +	$(CPP) $(SM16_INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
    1.48 +
    1.49  all:
    1.50  	mkdir -p $(BIN_DIR)/systems
    1.51  	mkdir -p $(BIN_DIR)/vm
    1.52 @@ -111,8 +118,8 @@
    1.53  	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
    1.54  	$(MAKE) -f Makefile sourcemod
    1.55  
    1.56 -sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
    1.57 -	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
    1.58 +sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C) $(OBJ_LINUX_SM16)
    1.59 +	$(CPP) $(OBJ_LINUX) $(OBJ_LINUX_C) $(OBJ_LINUX_SM16) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
    1.60  
    1.61  default: all
    1.62