Skip to content

O
onlyoffice_core
Commit e3d0b127 authored by Alexey.Golubev's avatar Alexey.Golubev
Browse files
Options

make <-> nmake

parent b2b1cb1f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Makefile
View file @ e3d0b127
...@@ -4,7 +4,7 @@ ifeq ($(OS),Windows_NT) ...@@ -4,7 +4,7 @@ ifeq ($(OS),Windows_NT)
SHELL_EXT := .bat SHELL_EXT := .bat
SHARED_EXT := .dll SHARED_EXT := .dll
LIB_EXT := .lib LIB_EXT := .lib
MAKE := "make -j $(shell grep -c ^processor /proc/cpuinfo)" MAKE := nmake
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64) ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
ARCHITECTURE := 64 ARCHITECTURE := 64
endif endif
...@@ -18,7 +18,7 @@ else ...@@ -18,7 +18,7 @@ else
SHARED_EXT := .so* SHARED_EXT := .so*
SHELL_EXT := .sh SHELL_EXT := .sh
LIB_EXT := .a LIB_EXT := .a
MAKE := nmake MAKE := "make -j $(shell grep -c ^processor /proc/cpuinfo)"
endif endif
UNAME_P := $(shell uname -p) UNAME_P := $(shell uname -p)
ifeq ($(UNAME_P),x86_64) ifeq ($(UNAME_P),x86_64)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7