Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: cocos2dx/proj.nacl/cocos2dx.mk

Issue 14694016: [NaCl] Add support for building using glibc toolchain. (Closed) Base URL: git@github.com:sbc100/cocos2d-x.git@nacl_changes2
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build-nacl.sh ('k') | samples/Cpp/HelloCpp/proj.nacl/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cocos2dx/proj.nacl/cocos2dx.mk
diff --git a/cocos2dx/proj.nacl/cocos2dx.mk b/cocos2dx/proj.nacl/cocos2dx.mk
index 0b574c0e872049a5145e0bc95f2926aa6a445295..6441b3d009dd93fb154bffe81bbb675b4e1c9f80 100644
--- a/cocos2dx/proj.nacl/cocos2dx.mk
+++ b/cocos2dx/proj.nacl/cocos2dx.mk
@@ -14,7 +14,12 @@ endif
all:
+ifeq ($(NACL_GLIBC),1)
+NACL_LIBC = glibc
+else
NACL_LIBC = newlib
+endif
+
NACL_ARCH ?= x86_64
NACL_AR ?= $(NACL_ARCH)-nacl-ar
NACL_CC ?= $(NACL_ARCH)-nacl-gcc
@@ -45,6 +50,14 @@ OUT_DIR ?= obj
OBJ_DIR ?= $(OUT_DIR)/$(NACL_ARCH)
LIB_DIR ?= $(COCOS_ROOT)/lib/nacl/$(ARCH_DIR)
+NMF_FLAGS = --objdump=i686-nacl-objdump
+NMF_FLAGS += -L$(NACL_SDK_ROOT)/toolchain/linux_x86_$(NACL_LIBC)/x86_64-nacl/lib32/
+NMF_FLAGS += -L$(NACL_SDK_ROOT)/toolchain/linux_x86_$(NACL_LIBC)/x86_64-nacl/lib64/
+NMF_FLAGS += -L$(NACL_SDK_ROOT)/lib/$(NACL_LIBC)_x86_32/Release
+NMF_FLAGS += -L$(NACL_SDK_ROOT)/lib/$(NACL_LIBC)_x86_64/Release
+NMF_FLAGS += -L$(NACLPORTS_ROOT)/lib/$(NACL_LIBC)_x86_32/Release
+NMF_FLAGS += -L$(NACLPORTS_ROOT)/lib/$(NACL_LIBC)_x86_64/Release
+
ifdef USE_BOX2D
DEFINES += -DCC_ENABLE_BOX2D_INTEGRATION=1
else
« no previous file with comments | « build-nacl.sh ('k') | samples/Cpp/HelloCpp/proj.nacl/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698