Merge pull request #692 from nazar-pc/windows-support-fixes

Improve Windows support with some fixes

npm-scripts.js

@@ -179,19 +179,7 @@ function execute(command)
 
 	try
 	{
-		// Set MSVC compiler as default on Windows
-		const env = isWindows ? {
-			CC  : process.env.CC || 'cl',
-			CXX : process.env.CXX || 'cl',
-			...process.env
-		} : process.env;
-
-		execSync(
-			command,
-			{
-				env   : env,
-				stdio : [ 'ignore', process.stdout, process.stderr ]
-			});
+		execSync(command, { stdio: [ 'ignore', process.stdout, process.stderr ] });
 	}
 	catch (error)
 	{

worker/Makefile

@@ -25,10 +25,16 @@ ifeq ($(OS),Windows_NT)
 	# Windows is, of course, special.
 	export NINJA = $(PIP_DIR)/bin/ninja.exe
 else
-    export NINJA = $(PIP_DIR)/bin/ninja
+	export NINJA = $(PIP_DIR)/bin/ninja
 endif
+
 # Instruct Python where to look for modules it needs, such that `meson` actually runs from installed location.
-export PYTHONPATH := $(PIP_DIR):${PYTHONPATH}
+# For some reason on Windows adding `:${PYTHONPATH}` breaks things.
+ifeq ($(OS),Windows_NT)
+	export PYTHONPATH := $(PIP_DIR)
+else
+	export PYTHONPATH := $(PIP_DIR):${PYTHONPATH}
+endif
 
 .PHONY:	\
 	default meson-ninja setup clean clean-pip clean-subprojects clean-all mediasoup-worker xcode lint format test tidy \