summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-26 14:50:09 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-26 14:50:09 +0100
commit3a811376d974de519c4ef74dff3e5b8719468f4a (patch)
tree400d7f2d10829e50c548854c3c93ec637d33768f /makefile
parent2582ce7f16cc84c686a4357fca7d53edd0ecc348 (diff)
Made pnacl to compile (nw)
Diffstat (limited to 'makefile')
-rw-r--r--makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/makefile b/makefile
index 7671600b4df..0422f8a03a7 100644
--- a/makefile
+++ b/makefile
@@ -94,7 +94,8 @@
# FORCE_VERSION_COMPILE = 1
-# MS BUILD = 1
+# MSBUILD = 1
+# USE_LIBUV = 1
ifdef PREFIX_MAKEFILE
include $(PREFIX_MAKEFILE)
@@ -676,6 +677,10 @@ ifdef PLATFORM
TARGET_PARAMS += --PLATFORM='$(PLATFORM)'
endif
+ifdef USE_LIBUV
+PARAMS += --USE_LIBUV='$(USE_LIBUV)'
+endif
+
#-------------------------------------------------
# All scripts
#-------------------------------------------------
@@ -1024,7 +1029,7 @@ $(PROJECTDIR_MINI)/gmake-pnacl/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef NACL_SDK_ROOT
$(error NACL_SDK_ROOT is not set)
endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=pnacl --gcc_version=3.7.0 --osd=osdmini --targetos=pnacl --NOASM=1 gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=pnacl --gcc_version=3.7.0 --osd=osdmini --targetos=pnacl --NOASM=1 --USE_LIBUV=0 gmake
.PHONY: pnacl
pnacl: generate $(PROJECTDIR_MINI)/gmake-pnacl/Makefile