Whew, massive-ish reorgranization for extensions and such. I will inevitably be shot for this.

(Yes, bail, it all compiles on both platforms)

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40763

extensions/geoip/Makefile

@@ -14,7 +14,7 @@ PROJECT = geoip
 #Uncomment for SourceMM-enabled extensions
 #LINK_HL2 = $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so 
 
-OBJECTS = extension.cpp smsdk_ext.cpp GeoIP.c
+OBJECTS = sdk/smsdk_ext.cpp extension.cpp GeoIP.c
 
 ##############################################
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
@@ -32,7 +32,7 @@ SMM_TRUNK = $(SOURCEMM)/trunk
 
 LINK = $(LINK_HL2) -static-libgcc
 
-INCLUDE = -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
+INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
           -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \
 	  -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
 
@@ -60,7 +60,7 @@ endif
 BINARY = $(PROJECT).ext.so
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
-OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o)
+OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
 
 $(BIN_DIR)/%.o: %.cpp
 	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
@@ -69,11 +69,10 @@ $(BIN_DIR)/%.o: %.c
 	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
 
 all:
-	mkdir -p $(BIN_DIR)
+	mkdir -p $(BIN_DIR)/sdk
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
 	$(MAKE) extension
-	rm -rf $(BINARY)
 
 extension: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@@ -85,7 +84,8 @@ default: all
 
 clean:
 	rm -rf Release/*.o
+	rm -rf Release/sdk/*.o
 	rm -rf Release/$(BINARY)
 	rm -rf Debug/*.o
+	rm -rf Debug/sdk/*.o
 	rm -rf Debug/$(BINARY)
-