1.1 --- a/core/Makefile	Tue Jan 30 00:38:56 2007 +0000
     1.2 +++ b/core/Makefile	Tue Jan 30 02:38:12 2007 +0000
     1.3 @@ -10,7 +10,8 @@
     1.4  ### EDIT BELOW FOR OTHER PROJECTS ###
     1.5  
     1.6  OPT_FLAGS = -O3 -funroll-loops -s -pipe -fno-strict-aliasing
     1.7 -GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden
     1.8 +GCC4_FLAGS = -fvisibility=hidden 
     1.9 +GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
    1.10  DEBUG_FLAGS = -g -ggdb3
    1.11  CPP = gcc-4.1
    1.12  BINARY = sourcemod_mm_i486.so
    1.13 @@ -27,7 +28,7 @@
    1.14  	  systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp \
    1.15  	  systems/PluginSys.cpp systems/ShareSys.cpp vm/sp_vm_basecontext.cpp \
    1.16  	  vm/sp_vm_engine.cpp vm/sp_vm_function.cpp
    1.17 -OBJECTS += zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio.c \
    1.18 +OBJECTS_C = zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio.c \
    1.19  	   zlib/infback.c zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
    1.20  	   zlib/uncompr.c zlib/zutil.c
    1.21  
    1.22 @@ -52,16 +53,17 @@
    1.23  CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
    1.24  
    1.25  ifeq "$(GCC_VERSION)" "4"
    1.26 -	CPPFLAGS += $(GCC4_FLAGS)
    1.27 +	CFLAGS += $(GCC4_FLAGS)
    1.28 +	CPPFLAGS += $(GCC4_CPP_FLAGS)
    1.29  endif
    1.30  
    1.31 -OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
    1.32 -OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o)
    1.33 +OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.ox)
    1.34 +OBJ_LINUX_C := $(OBJECTS_C:%.c=$(BIN_DIR)/%.oc)
    1.35  
    1.36 -$(BIN_DIR)/%.o: %.cpp
    1.37 +$(BIN_DIR)/%.ox: %.cpp
    1.38  	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
    1.39  
    1.40 -$(BIN_DIR)/%.o: %.c
    1.41 +$(BIN_DIR)/%.oc: %.c
    1.42  	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
    1.43  
    1.44  all:
    1.45 @@ -74,8 +76,8 @@
    1.46  	rm -rf $(BINARY)
    1.47  	ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
    1.48  
    1.49 -sourcemod: $(OBJ_LINUX)
    1.50 -	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
    1.51 +sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
    1.52 +	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
    1.53  
    1.54  debug:	
    1.55  	$(MAKE) all DEBUG=true
    1.56 @@ -83,8 +85,12 @@
    1.57  default: all
    1.58  
    1.59  clean:
    1.60 -	rm -rf Release/*.o
    1.61 +	rm -rf Release/*.ox
    1.62 +	rm -rf Release/systems/*.ox
    1.63 +	rm -rf Release/zlib/*.oc
    1.64  	rm -rf Release/$(BINARY)
    1.65 -	rm -rf Debug/*.o
    1.66 +	rm -rf Debug/*.ox
    1.67 +	rm -rf DEbug/systems/*.ox
    1.68 +	rm -rf Debug/zlib/*.oc
    1.69  	rm -rf Debug/$(BINARY)
    1.70