nullprop/halflife-photomode
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Update Makefiles and gendbg.sh

Browse source
This commit is contained in:
Joël Troch 2018-09-02 23:59:58 +02:00
parent f43005935d
commit 4a62d64e4b
8 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
linux/Makefile
View file

@ -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)

4
linux/Makefile.dmc_cdll
View file

@ -115,9 +115,7 @@ all: client_dmc.$(SHLIBEXT)
client_dmc.$(SHLIBEXT): $(DMC_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS) $(GAME_SHARED_OBJS) $(PM_SHARED_OBJS)
$(CLINK) -o $(BUILD_DIR)/$@ $(DMC_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS) $(GAME_SHARED_OBJS) $(PM_SHARED_OBJS) $(LDFLAGS) $(CPP_LIB)
p4 edit ../../game/mod/cl_dlls/client.$(SHLIBEXT)
cp $(BUILD_DIR)/$@ ../../game/mod/cl_dlls/client.$(SHLIBEXT)
./gendbg.sh ../../game/mod/cl_dlls/client.$(SHLIBEXT)
./gendbg.sh $(BUILD_DIR)/client.$(SHLIBEXT)
$(DMC_OBJ_DIR):

4
linux/Makefile.dmcdll
View file

@ -93,9 +93,7 @@ dirs:
dmc.$(SHLIBEXT): $(DMCDLL_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS)
$(CLINK) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(DMCDLL_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(LDFLAGS) $(CPP_LIB)
p4 edit ../../game/mod/dlls/$@
cp $(BUILD_DIR)/$@ ../../game/mod/dlls
./gendbg.sh ../../game/mod/dlls/dmc.$(SHLIBEXT)
./gendbg.sh $(BUILD_DIR)/dmc.$(SHLIBEXT)
$(DMCDLL_OBJ_DIR)/%.o : $(DMCDLL_SRC_DIR)/%.cpp
$(DO_DMCDLL_CC)

4
linux/Makefile.hl_cdll
View file

@ -137,9 +137,7 @@ 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)
./gendbg.sh $(BUILD_DIR)/client.$(SHLIBEXT)
$(HL1_OBJ_DIR):
mkdir -p $(HL1_OBJ_DIR)

4
linux/Makefile.hldll
View file

@ -151,9 +151,7 @@ dirs:
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)
./gendbg.sh $(BUILD_DIR)/hl.$(SHLIBEXT)
$(HLWPN_OBJ_DIR)/%.o : $(HLWPN_SRC_DIR)/%.cpp
$(DO_HLWPN_CC)

4
linux/Makefile.ricochet_cdll
View file

@ -114,9 +114,7 @@ all: client_ricochet.$(SHLIBEXT)
client_ricochet.$(SHLIBEXT): $(RICOCHET_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS) $(GAME_SHARED_OBJS) $(PM_SHARED_OBJS)
$(CLINK) -o $(BUILD_DIR)/$@ $(RICOCHET_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS) $(GAME_SHARED_OBJS) $(PM_SHARED_OBJS) $(LDFLAGS) $(CPP_LIB)
p4 edit ../../game/mod/cl_dlls/client.$(SHLIBEXT)
cp $(BUILD_DIR)/$@ ../../game/mod/cl_dlls/client.$(SHLIBEXT)
./gendbg.sh ../../game/mod/cl_dlls/client.$(SHLIBEXT)
./gendbg.sh $(BUILD_DIR)/client.$(SHLIBEXT)
$(RICOCHET_OBJ_DIR):
mkdir -p $(RICOCHET_OBJ_DIR)

4
linux/Makefile.ricochetdll
View file

@ -102,9 +102,7 @@ dirs:
ricochet.$(SHLIBEXT): $(RICOCHETDLL_OBJS) $(RICOCHETWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS)
$(CLINK) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(RICOCHETDLL_OBJS) $(RICOCHETWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(LDFLAGS) $(CPP_LIB)
p4 edit ../../game/mod/dlls/$@
cp $(BUILD_DIR)/$@ ../../game/mod/dlls
./gendbg.sh ../../game/mod/dlls/$@
./gendbg.sh $(BUILD_DIR)/$@
$(RICOCHETWPN_OBJ_DIR)/%.o : $(RICOCHETWPN_SRC_DIR)/%.cpp
$(DO_RICOCHETWPN_CC)

6
linux/gendbg.sh
View file

@ -2,13 +2,11 @@
UNAME=`uname`
if [ "$UNAME" == "Darwin" ]; then
p4 edit $1.dSYM/...
dsymutil $1
p4 revert -a $1.dSYM/...
exit 0;
fi
OBJCOPY=/valve/bin/objcopy
OBJCOPY=objcopy
function usage {
echo "$0 /path/to/input/file [-o /path/to/output/file ]"
@ -45,9 +43,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