Merge pull request #49 from jakcron/master

Merge changes into nstool-1.0 branch.
This commit is contained in:
Jack 2018-09-26 21:45:22 +08:00 committed by GitHub
commit 8bb759292d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions

View file

@ -33,7 +33,7 @@ else
endif endif
# Output # Output
OUTPUT = $(shell basename $(CURDIR)).a OUTPUT = $(shell basename "$(CURDIR)").a
main: build main: build

View file

@ -33,7 +33,7 @@ else
endif endif
# Output # Output
OUTPUT = $(shell basename $(CURDIR)).a OUTPUT = $(shell basename "$(CURDIR)").a
main: build main: build

View file

@ -33,7 +33,7 @@ else
endif endif
# Output # Output
OUTPUT = $(shell basename $(CURDIR)).a OUTPUT = $(shell basename "$(CURDIR)").a
main: build main: build

View file

@ -33,7 +33,7 @@ else
endif endif
# Output # Output
OUTPUT = $(shell basename $(CURDIR)).a OUTPUT = $(shell basename "$(CURDIR)").a
main: build main: build

View file

@ -32,7 +32,7 @@ else
endif endif
# Output # Output
OUTPUT = $(shell basename $(CURDIR)).a OUTPUT = $(shell basename "$(CURDIR)").a
main: build main: build

View file

@ -32,7 +32,7 @@ else
endif endif
# Output # Output
OUTPUT = $(shell basename $(CURDIR)).a OUTPUT = $(shell basename "$(CURDIR)").a
main: build main: build

View file

@ -32,7 +32,7 @@ else
endif endif
# Output # Output
OUTPUT = $(shell basename $(CURDIR)).a OUTPUT = $(shell basename "$(CURDIR)").a
main: build main: build

View file

@ -1,4 +1,4 @@
PROJECT_DIR = $(CURDIR) PROJECT_DIR = "$(CURDIR)"
LIB_DIR = $(PROJECT_DIR)/lib LIB_DIR = $(PROJECT_DIR)/lib
PROGRAM_DIR = $(PROJECT_DIR)/programs PROGRAM_DIR = $(PROJECT_DIR)/programs
BIN_DIR = $(PROJECT_DIR)/bin BIN_DIR = $(PROJECT_DIR)/bin