YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-11 15:38:12 +00:00
Code Issues Projects Releases Wiki Activity

Build: Fixed issues on Windows

Browse Source 
in_camera.o wouldn't link because of unresolved
symbols relating to getting/setting the cursor
position, so user32.lib was added as a dependency.
The gitignore was also missing ignore rules for
different waf folder name variations, and the
.vscode directory for people (like me) who use
VS Code.
This commit is contained in:
Jonathan Poncelet 2019-10-30 09:28:15 +00:00 committed by Alibek Omarov
parent b00170a0a2
commit aa7b5dc5ca
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -18,5 +18,9 @@ cmake_install.cmake
*.vsproj *.vsproj
*.sln *.sln
.waf-* .waf-*
waf-*
.waf3-*
waf3-*
.lock* .lock*
*.pyc *.pyc
.vscode/

15
cl_dll/wscript
View File

@ -4,15 +4,17 @@
from waflib import Utils from waflib import Utils
import os import os
def options(opt): def options(opt):
# stub # stub
return return
def configure(conf): def configure(conf):
if conf.env.GOLDSRC: if conf.env.GOLDSRC and conf.env.DEST_OS != 'win32':
if conf.env.DEST_OS != 'win32': conf.check_cc(lib='dl')
conf.check_cc(lib='dl')
if conf.env.DEST_OS == 'win32':
conf.check_cxx( lib='user32' )
def build(bld): def build(bld):
source = bld.path.parent.ant_glob([ source = bld.path.parent.ant_glob([
@ -45,9 +47,12 @@ def build(bld):
defines += ['GOLDSOURCE_SUPPORT'] defines += ['GOLDSOURCE_SUPPORT']
libs = [] libs = []
if bld.env.GOLDSRC: if bld.env.GOLDSRC and bld.env.DEST_OS != 'win32':
libs += ['DL'] libs += ['DL']
if bld.env.DEST_OS == 'win32':
libs += ["USER32"]
if bld.env.DEST_OS not in ['android']: if bld.env.DEST_OS not in ['android']:
install_path = os.path.join(bld.env.GAMEDIR, bld.env.CLIENT_DIR) install_path = os.path.join(bld.env.GAMEDIR, bld.env.CLIENT_DIR)
else: else: