summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-06-29 00:10:09 +0800
committerruki <[email protected]>2021-06-29 00:10:09 +0800
commit086e0afb0c5ca2de85231a0cc4b6f52c93508d09 (patch)
tree8dc72d0ae830a8564f31eb62270a1f86d8710fb3
parent61147dc43fd140910c6e1ebfd8efd58d7acce78a (diff)
fix trailing spaces
-rw-r--r--core/makefile30
-rw-r--r--core/plat/bsd/prefix.mak42
-rw-r--r--core/plat/cygwin/prefix.mak42
-rw-r--r--core/plat/linux/prefix.mak42
-rw-r--r--core/plat/mingw/prefix.mak46
-rw-r--r--core/plat/msys/prefix.mak42
-rw-r--r--core/src/demo/makefile4
-rw-r--r--core/src/lcurses/makefile2
-rw-r--r--core/src/lua-cjson/makefile2
-rw-r--r--core/src/sv/makefile2
-rw-r--r--core/src/tbox/makefile6
-rw-r--r--core/src/xmake/makefile4
-rw-r--r--tests/projects/c/Unicode 测试/test.luabin354 -> 176 bytes
-rw-r--r--tests/projects/c/Unicode 测试/xmake.luabin620 -> 349 bytes
-rw-r--r--tests/projects/other/multiplats_vs/test.lua2
-rw-r--r--xmake/modules/detect/packages/find_mkl.lua146
-rw-r--r--xmake/modules/detect/packages/find_tbb.lua122
-rw-r--r--xmake/rules/qt/install/windows.lua2
18 files changed, 268 insertions, 268 deletions
diff --git a/core/makefile b/core/makefile
index 1a9017980..a5e59f39c 100644
--- a/core/makefile
+++ b/core/makefile
@@ -86,7 +86,7 @@ include project.mak
# ######################################################################################
# no-config
# #
-all :
+all :
make -r f
make -r r
@@ -107,9 +107,9 @@ update :
make -r f
make -r u
-output :
-error :
-warning :
+output :
+error :
+warning :
doc :
make -r f
make -r d
@@ -227,8 +227,8 @@ TOOL_DIR := $(PRO_DIR)/tool
CXFLAG := $(if $(CXFLAG),$(CXFLAG),)
# ccache
-CCACHE :=
-DISTCC :=
+CCACHE :=
+DISTCC :=
# sed
ifeq ($(HOST),macosx)
@@ -256,7 +256,7 @@ SHELL = bash
endif
ECHO := echo -e
-# make upper
+# make upper
define MAKE_UPPER
${shell echo $(1) | $(SEDX) "s/\(.*\)/\U\1/g"}
endef
@@ -268,15 +268,15 @@ base_LIBNAMES := curses readline m dl pthread
endif
ifeq ($(PLAT),windows)
-base_LIBPATH :=
+base_LIBPATH :=
base_LIBNAMES := ws2_32
endif
ifeq ($(PLAT),linux)
base_LIBPATH :=
-base_LIBNAMES :=
-base_LIBNAMES += $(shell if { cat detect/curses.c | $(CC) -xc - -lcurses -ltinfo -o /dev/null 2>/dev/null; }; then echo curses tinfo; fi )
-base_LIBNAMES += $(shell if { cat detect/readline.c | $(CC) -xc - -lreadline -o /dev/null 2>/dev/null; }; then echo readline; fi )
+base_LIBNAMES :=
+base_LIBNAMES += $(shell if { cat detect/curses.c | $(CC) -xc - -lcurses -ltinfo -o /dev/null 2>/dev/null; }; then echo curses tinfo; fi )
+base_LIBNAMES += $(shell if { cat detect/readline.c | $(CC) -xc - -lreadline -o /dev/null 2>/dev/null; }; then echo readline; fi )
ifneq ($(TERMUX_ARCH),) # on termux/ci?
base_LIBNAMES += m dl
else
@@ -286,16 +286,16 @@ endif
ifeq ($(PLAT),bsd)
base_LIBPATH :=
-base_LIBNAMES :=
-base_LIBNAMES += $(shell if { cat detect/curses.c | $(CC) -xc - -lcurses -ltinfo -o /dev/null 2>/dev/null; }; then echo curses tinfo; fi )
-base_LIBNAMES += $(shell if { cat detect/readline.c | $(CC) -xc - -lreadline -o /dev/null 2>/dev/null; }; then echo readline; fi )
+base_LIBNAMES :=
+base_LIBNAMES += $(shell if { cat detect/curses.c | $(CC) -xc - -lcurses -ltinfo -o /dev/null 2>/dev/null; }; then echo curses tinfo; fi )
+base_LIBNAMES += $(shell if { cat detect/readline.c | $(CC) -xc - -lreadline -o /dev/null 2>/dev/null; }; then echo readline; fi )
base_LIBNAMES += m dl pthread
endif
# check jit compiler
ifeq ($(PLAT),linux)
luajit_JIT :=$(shell if [ -f "/etc/redhat-release" ]; then echo "nojit"; else echo "jit"; fi )
-ifeq ($(BUILD_ARCH),mips64) # maybe it is not very stable yet, we need to disable it
+ifeq ($(BUILD_ARCH),mips64) # maybe it is not very stable yet, we need to disable it
luajit_JIT :=nojit
endif
else
diff --git a/core/plat/bsd/prefix.mak b/core/plat/bsd/prefix.mak
index d0ea68d52..cee3a4406 100644
--- a/core/plat/bsd/prefix.mak
+++ b/core/plat/bsd/prefix.mak
@@ -1,10 +1,10 @@
# architecture makefile configure
# prefix & suffix
-BIN_PREFIX =
+BIN_PREFIX =
BIN_SUFFIX = .b
-OBJ_PREFIX =
+OBJ_PREFIX =
OBJ_SUFFIX = .o
LIB_PREFIX = lib
@@ -24,7 +24,7 @@ LD := $(if $(CC),$(CC),$(PRE_)gcc) # we do not use ld directly
AR := $(if $(AR),$(AR),$(PRE_)ar)
STRIP := $(if $(STRIP),$(STRIP),$(PRE_)strip)
RANLIB := $(if $(RANLIB),$(RANLIB),$(PRE_)ranlib)
-AS := $(CC)
+AS := $(CC)
RM = rm -f
RMDIR = rm -rf
CP = cp
@@ -40,7 +40,7 @@ AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring i386,$(BUILD_ARCH)),-
ifneq ($(AHFLAGS),)
ifeq ($(CXFLAGS_CHECK),)
CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi }
-CXFLAGS_CHECK :=
+CXFLAGS_CHECK :=
export CXFLAGS_CHECK
endif
@@ -52,9 +52,9 @@ endif
endif
# cxflags: .c/.cc/.cpp files
-CXFLAGS_RELEASE =
+CXFLAGS_RELEASE =
CXFLAGS_DEBUG = -g -D__tb_debug__
-CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
+CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
CXFLAGS-I = -I
CXFLAGS-o = -o
@@ -70,28 +70,28 @@ endif
# profile
ifeq ($(PROF),y)
-CXFLAGS += -g -pg -fno-omit-frame-pointer
+CXFLAGS += -g -pg -fno-omit-frame-pointer
else
-CXFLAGS_RELEASE += -fomit-frame-pointer
+CXFLAGS_RELEASE += -fomit-frame-pointer
CXFLAGS_DEBUG += -fno-omit-frame-pointer
endif
# cflags: .c files
-CFLAGS_RELEASE =
-CFLAGS_DEBUG =
+CFLAGS_RELEASE =
+CFLAGS_DEBUG =
CFLAGS := $(CFLAGS) \
-std=gnu99 \
-D_GNU_SOURCE=1 -D_REENTRANT \
- -fno-math-errno
+ -fno-math-errno
# ccflags: .cc/.cpp files
CCFLAGS_RELEASE = -fno-rtti
-CCFLAGS_DEBUG =
+CCFLAGS_DEBUG =
CCFLAGS := $(CXXFLAGS) -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
# ldflags
-LDFLAGS_RELEASE =
-LDFLAGS_DEBUG = -rdynamic
+LDFLAGS_RELEASE =
+LDFLAGS_DEBUG = -rdynamic
LDFLAGS := $(LDFLAGS) $(AHFLAGS) $(LDFLAGS_CHECK)
LDFLAGS-L = -L
LDFLAGS-l = -l
@@ -100,24 +100,24 @@ LDFLAGS-o = -o
# prof
ifeq ($(PROF),y)
-LDFLAGS += -pg
+LDFLAGS += -pg
else
LDFLAGS_RELEASE += -s
-LDFLAGS_DEBUG +=
+LDFLAGS_DEBUG +=
endif
# asflags
-ASFLAGS_RELEASE =
-ASFLAGS_DEBUG =
+ASFLAGS_RELEASE =
+ASFLAGS_DEBUG =
ASFLAGS = -c $(AHFLAGS)
ASFLAGS-I = -I
ASFLAGS-o = -o
# arflags
-ARFLAGS_RELEASE =
-ARFLAGS_DEBUG =
+ARFLAGS_RELEASE =
+ARFLAGS_DEBUG =
ARFLAGS = -cr
-ARFLAGS-o =
+ARFLAGS-o =
# shflags
SHFLAGS_RELEASE = -s
diff --git a/core/plat/cygwin/prefix.mak b/core/plat/cygwin/prefix.mak
index fc7ac9c30..1eacbda9a 100644
--- a/core/plat/cygwin/prefix.mak
+++ b/core/plat/cygwin/prefix.mak
@@ -1,10 +1,10 @@
# architecture makefile configure
# prefix & suffix
-BIN_PREFIX =
+BIN_PREFIX =
BIN_SUFFIX = .b
-OBJ_PREFIX =
+OBJ_PREFIX =
OBJ_SUFFIX = .o
LIB_PREFIX = lib
@@ -24,7 +24,7 @@ LD = $(PRE_)gcc
AR = $(PRE_)ar
STRIP = $(PRE_)strip
RANLIB = $(PRE_)ranlib
-AS = $(CC)
+AS = $(CC)
RM = rm -f
RMDIR = rm -rf
CP = cp
@@ -40,7 +40,7 @@ AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring i386,$(BUILD_ARCH)),-
ifneq ($(AHFLAGS),)
ifeq ($(CXFLAGS_CHECK),)
CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi }
-CXFLAGS_CHECK :=
+CXFLAGS_CHECK :=
export CXFLAGS_CHECK
endif
@@ -52,9 +52,9 @@ endif
endif
# cxflags: .c/.cc/.cpp files
-CXFLAGS_RELEASE =
+CXFLAGS_RELEASE =
CXFLAGS_DEBUG = -g -D__tb_debug__
-CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
+CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
CXFLAGS-I = -I
CXFLAGS-o = -o
@@ -70,28 +70,28 @@ endif
# profile
ifeq ($(PROF),y)
-CXFLAGS += -g -pg -fno-omit-frame-pointer
+CXFLAGS += -g -pg -fno-omit-frame-pointer
else
-CXFLAGS_RELEASE += -fomit-frame-pointer
+CXFLAGS_RELEASE += -fomit-frame-pointer
CXFLAGS_DEBUG += -fno-omit-frame-pointer
endif
# cflags: .c files
-CFLAGS_RELEASE =
-CFLAGS_DEBUG =
+CFLAGS_RELEASE =
+CFLAGS_DEBUG =
CFLAGS = \
-std=gnu99 \
-D_GNU_SOURCE=1 -D_REENTRANT \
- -fno-math-errno
+ -fno-math-errno
# ccflags: .cc/.cpp files
CCFLAGS_RELEASE = -fno-rtti
-CCFLAGS_DEBUG =
+CCFLAGS_DEBUG =
CCFLAGS = -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
# ldflags
-LDFLAGS_RELEASE =
-LDFLAGS_DEBUG =
+LDFLAGS_RELEASE =
+LDFLAGS_DEBUG =
LDFLAGS = $(AHFLAGS) $(LDFLAGS_CHECK) -static-libgcc
LDFLAGS-L = -L
LDFLAGS-l = -l
@@ -100,24 +100,24 @@ LDFLAGS-o = -o
# prof
ifeq ($(PROF),y)
-LDFLAGS += -pg
+LDFLAGS += -pg
else
LDFLAGS_RELEASE += -s
-LDFLAGS_DEBUG +=
+LDFLAGS_DEBUG +=
endif
# asflags
-ASFLAGS_RELEASE =
-ASFLAGS_DEBUG =
+ASFLAGS_RELEASE =
+ASFLAGS_DEBUG =
ASFLAGS = -c $(AHFLAGS)
ASFLAGS-I = -I
ASFLAGS-o = -o
# arflags
-ARFLAGS_RELEASE =
-ARFLAGS_DEBUG =
+ARFLAGS_RELEASE =
+ARFLAGS_DEBUG =
ARFLAGS = -cr
-ARFLAGS-o =
+ARFLAGS-o =
# shflags
SHFLAGS_RELEASE = -s
diff --git a/core/plat/linux/prefix.mak b/core/plat/linux/prefix.mak
index 0bb741c0e..662187051 100644
--- a/core/plat/linux/prefix.mak
+++ b/core/plat/linux/prefix.mak
@@ -1,10 +1,10 @@
# architecture makefile configure
# prefix & suffix
-BIN_PREFIX =
+BIN_PREFIX =
BIN_SUFFIX = .b
-OBJ_PREFIX =
+OBJ_PREFIX =
OBJ_SUFFIX = .o
LIB_PREFIX = lib
@@ -24,7 +24,7 @@ LD := $(if $(CC),$(CC),$(PRE_)gcc) # we do not use ld directly
AR := $(if $(AR),$(AR),$(PRE_)ar)
STRIP := $(if $(STRIP),$(STRIP),$(PRE_)strip)
RANLIB := $(if $(RANLIB),$(RANLIB),$(PRE_)ranlib)
-AS := $(CC)
+AS := $(CC)
RM = rm -f
RMDIR = rm -rf
CP = cp
@@ -40,7 +40,7 @@ AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring i386,$(BUILD_ARCH)),-
ifneq ($(AHFLAGS),)
ifeq ($(CXFLAGS_CHECK),)
CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi }
-CXFLAGS_CHECK :=
+CXFLAGS_CHECK :=
export CXFLAGS_CHECK
endif
@@ -52,9 +52,9 @@ endif
endif
# cxflags: .c/.cc/.cpp files
-CXFLAGS_RELEASE =
+CXFLAGS_RELEASE =
CXFLAGS_DEBUG = -g -D__tb_debug__
-CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
+CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
CXFLAGS-I = -I
CXFLAGS-o = -o
@@ -70,28 +70,28 @@ endif
# profile
ifeq ($(PROF),y)
-CXFLAGS += -g -pg -fno-omit-frame-pointer
+CXFLAGS += -g -pg -fno-omit-frame-pointer
else
-CXFLAGS_RELEASE += -fomit-frame-pointer
+CXFLAGS_RELEASE += -fomit-frame-pointer
CXFLAGS_DEBUG += -fno-omit-frame-pointer
endif
# cflags: .c files
-CFLAGS_RELEASE =
-CFLAGS_DEBUG =
+CFLAGS_RELEASE =
+CFLAGS_DEBUG =
CFLAGS := $(CFLAGS) \
-std=gnu99 \
-D_GNU_SOURCE=1 -D_REENTRANT \
- -fno-math-errno
+ -fno-math-errno
# ccflags: .cc/.cpp files
CCFLAGS_RELEASE = -fno-rtti
-CCFLAGS_DEBUG =
+CCFLAGS_DEBUG =
CCFLAGS := $(CXXFLAGS) -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
# ldflags
-LDFLAGS_RELEASE =
-LDFLAGS_DEBUG = -rdynamic
+LDFLAGS_RELEASE =
+LDFLAGS_DEBUG = -rdynamic
LDFLAGS := $(LDFLAGS) $(AHFLAGS) $(LDFLAGS_CHECK)
LDFLAGS-L = -L
LDFLAGS-l = -l
@@ -100,24 +100,24 @@ LDFLAGS-o = -o
# prof
ifeq ($(PROF),y)
-LDFLAGS += -pg
+LDFLAGS += -pg
else
LDFLAGS_RELEASE += -s
-LDFLAGS_DEBUG +=
+LDFLAGS_DEBUG +=
endif
# asflags
-ASFLAGS_RELEASE =
-ASFLAGS_DEBUG =
+ASFLAGS_RELEASE =
+ASFLAGS_DEBUG =
ASFLAGS = -c $(AHFLAGS)
ASFLAGS-I = -I
ASFLAGS-o = -o
# arflags
-ARFLAGS_RELEASE =
-ARFLAGS_DEBUG =
+ARFLAGS_RELEASE =
+ARFLAGS_DEBUG =
ARFLAGS = -cr
-ARFLAGS-o =
+ARFLAGS-o =
# shflags
SHFLAGS_RELEASE = -s
diff --git a/core/plat/mingw/prefix.mak b/core/plat/mingw/prefix.mak
index 0ad1f2ef0..c190bdb42 100644
--- a/core/plat/mingw/prefix.mak
+++ b/core/plat/mingw/prefix.mak
@@ -1,16 +1,16 @@
# architecture makefile configure
# prefix & suffix
-BIN_PREFIX =
+BIN_PREFIX =
BIN_SUFFIX = .b
-OBJ_PREFIX =
+OBJ_PREFIX =
OBJ_SUFFIX = .obj
-LIB_PREFIX =
+LIB_PREFIX =
LIB_SUFFIX = .lib
-DLL_PREFIX =
+DLL_PREFIX =
DLL_SUFFIX = .dll
ASM_SUFFIX = .S
@@ -25,7 +25,7 @@ LD = $(PRE_)gcc
AR = $(PRE_)ar
STRIP = $(PRE_)strip
RANLIB = $(PRE_)ranlib
-AS = $(CC)
+AS = $(CC)
RM = rm -f
RMDIR = rm -rf
CP = cp
@@ -41,7 +41,7 @@ AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring i386,$(BUILD_ARCH)),-
ifneq ($(AHFLAGS),)
ifeq ($(CXFLAGS_CHECK),)
CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi }
-CXFLAGS_CHECK :=
+CXFLAGS_CHECK :=
export CXFLAGS_CHECK
endif
@@ -53,9 +53,9 @@ endif
endif
# cxflags: .c/.cc/.cpp files
-CXFLAGS_RELEASE =
+CXFLAGS_RELEASE =
CXFLAGS_DEBUG = -g -D__tb_debug__
-CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
+CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
CXFLAGS-I = -I
CXFLAGS-o = -o
@@ -71,28 +71,28 @@ endif
# profile
ifeq ($(PROF),y)
-CXFLAGS += -g -pg -fno-omit-frame-pointer
+CXFLAGS += -g -pg -fno-omit-frame-pointer
else
-CXFLAGS_RELEASE += -fomit-frame-pointer
+CXFLAGS_RELEASE += -fomit-frame-pointer
CXFLAGS_DEBUG += -fno-omit-frame-pointer
endif
# cflags: .c files
-CFLAGS_RELEASE =
-CFLAGS_DEBUG =
+CFLAGS_RELEASE =
+CFLAGS_DEBUG =
CFLAGS = \
-std=gnu99 \
-D_GNU_SOURCE=1 -D_REENTRANT \
- -fno-math-errno
+ -fno-math-errno
# ccflags: .cc/.cpp files
CCFLAGS_RELEASE = -fno-rtti
-CCFLAGS_DEBUG =
+CCFLAGS_DEBUG =
CCFLAGS = -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
# ldflags
-LDFLAGS_RELEASE =
-LDFLAGS_DEBUG =
+LDFLAGS_RELEASE =
+LDFLAGS_DEBUG =
LDFLAGS = $(AHFLAGS) $(LDFLAGS_CHECK) -static-libgcc
LDFLAGS-L = -L
LDFLAGS-l = -l
@@ -101,24 +101,24 @@ LDFLAGS-o = -o
# prof
ifeq ($(PROF),y)
-LDFLAGS += -pg
+LDFLAGS += -pg
else
LDFLAGS_RELEASE += -s
-LDFLAGS_DEBUG +=
+LDFLAGS_DEBUG +=
endif
# asflags
-ASFLAGS_RELEASE =
-ASFLAGS_DEBUG =
+ASFLAGS_RELEASE =
+ASFLAGS_DEBUG =
ASFLAGS = -c $(AHFLAGS)
ASFLAGS-I = -I
ASFLAGS-o = -o
# arflags
-ARFLAGS_RELEASE =
-ARFLAGS_DEBUG =
+ARFLAGS_RELEASE =
+ARFLAGS_DEBUG =
ARFLAGS = -cr
-ARFLAGS-o =
+ARFLAGS-o =
# shflags
SHFLAGS_RELEASE = -s
diff --git a/core/plat/msys/prefix.mak b/core/plat/msys/prefix.mak
index 9d4dc8dd5..1eacbda9a 100644
--- a/core/plat/msys/prefix.mak
+++ b/core/plat/msys/prefix.mak
@@ -1,10 +1,10 @@
# architecture makefile configure
# prefix & suffix
-BIN_PREFIX =
+BIN_PREFIX =
BIN_SUFFIX = .b
-OBJ_PREFIX =
+OBJ_PREFIX =
OBJ_SUFFIX = .o
LIB_PREFIX = lib
@@ -24,7 +24,7 @@ LD = $(PRE_)gcc
AR = $(PRE_)ar
STRIP = $(PRE_)strip
RANLIB = $(PRE_)ranlib
-AS = $(CC)
+AS = $(CC)
RM = rm -f
RMDIR = rm -rf
CP = cp
@@ -40,7 +40,7 @@ AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring i386,$(BUILD_ARCH)),-
ifneq ($(AHFLAGS),)
ifeq ($(CXFLAGS_CHECK),)
CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi }
-CXFLAGS_CHECK :=
+CXFLAGS_CHECK :=
export CXFLAGS_CHECK
endif
@@ -52,9 +52,9 @@ endif
endif
# cxflags: .c/.cc/.cpp files
-CXFLAGS_RELEASE =
+CXFLAGS_RELEASE =
CXFLAGS_DEBUG = -g -D__tb_debug__
-CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
+CXFLAGS = $(AHFLAGS) $(CXFLAGS_CHECK) -c -Wall
CXFLAGS-I = -I
CXFLAGS-o = -o
@@ -70,28 +70,28 @@ endif
# profile
ifeq ($(PROF),y)
-CXFLAGS += -g -pg -fno-omit-frame-pointer
+CXFLAGS += -g -pg -fno-omit-frame-pointer
else
-CXFLAGS_RELEASE += -fomit-frame-pointer
+CXFLAGS_RELEASE += -fomit-frame-pointer
CXFLAGS_DEBUG += -fno-omit-frame-pointer
endif
# cflags: .c files
-CFLAGS_RELEASE =
-CFLAGS_DEBUG =
+CFLAGS_RELEASE =
+CFLAGS_DEBUG =
CFLAGS = \
-std=gnu99 \
-D_GNU_SOURCE=1 -D_REENTRANT \
- -fno-math-errno
+ -fno-math-errno
# ccflags: .cc/.cpp files
CCFLAGS_RELEASE = -fno-rtti
-CCFLAGS_DEBUG =
+CCFLAGS_DEBUG =
CCFLAGS = -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
# ldflags
-LDFLAGS_RELEASE =
-LDFLAGS_DEBUG =
+LDFLAGS_RELEASE =
+LDFLAGS_DEBUG =
LDFLAGS = $(AHFLAGS) $(LDFLAGS_CHECK) -static-libgcc
LDFLAGS-L = -L
LDFLAGS-l = -l
@@ -100,24 +100,24 @@ LDFLAGS-o = -o
# prof
ifeq ($(PROF),y)
-LDFLAGS += -pg
+LDFLAGS += -pg
else
LDFLAGS_RELEASE += -s
-LDFLAGS_DEBUG +=
+LDFLAGS_DEBUG +=
endif
# asflags
-ASFLAGS_RELEASE =
-ASFLAGS_DEBUG =
+ASFLAGS_RELEASE =
+ASFLAGS_DEBUG =
ASFLAGS = -c $(AHFLAGS)
ASFLAGS-I = -I
ASFLAGS-o = -o
# arflags
-ARFLAGS_RELEASE =
-ARFLAGS_DEBUG =
+ARFLAGS_RELEASE =
+ARFLAGS_DEBUG =
ARFLAGS = -cr
-ARFLAGS-o =
+ARFLAGS-o =
# shflags
SHFLAGS_RELEASE = -s
diff --git a/core/src/demo/makefile b/core/src/demo/makefile
index 160174661..d49606341 100644
--- a/core/src/demo/makefile
+++ b/core/src/demo/makefile
@@ -11,11 +11,11 @@ demo_TYPE = BIN
demo_C_FILES += xmake
# packages
-demo_PKGS-$(BASE) += base
+demo_PKGS-$(BASE) += base
# others
demo_LIBS += xmake$(DTYPE) lcurses$(DTYPE) tbox$(DTYPE) luajit$(DTYPE) sv$(DTYPE) lua-cjson$(DTYPE) $(BASE_LIBS)
-demo_INC_DIRS += ../ ../tbox/tbox/src ../tbox/inc/$(PLAT) ../luajit/luajit/src ../sv/sv/include
+demo_INC_DIRS += ../ ../tbox/tbox/src ../tbox/inc/$(PLAT) ../luajit/luajit/src ../sv/sv/include
demo_LIB_DIRS += ../xmake ../tbox ../luajit ../sv ../lcurses ../lua-cjson
demo_CXFLAGS += -D__tb_prefix__=\"xmake\"
diff --git a/core/src/lcurses/makefile b/core/src/lcurses/makefile
index ac4384cb8..25752ab47 100644
--- a/core/src/lcurses/makefile
+++ b/core/src/lcurses/makefile
@@ -12,7 +12,7 @@ lcurses_CONFIG = n
# curses files
lcurses_C_FILES += lcurses
-
+
# curses flags
lcurses_CXFLAGS += $(if $(findstring curses,$(base_LIBNAMES)),-DXM_CONFIG_API_HAVE_CURSES,)
diff --git a/core/src/lua-cjson/makefile b/core/src/lua-cjson/makefile
index 0a4263f03..b9b132553 100644
--- a/core/src/lua-cjson/makefile
+++ b/core/src/lua-cjson/makefile
@@ -18,7 +18,7 @@ lua-cjson_C_FILES += \
lua-cjson/lua_cjson
# cflags
-# Use internal strtod() / g_fmt() code for performance and disable multi-thread
+# Use internal strtod() / g_fmt() code for performance and disable multi-thread
lua-cjson_CFLAGS += -DNDEBUG -DUSE_INTERNAL_FPCONV
# includes
diff --git a/core/src/sv/makefile b/core/src/sv/makefile
index e1197c612..e9d77de6f 100644
--- a/core/src/sv/makefile
+++ b/core/src/sv/makefile
@@ -23,7 +23,7 @@ sv_C_FILES += \
# includes
sv_INC_DIRS += sv/include
-
+
# suffix
include $(PRO_DIR)/suffix.mak
diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile
index d7fc6eaa0..1de99cd28 100644
--- a/core/src/tbox/makefile
+++ b/core/src/tbox/makefile
@@ -263,7 +263,7 @@ tbox_C_FILES += \
tbox/src/tbox/charset/utf32 \
tbox/src/tbox/charset/ucs2 \
tbox/src/tbox/charset/ucs4 \
- tbox/src/tbox/charset/iso8859
+ tbox/src/tbox/charset/iso8859
iswin =
ifeq ($(PLAT),windows)
@@ -290,7 +290,7 @@ tbox_C_FILES += \
tbox/src/tbox/platform/windows/interface/mswsock \
tbox/src/tbox/platform/windows/interface/kernel32 \
tbox/src/tbox/platform/windows/interface/iphlpapi \
- tbox/src/tbox/platform/windows/interface/interface
+ tbox/src/tbox/platform/windows/interface/interface
endif
ifeq ($(PLAT),iphoneos)
tbox_M_FILES += \
@@ -302,7 +302,7 @@ tbox_INC_DIRS += \
tbox/src \
inc/$(PLAT)
-
+
# suffix
include $(PRO_DIR)/suffix.mak
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 5421a907d..2c45588b4 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -144,7 +144,7 @@ endif
xmake_CXFLAGS += -D__tb_prefix__=\"xmake\"
xmake_CXFLAGS += $(if $(findstring readline,$(base_LIBNAMES)),-DXM_CONFIG_API_HAVE_READLINE,)
xmake_CXFLAGS += $(if $(findstring curses,$(base_LIBNAMES)),-DXM_CONFIG_API_HAVE_CURSES,)
-
+
# includes
xmake_INC_DIRS += \
../tbox/tbox/src \
@@ -152,7 +152,7 @@ xmake_INC_DIRS += \
../luajit/luajit/src \
../sv/sv/include
-
+
# suffix
include $(PRO_DIR)/suffix.mak
diff --git a/tests/projects/c/Unicode 测试/test.lua b/tests/projects/c/Unicode 测试/test.lua
index fecba70e1..b9209fbf4 100644
--- a/tests/projects/c/Unicode 测试/test.lua
+++ b/tests/projects/c/Unicode 测试/test.lua
Binary files differ
diff --git a/tests/projects/c/Unicode 测试/xmake.lua b/tests/projects/c/Unicode 测试/xmake.lua
index b34cdfd3d..224b17d0a 100644
--- a/tests/projects/c/Unicode 测试/xmake.lua
+++ b/tests/projects/c/Unicode 测试/xmake.lua
Binary files differ
diff --git a/tests/projects/other/multiplats_vs/test.lua b/tests/projects/other/multiplats_vs/test.lua
index 795df5c95..e0f60487b 100644
--- a/tests/projects/other/multiplats_vs/test.lua
+++ b/tests/projects/other/multiplats_vs/test.lua
@@ -1,6 +1,6 @@
function test_multivs(t)
if is_subhost("windows") then
- t:build()
+ t:build()
else
return t:skip("wrong host platform")
end
diff --git a/xmake/modules/detect/packages/find_mkl.lua b/xmake/modules/detect/packages/find_mkl.lua
index 7de9270c6..a34d2bf3a 100644
--- a/xmake/modules/detect/packages/find_mkl.lua
+++ b/xmake/modules/detect/packages/find_mkl.lua
@@ -1,73 +1,73 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author xq114
--- @file find_mkl.lua
---
-
--- imports
-import("lib.detect.find_path")
-import("lib.detect.find_library")
-import("lib.detect.find_package")
-
--- find mkl
---
--- @param opt the package options. e.g. see the options of find_package()
---
--- @return see the return value of find_package()
---
-function main(opt)
-
- -- for windows platform
- if opt.plat == "windows" then
-
- -- init bits
- local rdir = (opt.arch == "x64" and "intel64" or "ia32")
-
- -- init search paths
- local paths = {
- "$(env ONEAPI_ROOT)\\mkl\\latest"
- }
-
- -- find library
- local result = {links = {}, linkdirs = {}, includedirs = {}, threading = ""}
- local linkinfo = find_library("mkl_core", paths, {suffixes = path.join("lib", rdir)})
- if not linkinfo then
- return
- end
- table.insert(result.linkdirs, linkinfo.linkdir)
- if rdir == "intel64" then
- table.insert(result.links, "mkl_intel_ilp64")
- else
- table.insert(result.links, "mkl_intel_c")
- end
-
- -- use tbb if available
- local tbb_res = find_package("tbb")
- if tbb_res then
- table.join2(result.linkdirs, tbb_res.linkdirs)
- table.join2(result.links, {"mkl_tbb_thread", "mkl_core", "tbb"})
- result.threading = "tbb"
- else
- table.join2(result.links, {"mkl_sequential", "mkl_core"})
- result.threading = "seq"
- end
-
- -- find include
- table.insert(result.includedirs, find_path("mkl.h", paths, {suffixes = "include"}))
- return result
- end
-end
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author xq114
+-- @file find_mkl.lua
+--
+
+-- imports
+import("lib.detect.find_path")
+import("lib.detect.find_library")
+import("lib.detect.find_package")
+
+-- find mkl
+--
+-- @param opt the package options. e.g. see the options of find_package()
+--
+-- @return see the return value of find_package()
+--
+function main(opt)
+
+ -- for windows platform
+ if opt.plat == "windows" then
+
+ -- init bits
+ local rdir = (opt.arch == "x64" and "intel64" or "ia32")
+
+ -- init search paths
+ local paths = {
+ "$(env ONEAPI_ROOT)\\mkl\\latest"
+ }
+
+ -- find library
+ local result = {links = {}, linkdirs = {}, includedirs = {}, threading = ""}
+ local linkinfo = find_library("mkl_core", paths, {suffixes = path.join("lib", rdir)})
+ if not linkinfo then
+ return
+ end
+ table.insert(result.linkdirs, linkinfo.linkdir)
+ if rdir == "intel64" then
+ table.insert(result.links, "mkl_intel_ilp64")
+ else
+ table.insert(result.links, "mkl_intel_c")
+ end
+
+ -- use tbb if available
+ local tbb_res = find_package("tbb")
+ if tbb_res then
+ table.join2(result.linkdirs, tbb_res.linkdirs)
+ table.join2(result.links, {"mkl_tbb_thread", "mkl_core", "tbb"})
+ result.threading = "tbb"
+ else
+ table.join2(result.links, {"mkl_sequential", "mkl_core"})
+ result.threading = "seq"
+ end
+
+ -- find include
+ table.insert(result.includedirs, find_path("mkl.h", paths, {suffixes = "include"}))
+ return result
+ end
+end
diff --git a/xmake/modules/detect/packages/find_tbb.lua b/xmake/modules/detect/packages/find_tbb.lua
index dd0829750..e06bcfeb1 100644
--- a/xmake/modules/detect/packages/find_tbb.lua
+++ b/xmake/modules/detect/packages/find_tbb.lua
@@ -1,61 +1,61 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author xq114
--- @file find_tbb.lua
---
-
--- imports
-import("lib.detect.find_path")
-import("lib.detect.find_library")
-
--- find tbb
---
--- @param opt the package options. e.g. see the options of find_package()
---
--- @return see the return value of find_package()
---
-function main(opt)
-
- -- for windows platform
- if opt.plat == "windows" then
-
- -- init bits
- local rdir = (opt.arch == "x64" and "intel64" or "ia32")
-
- -- init search paths
- local paths = {
- "$(env ONEAPI_ROOT)\\tbb\\latest"
- }
-
- -- find library
- local result = {links = {}, linkdirs = {}, includedirs = {}}
- local linkinfo = find_library("tbb", paths, {suffixes = path.join("lib", rdir, "vc14")})
- if linkinfo then
- table.insert(result.linkdirs, linkinfo.linkdir)
- table.join2(result.links, {"tbb", "tbb_malloc"})
- else
- -- not found?
- return
- end
-
- -- find include
- table.insert(result.includedirs, find_path(path.join("tbb", "tbb.h"), paths, {suffixes = "include"}))
-
- -- ok
- return result
- end
-end
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author xq114
+-- @file find_tbb.lua
+--
+
+-- imports
+import("lib.detect.find_path")
+import("lib.detect.find_library")
+
+-- find tbb
+--
+-- @param opt the package options. e.g. see the options of find_package()
+--
+-- @return see the return value of find_package()
+--
+function main(opt)
+
+ -- for windows platform
+ if opt.plat == "windows" then
+
+ -- init bits
+ local rdir = (opt.arch == "x64" and "intel64" or "ia32")
+
+ -- init search paths
+ local paths = {
+ "$(env ONEAPI_ROOT)\\tbb\\latest"
+ }
+
+ -- find library
+ local result = {links = {}, linkdirs = {}, includedirs = {}}
+ local linkinfo = find_library("tbb", paths, {suffixes = path.join("lib", rdir, "vc14")})
+ if linkinfo then
+ table.insert(result.linkdirs, linkinfo.linkdir)
+ table.join2(result.links, {"tbb", "tbb_malloc"})
+ else
+ -- not found?
+ return
+ end
+
+ -- find include
+ table.insert(result.includedirs, find_path(path.join("tbb", "tbb.h"), paths, {suffixes = "include"}))
+
+ -- ok
+ return result
+ end
+end
diff --git a/xmake/rules/qt/install/windows.lua b/xmake/rules/qt/install/windows.lua
index deba297c1..69d4c1c70 100644
--- a/xmake/rules/qt/install/windows.lua
+++ b/xmake/rules/qt/install/windows.lua
@@ -29,7 +29,7 @@ function main(target, opt)
local targetfile = target:targetfile()
local installfile = path.join(target:installdir(), "bin", path.filename(targetfile))
-
+
-- get qt sdk
local qt = target:data("qt")