Skip to content

Commit

Permalink
Merge remote-tracking branch 'Half-LifeUpdated/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoelTroch committed Sep 1, 2024
2 parents 332eec2 + e7a39c7 commit bb692fc
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,14 @@ Can't be fixed:

# Half-Life Updated changelog

## Changes in V1.1.1

> Note: this update has not been released yet.
### Bug fixes

* Link Linux binaries with `-Wl` and `--no-undefined` flags to avoid situations where something was referenced but wasn't added in the build (Thanks a1batross)

## Changes in V1.1.0

### Bug Fixes
Expand Down
1 change: 1 addition & 0 deletions FULL_UPDATED_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ Fixes for bugs introduced in beta builds are not included in this list.
* Disabled GCC optimization that prevents mod dlls from unloading after engine calls dlclose
* Fixed third party libraries possibly not being linked to when building Linux server dll (Thanks a1batross)
* Mods made with this SDK will now shut down if they detect they are being run from a Valve game directory (e.g. by placing the dlls in `Half-Life/valve/cl_dlls` and `Half-Life/valve/dlls`). This is not supported and puts users at risk of being VAC banned. Run mods from their intended location only
* Link Linux binaries with `-Wl` and `--no-undefined` flags to avoid situations where something was referenced but wasn't added in the build (Thanks a1batross)

## Git repository changes

Expand Down
4 changes: 2 additions & 2 deletions linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ endif
SHLIBEXT=so
SHLIBCFLAGS=
ifeq "$(CFG)" "release"
SHLIBLDFLAGS="-shared -Wl,-Map,$@_map.txt"
SHLIBLDFLAGS="-shared -Wl,-Map,$@_map.txt -Wl,--no-undefined"
else
SHLIBLDFLAGS="-shared -gdwarf-2 -g2 -Wl,-Map,$@_map.txt"
SHLIBLDFLAGS="-shared -gdwarf-2 -g2 -Wl,-Map,$@_map.txt -Wl,--no-undefined"
endif

AR=ar
Expand Down
2 changes: 2 additions & 0 deletions linux/Makefile.hldll
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,11 @@ HLDLL_OBJS = \
$(HLDLL_OBJ_DIR)/gargantua.o \
$(HLDLL_OBJ_DIR)/gauss.o \
$(HLDLL_OBJ_DIR)/genericmonster.o \
$(HLDLL_OBJ_DIR)/geneworm.o \
$(HLDLL_OBJ_DIR)/ggrenade.o \
$(HLDLL_OBJ_DIR)/glock.o \
$(HLDLL_OBJ_DIR)/gman.o \
$(HLDLL_OBJ_DIR)/gonome.o \
$(HLDLL_OBJ_DIR)/h_ai.o \
$(HLDLL_OBJ_DIR)/h_battery.o \
$(HLDLL_OBJ_DIR)/h_cine.o \
Expand Down

0 comments on commit bb692fc

Please sign in to comment.