From d529287cfa4c918c21cd3a56e5392a8cb806d8ec Mon Sep 17 00:00:00 2001 From: James Gregory Date: Tue, 23 Apr 2013 14:43:59 -0700 Subject: [PATCH] Remove LOG prefixes from emscripten makefiles --- CocosDenshion/proj.emscripten/Makefile | 4 ++-- cocos2dx/proj.emscripten/Makefile | 7 ++++--- extensions/proj.emscripten/Makefile | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CocosDenshion/proj.emscripten/Makefile b/CocosDenshion/proj.emscripten/Makefile index c4af3994b7..a20833dee5 100644 --- a/CocosDenshion/proj.emscripten/Makefile +++ b/CocosDenshion/proj.emscripten/Makefile @@ -13,8 +13,8 @@ all: $(TARGET) $(TARGET): $(OBJECTS) $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -shared -o $(TARGET) $(SHAREDLIBS) $(STATICLIBS) + $(CXX) $(CXXFLAGS) $(OBJECTS) -shared -o $(TARGET) $(SHAREDLIBS) $(STATICLIBS) $(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ diff --git a/cocos2dx/proj.emscripten/Makefile b/cocos2dx/proj.emscripten/Makefile index 2a00fbe0c5..06d991fb49 100644 --- a/cocos2dx/proj.emscripten/Makefile +++ b/cocos2dx/proj.emscripten/Makefile @@ -147,12 +147,13 @@ all: $(TARGET) $(TARGET): $(OBJECTS) $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -shared -o $@ $(SHAREDLIBS) $(STATICLIBS) $(LIBS) + $(CXX) $(CXXFLAGS) $(OBJECTS) -shared -o $@ $(SHAREDLIBS) $(STATICLIBS) $(LIBS) $(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ $(OBJ_DIR)/%.o: ../%.c $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_CC)$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ + $(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ + diff --git a/extensions/proj.emscripten/Makefile b/extensions/proj.emscripten/Makefile index 7db7aa939e..4d4c082feb 100644 --- a/extensions/proj.emscripten/Makefile +++ b/extensions/proj.emscripten/Makefile @@ -66,12 +66,12 @@ all: $(TARGET) $(TARGET): $(OBJECTS) $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_AR)$(AR) $(ARFLAGS) $@ $(OBJECTS) + $(AR) $(ARFLAGS) $@ $(OBJECTS) $(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ $(OBJ_DIR)/%.o: ../%.c $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) - $(LOG_CC)$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ + $(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@