Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Windows support with some fixes #692

Merged
merged 1 commit into from
Oct 24, 2021
Merged

Improve Windows support with some fixes #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions npm-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,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)
{
Expand Down
10 changes: 8 additions & 2 deletions worker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down