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

Add new source files to Makefiles

Browse source 
(cherry picked from commit abc0c1369ac33de97b6ac94aad30ac478240cdb6)
This commit is contained in:
Joël Troch 2021-03-19 19:00:23 +01:00 • committed by Daniel Walder
parent b1e51c28e2
commit 6353fb88e0
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
linux/Makefile.hl_cdll
View file

@ -106,6 +106,7 @@ DLL_OBJS = \
$(HL1_SERVER_OBJ_DIR)/shotgun.o \
$(HL1_SERVER_OBJ_DIR)/squeakgrenade.o \
$(HL1_SERVER_OBJ_DIR)/tripmine.o \
$(HL1_SERVER_OBJ_DIR)/weapons_shared.o \
$(HL1_SERVER_OBJ_DIR)/wpn_shared/hl_wpn_glock.o \
@ -113,6 +114,7 @@ PUBLIC_OBJS = \
$(PUBLIC_OBJ_DIR)/interface.o \
COMMON_OBJS = \
$(COMMON_OBJ_DIR)/mathlib.o \
$(COMMON_OBJ_DIR)/parsemsg.o \
GAME_SHARED_OBJS = \

20
linux/Makefile.hldll
View file

@ -11,15 +11,17 @@ HLDLL_OBJ_DIR=$(BUILD_OBJ_DIR)/hldll
HLWPN_OBJ_DIR=$(HLDLL_OBJ_DIR)/wpn_shared
PM_OBJ_DIR=$(HLDLL_OBJ_DIR)/pm_shared
GAME_SHARED_OBJ_DIR=$(HLDLL_OBJ_DIR)/game_shared
COMMON_OBJ_DIR=$(HLDLL_OBJ_DIR)/common
#CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) $(SHLIBCFLAGS) -DCLIENT_WEAPONS
CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_WEAPONS
#-O3 -ffast-math -fno-strength-reduce
HLDLL_INCLUDEDIRS=-I$(ENGINE_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PM_SRC_DIR) -I$(GAME_SHARED_SRC_DIR) -I$(PUBLIC_SRC_DIR)
HLDLL_INCLUDEDIRS=-I$(HLDLL_SRC_DIR) -I$(ENGINE_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PM_SRC_DIR) -I$(GAME_SHARED_SRC_DIR) -I$(PUBLIC_SRC_DIR)
HLWPN_INCLUDEDIRS=-I$(HLDLL_SRC_DIR) -I$(ENGINE_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PM_SRC_DIR) -I$(PUBLIC_SRC_DIR)
PM_INCLUDEDIRS=-I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR)
PM_INCLUDEDIRS=-I$(HLDLL_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR)
GAME_SHARED_INCLUDEDIRS=-I$(HLDLL_SRC_DIR) -I$(ENGINE_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PM_SRC_DIR) -I$(PUBLIC_SRC_DIR)
COMMON_INCLUDEDIRS=-I$(HLDLL_SRC_DIR) -I$(ENGINE_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PM_SRC_DIR) -I$(PUBLIC_SRC_DIR)
LDFLAGS= -lm -lstdc++
@ -27,6 +29,7 @@ DO_HLDLL_CC=$(CC) $(HLDLL_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_HLWPN_CC=$(CC) $(HLWPN_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_PM_CC=$(CC) $(PM_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_GAME_SHARED_CC=$(CC) $(GAME_SHARED_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_COMMON_CC=$(CC) $(COMMON_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
#####################################################################
@ -126,6 +129,7 @@ HLDLL_OBJS = \
$(HLDLL_OBJ_DIR)/UserMessages.o \
$(HLDLL_OBJ_DIR)/util.o \
$(HLDLL_OBJ_DIR)/weapons.o \
$(HLDLL_OBJ_DIR)/weapons_shared.o \
$(HLDLL_OBJ_DIR)/world.o \
$(HLDLL_OBJ_DIR)/xen.o \
$(HLDLL_OBJ_DIR)/zombie.o
@ -141,6 +145,9 @@ PM_OBJS = \
GAME_SHARED_OBJS = \
$(GAME_SHARED_OBJ_DIR)/voice_gamemgr.o
COMMON_OBJS = \
$(COMMON_OBJ_DIR)/mathlib.o
all: dirs hl.$(SHLIBEXT)
dirs:
@ -149,9 +156,10 @@ dirs:
-mkdir $(HLWPN_OBJ_DIR)
-mkdir $(PM_OBJ_DIR)
-mkdir $(GAME_SHARED_OBJ_DIR)
-mkdir $(COMMON_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)
hl.$(SHLIBEXT): $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(COMMON_OBJS)
$(CC) $(LDFLAGS) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(COMMON_OBJS)
./gendbg.sh $(BUILD_DIR)/hl.$(SHLIBEXT)
$(HLWPN_OBJ_DIR)/%.o : $(HLWPN_SRC_DIR)/%.cpp
@ -166,7 +174,11 @@ $(PM_OBJ_DIR)/%.o : $(PM_SRC_DIR)/%.cpp
$(GAME_SHARED_OBJ_DIR)/%.o : $(GAME_SHARED_SRC_DIR)/%.cpp
$(DO_GAME_SHARED_CC)
$(COMMON_OBJ_DIR)/%.o : $(COMMON_SRC_DIR)/%.cpp
$(DO_COMMON_CC)
clean:
-rm -rf $(COMMON_OBJ_DIR)
-rm -rf $(GAME_SHARED_OBJ_DIR)
-rm -rf $(PM_OBJ_DIR)
-rm -rf $(HLWPN_OBJ_DIR)