Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

Commit

Permalink
waf: upgrade to waifu 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
a1batross committed Feb 28, 2021
1 parent dc77431 commit a7103c1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
12 changes: 6 additions & 6 deletions waf

Large diffs are not rendered by default.

15 changes: 3 additions & 12 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def configure(conf):
conf.env.SERVER_NAME = 'hl'
conf.env.PREFIX = ''

conf.load('fwgslib reconfigure')
conf.load('fwgslib reconfigure enforce_pic')

enforce_pic = True # modern defaults
valid_build_types = ['fastnative', 'fast', 'release', 'debug', 'nooptimize', 'sanitize', 'none']
Expand Down Expand Up @@ -114,17 +114,8 @@ def configure(conf):
conf.env.MAGX = conf.options.MAGX
if conf.options.MAGX:
enforce_pic = False

if enforce_pic:
# Every static library must have fPIC
if conf.env.DEST_OS != 'win32' and '-fPIC' in conf.env.CFLAGS_cshlib:
conf.env.append_unique('CFLAGS_cstlib', '-fPIC')
conf.env.append_unique('CXXFLAGS_cxxstlib', '-fPIC')
else:
conf.env.CFLAGS_cshlib.remove('-fPIC')
conf.env.CXXFLAGS_cxxshlib.remove('-fPIC')
conf.env.CFLAGS_MACBUNDLE.remove('-fPIC')
conf.env.CXXFLAGS_MACBUNDLE.remove('-fPIC')

conf.check_pic(enforce_pic)

# We restrict 64-bit builds ONLY for Win/Linux/OSX running on Intel architecture
# Because compatibility with original GoldSrc
Expand Down

0 comments on commit a7103c1

Please sign in to comment.