mirror of
https://github.com/pret/pokediamond.git
synced 2026-03-21 17:54:29 -05:00
actually fix wsl2
This commit is contained in:
parent
bac9a29097
commit
7c672a8340
3
Makefile
3
Makefile
|
|
@ -59,9 +59,6 @@ endif
|
||||||
|
|
||||||
ifeq ($(NOWINE),1)
|
ifeq ($(NOWINE),1)
|
||||||
WINE :=
|
WINE :=
|
||||||
WINPATH := wslpath
|
|
||||||
else
|
|
||||||
WINPATH := winepath
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
################ Target Executable and Sources ###############
|
################ Target Executable and Sources ###############
|
||||||
|
|
|
||||||
|
|
@ -23,9 +23,17 @@ default: all
|
||||||
# If you are using WSL, it is recommended you build with NOWINE=1.
|
# If you are using WSL, it is recommended you build with NOWINE=1.
|
||||||
WSLENV ?= no
|
WSLENV ?= no
|
||||||
ifeq ($(WSLENV),no)
|
ifeq ($(WSLENV),no)
|
||||||
NOWINE = 0
|
NOWINE = 0
|
||||||
else
|
else
|
||||||
NOWINE = 1
|
# As of build 17063, WSLENV is defined in both WSL1 and WSL2
|
||||||
|
# so we need to use the kernel release to detect between
|
||||||
|
# the two.
|
||||||
|
UNAME_R := $(shell uname -r)
|
||||||
|
ifeq ($(findstring WSL2,$(UNAME_R)),)
|
||||||
|
NOWINE = 1
|
||||||
|
else
|
||||||
|
NOWINE = 0
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,17 @@ default: all
|
||||||
# If you are using WSL, it is recommended you build with NOWINE=1.
|
# If you are using WSL, it is recommended you build with NOWINE=1.
|
||||||
WSLENV ?= no
|
WSLENV ?= no
|
||||||
ifeq ($(WSLENV),no)
|
ifeq ($(WSLENV),no)
|
||||||
NOWINE = 0
|
NOWINE = 0
|
||||||
else
|
else
|
||||||
NOWINE = 1
|
# As of build 17063, WSLENV is defined in both WSL1 and WSL2
|
||||||
|
# so we need to use the kernel release to detect between
|
||||||
|
# the two.
|
||||||
|
UNAME_R := $(shell uname -r)
|
||||||
|
ifeq ($(findstring WSL2,$(UNAME_R)),)
|
||||||
|
NOWINE = 1
|
||||||
|
else
|
||||||
|
NOWINE = 0
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,17 @@ endif
|
||||||
# If you are using WSL, it is recommended you build with NOWINE=1.
|
# If you are using WSL, it is recommended you build with NOWINE=1.
|
||||||
WSLENV ?= no
|
WSLENV ?= no
|
||||||
ifeq ($(WSLENV),no)
|
ifeq ($(WSLENV),no)
|
||||||
NOWINE = 0
|
NOWINE = 0
|
||||||
else
|
else
|
||||||
NOWINE = 1
|
# As of build 17063, WSLENV is defined in both WSL1 and WSL2
|
||||||
|
# so we need to use the kernel release to detect between
|
||||||
|
# the two.
|
||||||
|
UNAME_R := $(shell uname -r)
|
||||||
|
ifeq ($(findstring WSL2,$(UNAME_R)),)
|
||||||
|
NOWINE = 1
|
||||||
|
else
|
||||||
|
NOWINE = 0
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,17 @@ endif
|
||||||
# If you are using WSL, it is recommended you build with NOWINE=1.
|
# If you are using WSL, it is recommended you build with NOWINE=1.
|
||||||
WSLENV ?= no
|
WSLENV ?= no
|
||||||
ifeq ($(WSLENV),no)
|
ifeq ($(WSLENV),no)
|
||||||
NOWINE = 0
|
NOWINE = 0
|
||||||
else
|
else
|
||||||
NOWINE = 1
|
# As of build 17063, WSLENV is defined in both WSL1 and WSL2
|
||||||
|
# so we need to use the kernel release to detect between
|
||||||
|
# the two.
|
||||||
|
UNAME_R := $(shell uname -r)
|
||||||
|
ifeq ($(findstring WSL2,$(UNAME_R)),)
|
||||||
|
NOWINE = 1
|
||||||
|
else
|
||||||
|
NOWINE = 0
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,17 @@ endif
|
||||||
# If you are using WSL, it is recommended you build with NOWINE=1.
|
# If you are using WSL, it is recommended you build with NOWINE=1.
|
||||||
WSLENV ?= no
|
WSLENV ?= no
|
||||||
ifeq ($(WSLENV),no)
|
ifeq ($(WSLENV),no)
|
||||||
NOWINE = 0
|
NOWINE = 0
|
||||||
else
|
else
|
||||||
NOWINE = 1
|
# As of build 17063, WSLENV is defined in both WSL1 and WSL2
|
||||||
|
# so we need to use the kernel release to detect between
|
||||||
|
# the two.
|
||||||
|
UNAME_R := $(shell uname -r)
|
||||||
|
ifeq ($(findstring WSL2,$(UNAME_R)),)
|
||||||
|
NOWINE = 1
|
||||||
|
else
|
||||||
|
NOWINE = 0
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,17 @@ endif
|
||||||
# If you are using WSL, it is recommended you build with NOWINE=1.
|
# If you are using WSL, it is recommended you build with NOWINE=1.
|
||||||
WSLENV ?= no
|
WSLENV ?= no
|
||||||
ifeq ($(WSLENV),no)
|
ifeq ($(WSLENV),no)
|
||||||
NOWINE = 0
|
NOWINE = 0
|
||||||
else
|
else
|
||||||
NOWINE = 1
|
# As of build 17063, WSLENV is defined in both WSL1 and WSL2
|
||||||
|
# so we need to use the kernel release to detect between
|
||||||
|
# the two.
|
||||||
|
UNAME_R := $(shell uname -r)
|
||||||
|
ifeq ($(findstring WSL2,$(UNAME_R)),)
|
||||||
|
NOWINE = 1
|
||||||
|
else
|
||||||
|
NOWINE = 0
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user