From 3daa2f32e45afdb9d8357daa0aaf13100f4756d1 Mon Sep 17 00:00:00 2001 From: pierow Date: Sat, 23 Mar 2024 16:51:46 -0400 Subject: [PATCH] linux client update and config update --- main/config.cfg | 4 ++-- main/presetcfgs/AV/newdefault.cfg | 6 +++--- main/source/linux/Makefile.hl_cdll | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/main/config.cfg b/main/config.cfg index e394e44d..d1425381 100644 --- a/main/config.cfg +++ b/main/config.cfg @@ -183,8 +183,8 @@ zoom_sensitivity_ratio "0.97" lightgamma "1.81" ex_interp "0.05" cl_cross "1" -cl_bob "0.006" -cl_bobcycle "0.85" +cl_bob "0.005" +cl_bobcycle "0.8" cl_bobup "0.5" cl_weaponswap "2" cl_pistoltrigger "1" diff --git a/main/presetcfgs/AV/newdefault.cfg b/main/presetcfgs/AV/newdefault.cfg index c3ceba41..fccb3fae 100644 --- a/main/presetcfgs/AV/newdefault.cfg +++ b/main/presetcfgs/AV/newdefault.cfg @@ -11,8 +11,8 @@ cl_intensityalt "1" cl_high_detail "1" // Bobbing -cl_bob "0.006" -cl_bobcycle "0.85" +cl_bob "0.005" +cl_bobcycle "0.8" cl_bobup "0.5" cl_bobview "0" @@ -40,7 +40,7 @@ echo " " echo "----------------------------------------------------------------------" echo "NS 3.3 graphics and audio preset applied" echo "----------------------------------------------------------------------" -echo "- Brighter shadows. Reduced overbrightening. Flashing dynamic lights disabled." +echo "- Brighter maps with less shadows. Reduced overbrightening effects. Flashing dynamic lights disabled." echo "- Minimal marine HUD and new crosshair system." echo "- Reduced weapon bobbing and no view bobbing." echo "- Reduced ambient and music track volumes. Music tracks play only once at the start of the round." diff --git a/main/source/linux/Makefile.hl_cdll b/main/source/linux/Makefile.hl_cdll index 042df9e6..10168fe0 100644 --- a/main/source/linux/Makefile.hl_cdll +++ b/main/source/linux/Makefile.hl_cdll @@ -39,7 +39,7 @@ DO_COMMON_CC=$(CPLUS) -std=c++11 -stdlib=libc++ $(INCLUDEDIRS) $(CFLAGS) $(SHLI DO_PM_SHARED_CC=$(CPLUS) -std=c++11 -stdlib=libc++ $(INCLUDEDIRS) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< else -LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -lfmod-3.75 -L$(CFG) vgui.so -L. libSDL2-2.0.so.0 -L. libparticleMP.a +LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -lfmod-3.75 -L$(CFG) vgui.so -L. libSDL2-2.0.so.0 -L. libparticleMP.a # -lpng -lz DO_CC=$(CPLUS) $(INCLUDEDIRS) $(CFLAGS) -o $@ -c $< DO_PUBLIC_CC=$(CPLUS) $(COMMON_INCLUDEDIRS) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< @@ -109,6 +109,7 @@ HL1_OBJS = \ $(HL1_OBJ_DIR)/util.o \ $(HL1_OBJ_DIR)/health.o \ $(HL1_OBJ_DIR)/demo.o \ + $(HL1_OBJ_DIR)/glew.o \ MOD_OBJS = \ $(NS_MOD_OBJ_DIR)/AvHAcidRocketGun.o \ @@ -247,7 +248,6 @@ UI_OBJS = \ UTIL_OBJS = \ $(UTIL_OBJ_DIR)/Balance.o \ $(UTIL_OBJ_DIR)/Checksum.o \ - #$(UTIL_OBJ_DIR)/GammaTable.o \ $(UTIL_OBJ_DIR)/LinuxSupport.o \ $(UTIL_OBJ_DIR)/Mat3.o \ $(UTIL_OBJ_DIR)/MathUtil.o \ @@ -319,6 +319,9 @@ $(HL1_OBJ_DIR)/%.o: $(HL_SRC_DIR)/dlls/wpn_shared/%.cpp $(filter-out $(wildcard $(HL1_OBJ_DIR)/%.o: $(HL_SRC_DIR)/VGUI/%.cpp $(filter-out $(wildcard $(HL1_OBJ_DIR)), $(HL1_OBJ_DIR)) $(DO_CC) +$(HL1_OBJ_DIR)/%.o: $(SOURCE_DIR)/includes/glew/GL/%.c $(filter-out $(wildcard $(HL1_OBJ_DIR)), $(HL1_OBJ_DIR)) + $(DO_CC) + $(PUBLIC_OBJ_DIR)/%.o : $(PUBLIC_SRC_DIR)/%.cpp $(filter-out $(wildcard $(PUBLIC_OBJ_DIR)), $(PUBLIC_OBJ_DIR)) $(DO_PUBLIC_CC)