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

Fix Linux build

Browse source
This commit is contained in:
Joël Troch 2021-12-08 00:35:10 +01:00
parent 5bd7db9bbd
commit b0b205dac6
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
linux/Makefile.hl_cdll
View file

@ -90,6 +90,7 @@ DLL_OBJS = \
$(HL1_SERVER_OBJ_DIR)/crowbar.o \
$(HL1_SERVER_OBJ_DIR)/egon.o \
$(HL1_SERVER_OBJ_DIR)/gauss.o \
$(HL1_SERVER_OBJ_DIR)/glock.o \
$(HL1_SERVER_OBJ_DIR)/handgrenade.o \
$(HL1_SERVER_OBJ_DIR)/hornetgun.o \
$(HL1_SERVER_OBJ_DIR)/mp5.o \
@ -100,7 +101,6 @@ DLL_OBJS = \
$(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 \
PUBLIC_OBJS = \

17
linux/Makefile.hldll
View file

@ -5,10 +5,8 @@
#
HLDLL_SRC_DIR=$(SOURCE_DIR)/dlls
HLWPN_SRC_DIR=$(HLDLL_SRC_DIR)/wpn_shared
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
PUBLIC_OBJ_DIR=$(HLDLL_OBJ_DIR)/public
@ -19,7 +17,6 @@ CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_WEAPONS
#-O3 -ffast-math -fno-strength-reduce
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$(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)
@ -28,7 +25,6 @@ LDFLAGS= $(CPP_LIB) -lm
DO_HLDLL_CC=$(CPLUS) $(HLDLL_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_PUBLIC_CC=$(CPLUS) $(HLDLL_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_HLWPN_CC=$(CPLUS) $(HLWPN_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_PM_CC=$(CPLUS) $(PM_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_GAME_SHARED_CC=$(CPLUS) $(GAME_SHARED_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
DO_COMMON_CC=$(CPLUS) $(COMMON_INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
@ -69,6 +65,7 @@ HLDLL_OBJS = \
$(HLDLL_OBJ_DIR)/gauss.o \
$(HLDLL_OBJ_DIR)/genericmonster.o \
$(HLDLL_OBJ_DIR)/ggrenade.o \
$(HLDLL_OBJ_DIR)/glock.o \
$(HLDLL_OBJ_DIR)/gman.o \
$(HLDLL_OBJ_DIR)/h_ai.o \
$(HLDLL_OBJ_DIR)/h_battery.o \
@ -135,9 +132,6 @@ HLDLL_OBJS = \
$(HLDLL_OBJ_DIR)/xen.o \
$(HLDLL_OBJ_DIR)/zombie.o
HLWPN_OBJS = \
$(HLWPN_OBJ_DIR)/hl_wpn_glock.o
PM_OBJS = \
$(PM_OBJ_DIR)/pm_shared.o \
$(PM_OBJ_DIR)/pm_math.o \
@ -158,19 +152,15 @@ 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 $(PUBLIC_OBJ_DIR)
-mkdir $(COMMON_OBJ_DIR)
hl.$(SHLIBEXT): $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS)
$(CPLUS) $(LDFLAGS) $(CPP_LIB) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS)
hl.$(SHLIBEXT): $(HLDLL_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS)
$(CPLUS) $(LDFLAGS) $(CPP_LIB) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(HLDLL_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(PUBLIC_OBJS) $(COMMON_OBJS)
./gendbg.sh $(BUILD_DIR)/hl.$(SHLIBEXT)
$(HLWPN_OBJ_DIR)/%.o : $(HLWPN_SRC_DIR)/%.cpp
$(DO_HLWPN_CC)
$(HLDLL_OBJ_DIR)/%.o : $(HLDLL_SRC_DIR)/%.cpp
$(DO_HLDLL_CC)
@ -190,6 +180,5 @@ clean:
-rm -rf $(COMMON_OBJ_DIR)
-rm -rf $(GAME_SHARED_OBJ_DIR)
-rm -rf $(PM_OBJ_DIR)
-rm -rf $(HLWPN_OBJ_DIR)
-rm -rf $(HLDLL_OBJ_DIR)
-rm -f hl_$(ARCH).$(SHLIBEXT)