From aa7b5dc5cab90ddbd10855e9038a0fda5b29d717 Mon Sep 17 00:00:00 2001
From: Jonathan Poncelet <jonathan.poncelet@talk21.com>
Date: Wed, 30 Oct 2019 09:28:15 +0000
Subject: [PATCH] Build: Fixed issues on Windows

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.
---
 .gitignore     |  4 ++++
 cl_dll/wscript | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index adcc4f7b..3d6ad540 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,9 @@ cmake_install.cmake
 *.vsproj
 *.sln
 .waf-*
+waf-*
+.waf3-*
+waf3-*
 .lock*
 *.pyc
+.vscode/
\ No newline at end of file
diff --git a/cl_dll/wscript b/cl_dll/wscript
index fb14661d..02a9d530 100644
--- a/cl_dll/wscript
+++ b/cl_dll/wscript
@@ -4,15 +4,17 @@
 
 from waflib import Utils
 import os
- 
+
 def options(opt):
 	# stub
 	return
 
 def configure(conf):
-	if conf.env.GOLDSRC:
-		if conf.env.DEST_OS != 'win32':
-			conf.check_cc(lib='dl')
+	if conf.env.GOLDSRC and conf.env.DEST_OS != 'win32':
+		conf.check_cc(lib='dl')
+
+	if conf.env.DEST_OS == 'win32':
+		conf.check_cxx( lib='user32' )
 
 def build(bld):
 	source = bld.path.parent.ant_glob([
@@ -45,9 +47,12 @@ def build(bld):
 		defines += ['GOLDSOURCE_SUPPORT']
 
 	libs = []
-	if bld.env.GOLDSRC:
+	if bld.env.GOLDSRC and bld.env.DEST_OS != 'win32':
 		libs += ['DL']
 
+	if bld.env.DEST_OS == 'win32':
+		libs += ["USER32"]
+
 	if bld.env.DEST_OS not in ['android']:
 		install_path = os.path.join(bld.env.GAMEDIR, bld.env.CLIENT_DIR)
 	else: