Merge pull request #3911 from minggo/iss2905-adjust_folder

[ci skip]SimpleAudioEngine -> audio

Makefile

@@ -23,9 +23,9 @@ libcocos2dx-clean:
 	$(MAKE) -C cocos2dx/proj.$(PLATFORM) clean
 
 cocosdenshion: libcocos2dx
-	$(MAKE) -C CocosDenshion/proj.$(PLATFORM)
+	$(MAKE) -C audio/proj.$(PLATFORM)
 cocosdenshion-clean:
-	$(MAKE) -C CocosDenshion/proj.$(PLATFORM) clean
+	$(MAKE) -C audio/proj.$(PLATFORM) clean
 
 lua: libextensions
 	$(MAKE) -C scripting/lua/proj.$(PLATFORM)

cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-8ad5afb135018cfa93b3aee4dddbea24f0ef9b9e
+b8bac548f5a84cbc6b7bd9c99617868737bb103f

cocos2dx/proj.linux/cocos2dx.mk

@@ -112,10 +112,10 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
 
 ifneq ($(OPENAL),1)
 ifeq ($(LBITS),64)
-FMOD_LIBDIR = $(COCOS_ROOT)/CocosDenshion/third_party/fmod/lib64/api/lib
+FMOD_LIBDIR = $(COCOS_ROOT)/audio/third_party/fmod/lib64/api/lib
 SHAREDLIBS += -lfmodex64
 else
-FMOD_LIBDIR = $(COCOS_ROOT)/CocosDenshion/third_party/fmod/api/lib
+FMOD_LIBDIR = $(COCOS_ROOT)/audio/third_party/fmod/api/lib
 SHAREDLIBS += -lfmodex
 endif
 endif

extensions/Android.mk

@@ -161,7 +161,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
 $(call import-module,external/Box2D)
 $(call import-module,external/chipmunk)

extensions/proj.linux/Makefile

@@ -4,7 +4,7 @@ COCOS_ROOT=../..
 
 INCLUDES = -I$(COCOS_ROOT)/external \
 	-I$(COCOS_ROOT)/external/chipmunk/include/chipmunk \
-	-I$(COCOS_ROOT)/CocosDenshion/include \
+	-I$(COCOS_ROOT)/audio/include \
 	-I.. \
 	-I../CCBReader \
 	-I../GUI/CCControlExtension \

samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk

@@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,cocos2dx/platform/android)

samples/Cpp/HelloCpp/proj.android/jni/Android.mk

@@ -17,5 +17,5 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdens
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,cocos2dx/platform/android)

samples/Cpp/SimpleGame/proj.android/jni/Android.mk

@@ -17,7 +17,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdens
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,cocos2dx)
 $(call import-module,extensions)
 $(call import-module,cocos2dx/platform/android)

samples/Cpp/SimpleGame/proj.linux/Makefile

@@ -12,7 +12,7 @@ include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk
 
 SHAREDLIBS += -lcocos2d -lcocosdenshion
 COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libcocosdenshion.so
-INCLUDES += -I$(COCOS_ROOT)/CocosDenshion/include
+INCLUDES += -I$(COCOS_ROOT)/audio/include
 
 $(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST)
 	@mkdir -p $(@D)

samples/Cpp/TestCpp/Android.mk

@@ -151,7 +151,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
             
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,external/Box2D)
 $(call import-module,external/chipmunk)
 $(call import-module,cocos2dx)

samples/Cpp/TestCpp/proj.android/jni/Android.mk

@@ -22,7 +22,7 @@ include $(BUILD_SHARED_LIBRARY)
 $(call import-module,samples/Cpp/TestCpp)
 $(call import-module,cocos2dx)
 $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,extensions)
 $(call import-module,external/Box2D)
 $(call import-module,cocos2dx/platform/android)