From 5c4545de3c193678cd99652ab2ab0aadbd782e27 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Tue, 2 Apr 2013 19:38:12 -0700 Subject: [PATCH] [NaCl] Remove use of -lnosys --- cocos2dx/proj.nacl/cocos2dx.mk | 2 +- samples/Lua/TestLua/proj.nacl/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cocos2dx/proj.nacl/cocos2dx.mk b/cocos2dx/proj.nacl/cocos2dx.mk index 86e0610e02..edc21ab6f7 100644 --- a/cocos2dx/proj.nacl/cocos2dx.mk +++ b/cocos2dx/proj.nacl/cocos2dx.mk @@ -107,7 +107,7 @@ endif SOUNDLIBS := -lalut -lopenal -lvorbisfile -lvorbis -logg STATICLIBS += $(SOUNDLIBS) -lfreetype -lxml2 -lwebp -lpng -ljpeg -ltiff -llua -lchipmunk -STATICLIBS += -lnacl_io -lppapi_gles2 -lppapi -lppapi_cpp -lnosys +STATICLIBS += -lnacl_io -lppapi_gles2 -lppapi -lppapi_cpp SHAREDLIBS += -lpthread -lcocosdenshion -lcocos2d -lz OBJECTS := $(SOURCES:.cpp=.o) diff --git a/samples/Lua/TestLua/proj.nacl/Makefile b/samples/Lua/TestLua/proj.nacl/Makefile index c8ce2f115a..1a471c546b 100644 --- a/samples/Lua/TestLua/proj.nacl/Makefile +++ b/samples/Lua/TestLua/proj.nacl/Makefile @@ -31,7 +31,7 @@ SOURCES += $(addprefix $(COCOS_ROOT)/extensions/, $(EXTENSIONS_SOURCES)) include $(COCOS_ROOT)/cocos2dx/proj.nacl/cocos2dx.mk CXXFLAGS += -Wno-multichar -STATICLIBS += -llua -lnosys +STATICLIBS += -llua SHAREDLIBS += -lbox2d APP_NAME = TestLua @@ -40,23 +40,23 @@ NMF = $(BIN_DIR)/$(APP_NAME).nmf all: $(NMF) -$(TARGET): $(OBJECTS) $(LIB_DIR)/libcocos2d.a +$(TARGET): $(OBJECTS) $(LIB_DIR)/libcocos2d.a $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) $(LOG_LINK)$(NACL_CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) -$(OBJ_DIR)/%.o: %.cpp +$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) $(LOG_CXX)$(NACL_CXX) -MMD $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ -$(OBJ_DIR)/%.o: ../%.cpp +$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) $(LOG_CXX)$(NACL_CXX) -MMD $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ -$(OBJ_DIR)/%.o: $(COCOS_ROOT)/%.cpp +$(OBJ_DIR)/%.o: $(COCOS_ROOT)/%.cpp $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) $(LOG_CXX)$(NACL_CXX) -MMD $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ -$(OBJ_DIR)/%.o: $(COCOS_ROOT)/%.c +$(OBJ_DIR)/%.o: $(COCOS_ROOT)/%.c $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) $(LOG_CC)$(NACL_CC) -MMD $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@