Add filesystem_utils.cpp & interface.cpp to client & server libraries t…

…whl-community#86 (cherry picked from commit a5da636)
LogicAndTrick · Dec 26, 2021 · cd04225 · cd04225
1 parent 55deb57
commit cd04225
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/linux/Makefile.hl_cdll b/linux/Makefile.hl_cdll
@@ -111,6 +111,7 @@ COMMON_OBJS = \
 	$(COMMON_OBJ_DIR)/parsemsg.o \
 
 GAME_SHARED_OBJS = \
+	$(GAME_SHARED_OBJ_DIR)/filesystem_utils.o \
 	$(GAME_SHARED_OBJ_DIR)/vgui_checkbutton2.o \
 	$(GAME_SHARED_OBJ_DIR)/vgui_grid.o \
 	$(GAME_SHARED_OBJ_DIR)/vgui_helpers.o \

diff --git a/linux/Makefile.hldll b/linux/Makefile.hldll
@@ -11,6 +11,7 @@ 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
 COMMON_OBJ_DIR=$(HLDLL_OBJ_DIR)/common
 
 HLDLL_LIB_NAME=spirit
@@ -28,6 +29,7 @@ COMMON_INCLUDEDIRS=-I$(HLDLL_SRC_DIR) -I$(ENGINE_SRC_DIR) -I$(COMMON_SRC_DIR) -I
 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 $<
@@ -147,8 +149,12 @@ PM_OBJS = \
 	$(PM_OBJ_DIR)/pm_debug.o
 
 GAME_SHARED_OBJS = \
+	$(GAME_SHARED_OBJ_DIR)/filesystem_utils.o \
 	$(GAME_SHARED_OBJ_DIR)/voice_gamemgr.o
 
+PUBLIC_OBJS = \
+	$(PUBLIC_OBJ_DIR)/interface.o \
+
 COMMON_OBJS = \
 	$(COMMON_OBJ_DIR)/mathlib.o
 
@@ -160,10 +166,11 @@ dirs:
 	-mkdir $(HLWPN_OBJ_DIR)
 	-mkdir $(PM_OBJ_DIR)
 	-mkdir $(GAME_SHARED_OBJ_DIR)
+	-mkdir $(PUBLIC_OBJ_DIR)
 	-mkdir $(COMMON_OBJ_DIR)
 
-$(HLDLL_LIB_NAME).$(SHLIBEXT): $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(COMMON_OBJS)
-	$(CPLUS) $(LDFLAGS) $(CPP_LIB) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(COMMON_OBJS)
+$(HLDLL_LIB_NAME).$(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)
 	./gendbg.sh $(BUILD_DIR)/$(HLDLL_LIB_NAME).$(SHLIBEXT)
 
 $(HLWPN_OBJ_DIR)/%.o : $(HLWPN_SRC_DIR)/%.cpp
@@ -178,6 +185,9 @@ $(PM_OBJ_DIR)/%.o : $(PM_SRC_DIR)/%.cpp
 $(GAME_SHARED_OBJ_DIR)/%.o : $(GAME_SHARED_SRC_DIR)/%.cpp
 	$(DO_GAME_SHARED_CC)
 
+$(PUBLIC_OBJ_DIR)/%.o : $(PUBLIC_SRC_DIR)/%.cpp
+	$(DO_PUBLIC_CC)
+
 $(COMMON_OBJ_DIR)/%.o : $(COMMON_SRC_DIR)/%.cpp
 	$(DO_COMMON_CC)