Makefile Mac build fix #284
This commit is contained in:
28
Makefile
28
Makefile
@@ -167,24 +167,18 @@ OBJS += ui/welcome.o
|
|||||||
OBJS += version.o
|
OBJS += version.o
|
||||||
OBJS += main.o
|
OBJS += main.o
|
||||||
|
|
||||||
ifeq ($(OS), Windows_NT)
|
ifeq ($(OS), Windows_NT) # windows
|
||||||
TOP := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
|
TOP := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
|
||||||
else
|
RM = del /Q
|
||||||
TOP := $(shell pwd)
|
FixPath = $(subst /,\,$1)
|
||||||
endif
|
WHERE = where
|
||||||
|
NULL_OUTPUT = nul
|
||||||
ifdef OS # windows
|
|
||||||
RM = del /Q
|
|
||||||
FixPath = $(subst /,\,$1)
|
|
||||||
WHERE = where
|
|
||||||
NULL_OUTPUT = nul
|
|
||||||
else # unix
|
else # unix
|
||||||
ifeq ($(shell uname), Linux)
|
TOP := $(shell pwd)
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
FixPath = $1
|
FixPath = $1
|
||||||
WHERE = which
|
WHERE = which
|
||||||
NULL_OUTPUT = /dev/null
|
NULL_OUTPUT = /dev/null
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AS = arm-none-eabi-gcc
|
AS = arm-none-eabi-gcc
|
||||||
|
Reference in New Issue
Block a user