Improve linux configuration

linux/.gitignore

@@ -0,0 +1 @@
+release

linux/Makefile

@@ -29,9 +29,9 @@ ARCH=i386
 ELF-GC-DYNSTR=./elf-gc-dynstr
 
 ifeq ($(OS),Linux)
-	CC="/valve/bin/gcc-4.6 -m32"
-	CPLUS="/valve/bin/g++-4.6 -m32"
-	CPP_LIB:=-L$(shell /valve/bin/g++-4.6 -m32 -print-file-name=libstdc++.so | xargs dirname) -lstdc++ -ldl -lpthread
+	CC="gcc -m32"
+	CPLUS="g++ -m32"
+	CPP_LIB:=-L$(shell g++ -m32 -print-file-name=libstdc++.so | xargs dirname) -lstdc++ -ldl -lpthread
 endif
 
 ifeq ($(OS),Darwin)
@@ -135,14 +135,10 @@ TARGETS=
 
 TARGETS+= \
  	hl \
- 	dmc \
- 	ricochet \
 	hl_cdll \
-	dmc_cdll \
-	ricochet_cdll \
 
 build_dir:
-	-mkdir $(BUILD_DIR);
+	-mkdir -p $(BUILD_DIR);
 	cd $(BUILD_DIR)
 
 targets: $(TARGETS)

linux/Makefile.hl_cdll

@@ -3,6 +3,8 @@
 #
 #
 
+BIN_DIR=../../game/mod/cl_dlls
+
 HL_SRC_DIR=$(SOURCE_DIR)/cl_dll
 HL_SERVER_SRC_DIR=$(SOURCE_DIR)/dlls
 GAME_SHARED_SRC_DIR=$(SOURCE_DIR)/game_shared
@@ -138,9 +140,9 @@ all: client.$(SHLIBEXT)
 
 client.$(SHLIBEXT): $(HL1_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS) $(GAME_SHARED_OBJS) $(DLL_OBJS) $(PM_SHARED_OBJS)
 	$(CLINK) -o $(BUILD_DIR)/$@ $(HL1_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS) $(GAME_SHARED_OBJS) $(DLL_OBJS) $(PM_SHARED_OBJS) $(LDFLAGS) $(CPP_LIB)
-	p4 edit ../../game/mod/cl_dlls/$@
-	cp $(BUILD_DIR)/$@  ../../game/mod/cl_dlls
-	./gendbg.sh ../../game/mod/cl_dlls/client.$(SHLIBEXT)
+	mkdir -p $(BIN_DIR)
+	cp $(BUILD_DIR)/$@  $(BIN_DIR)
+	./gendbg.sh $(BIN_DIR)/client.$(SHLIBEXT)
 
 $(HL1_OBJ_DIR):
 	mkdir -p $(HL1_OBJ_DIR)

linux/Makefile.hldll

@@ -4,6 +4,8 @@
 # Feb 2001 by Leon Hartwig ([email protected])
 #
 
+BIN_DIR=../../game/mod/dlls
+
 HLDLL_SRC_DIR=$(SOURCE_DIR)/dlls
 HLWPN_SRC_DIR=$(HLDLL_SRC_DIR)/wpn_shared
 
@@ -143,17 +145,17 @@ GAME_SHARED_OBJS = \
 all: dirs hl.$(SHLIBEXT)
 
 dirs:
-	-mkdir $(BUILD_OBJ_DIR)
-	-mkdir $(HLDLL_OBJ_DIR)
-	-mkdir $(HLWPN_OBJ_DIR)
-	-mkdir $(PM_OBJ_DIR)
-	-mkdir $(GAME_SHARED_OBJ_DIR)
+	-mkdir -p $(BUILD_OBJ_DIR)
+	-mkdir -p $(HLDLL_OBJ_DIR)
+	-mkdir -p $(HLWPN_OBJ_DIR)
+	-mkdir -p $(PM_OBJ_DIR)
+	-mkdir -p $(GAME_SHARED_OBJ_DIR)
 
 hl.$(SHLIBEXT): $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS)
 	$(CC) $(LDFLAGS) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS)
-	p4 edit ../../game/mod/dlls/hl.$(SHLIBEXT)
-	cp $(BUILD_DIR)/$@  ../../game/mod/dlls/hl.$(SHLIBEXT)
-	./gendbg.sh ../../game/mod/dlls/hl.$(SHLIBEXT)
+	mkdir -p $(BIN_DIR)
+	cp $(BUILD_DIR)/$@  $(BIN_DIR)/hl.$(SHLIBEXT)
+	./gendbg.sh $(BIN_DIR)/hl.$(SHLIBEXT)
 
 $(HLWPN_OBJ_DIR)/%.o : $(HLWPN_SRC_DIR)/%.cpp
 	$(DO_HLWPN_CC)

linux/gendbg.sh

@@ -8,7 +8,7 @@ if [ "$UNAME" == "Darwin" ]; then
 	exit 0;
 fi
 
-OBJCOPY=/valve/bin/objcopy
+OBJCOPY=objcopy
 
 function usage {
 	echo "$0 /path/to/input/file [-o /path/to/output/file ]"
@@ -45,9 +45,7 @@ if [ "$OUTFILEDIR" != "$INFILEDIR" ]; then
 fi
 
 pushd "$INFILEDIR"
-p4 edit "$OUTFILE"
 $OBJCOPY "$INFILE" "$OUTFILE"
 $OBJCOPY --add-gnu-debuglink="$OUTFILE" "$INFILE"
-p4 revert -a "$OUTFILE"
 popd