7 Commits

Author SHA1 Message Date
Topkek-190 a65c8f4d7f Merge 5ba3309448 into 70e03572b2 2023-08-18 07:26:22 +00:00
Wind4 70e03572b2 Merge pull request #41 from gnaggnoyil/master
Fix bug in GCC's target platform detection under some non-English locales
2023-07-28 17:56:01 +08:00
Linux User 5ba3309448 Let number of jobs be user-configurable
j16 is an awful lot of jobs and usually results in termination of the compiler.
The number of jobs used by make can be set using the command line argument -jN
to make, where N is the number of jobs
2021-10-01 13:15:25 +00:00
Rouben 65228e5c79 Merge pull request #40 from simonsmh/master
Update debian submodule
2020-05-19 17:44:42 -04:00
gnaggnoyil db75edf481 Fix bug in GCC's target platform detection under some non-English locales 2020-05-12 19:50:58 +08:00
Simon Shi cfc3e40505 update debian submodule 2020-05-12 13:26:29 +08:00
Rouben 5b08c8f2a3 Merge pull request #38 from rouben/master
vlmcsd-1113-2020-03-28-Hotbird64
2020-03-30 01:30:22 -04:00
3 changed files with 11 additions and 13 deletions
+9 -11
View File
@@ -1,7 +1,5 @@
.NOTPARALLEL: .NOTPARALLEL:
MAX_THREADS ?= 16
PROGRAM_NAME ?= bin/vlmcsd PROGRAM_NAME ?= bin/vlmcsd
CLIENT_NAME ?= bin/vlmcs CLIENT_NAME ?= bin/vlmcs
MULTI_NAME ?= bin/vlmcsdmulti MULTI_NAME ?= bin/vlmcsdmulti
@@ -104,30 +102,30 @@ endif
.DEFAULT: .DEFAULT:
+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build) +@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME) +@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
all: all:
+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build) +@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME) +@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
clean: clean:
+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME) +@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+@$(MAKE) -j$(MAX_THREADS) -C man $@ +@$(MAKE) -C man $@
alldocs: alldocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@ +@$(MAKE) -C man $@
dosdocs: dosdocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@ +@$(MAKE) -C man $@
unixdocs: unixdocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@ +@$(MAKE) -C man $@
htmldocs: htmldocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@ +@$(MAKE) -C man $@
pdfdocs: pdfdocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@ +@$(MAKE) -C man $@
GNUmakefile: GNUmakefile:
+1 -1
Submodule debian updated: 971ade7b0e...96200e41ef
+1 -1
View File
@@ -70,7 +70,7 @@ VERBOSE ?= NO
################################################################################ ################################################################################
CC ?= gcc CC ?= gcc
TARGETPLATFORM := $(shell LANG=en_US.UTF-8 $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ') TARGETPLATFORM := $(shell LANG=en_US.UTF-8 LANGUAGE=en_US $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ')
ifneq (,$(findstring darwin,$(TARGETPLATFORM))) ifneq (,$(findstring darwin,$(TARGETPLATFORM)))
DARWIN := 1 DARWIN := 1