1.1 --- a/core/Makefile Thu Jul 10 01:26:02 2008 +0000
1.2 +++ b/core/Makefile Fri Jul 11 08:18:43 2008 +0000
1.3 @@ -29,12 +29,8 @@
1.4 smn_adt_trie.cpp smn_hudtext.cpp smn_adt_stack.cpp smn_nextmap.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
1.10 OBJECTS += thread/ThreadWorker.cpp thread/BaseWorker.cpp thread/PosixThreads.cpp ThreadSupport.cpp
1.11 -OBJECTS += 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
1.15 ##############################################
1.16 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
1.17 @@ -103,13 +99,9 @@
1.18 CPPFLAGS += $(CPP_GCC4_FLAGS)
1.19 endif
1.20
1.21 -OBJ_LINUX := $(OBJECTS:%vm_engine.cpp=$(BIN_DIR)/%vm_engine.o)
1.22 -OBJ_LINUX := $(OBJ_LINUX:%.cpp=$(BIN_DIR)/%.o)
1.23 +OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
1.24 OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
1.25
1.26 -$(BIN_DIR)/%vm_engine.o: %vm_engine.cpp
1.27 - $(CPP) $(INCLUDE_SM16) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
1.28 -
1.29 $(BIN_DIR)/%.o: %.cpp
1.30 $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
1.31
1.32 @@ -118,8 +110,6 @@
1.33
1.34 all: check
1.35 mkdir -p $(BIN_DIR)/systems
1.36 - mkdir -p $(BIN_DIR)/vm
1.37 - mkdir -p $(BIN_DIR)/zlib
1.38 mkdir -p $(BIN_DIR)/thread
1.39 ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so;
1.40 ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so;
1.41 @@ -142,7 +132,5 @@
1.42 clean: check
1.43 rm -rf $(BIN_DIR)/*.o
1.44 rm -rf $(BIN_DIR)/systems/*.o
1.45 - rm -rf $(BIN_DIR)/zlib/*.o
1.46 - rm -rf $(BIN_DIR)/vm/*.o
1.47 rm -rf $(BIN_DIR)/thread/*.o
1.48 rm -rf $(BIN_DIR)/$(BINARY)