Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3911 from minggo/iss2905-adjust_folder 

[ci skip]SimpleAudioEngine -> audio
This commit is contained in:
minggo 2013-10-10 18:27:25 -07:00
parent 6fbca287a2 16d0fe313b
commit e90e975e3d
121 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

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

0
CocosDenshion/android/Android.mk → audio/android/Android.mk
View File

0
CocosDenshion/android/ccdandroidUtils.cpp → audio/android/ccdandroidUtils.cpp
View File

0
CocosDenshion/android/ccdandroidUtils.h → audio/android/ccdandroidUtils.h
View File

0
CocosDenshion/android/cddSimpleAudioEngine.cpp → audio/android/cddSimpleAudioEngine.cpp
View File

0
CocosDenshion/android/jni/cddandroidAndroidJavaEngine.cpp → audio/android/jni/cddandroidAndroidJavaEngine.cpp
View File

0
CocosDenshion/android/jni/cddandroidAndroidJavaEngine.h → audio/android/jni/cddandroidAndroidJavaEngine.h
View File

0
CocosDenshion/android/opensl/OpenSLEngine.cpp → audio/android/opensl/OpenSLEngine.cpp
View File

0
CocosDenshion/android/opensl/OpenSLEngine.h → audio/android/opensl/OpenSLEngine.h
View File

0
CocosDenshion/android/opensl/SimpleAudioEngineOpenSL.cpp → audio/android/opensl/SimpleAudioEngineOpenSL.cpp
View File

0
CocosDenshion/android/opensl/SimpleAudioEngineOpenSL.h → audio/android/opensl/SimpleAudioEngineOpenSL.h
View File

0
CocosDenshion/android/opensl/cddandroidOpenSLEngine.cpp → audio/android/opensl/cddandroidOpenSLEngine.cpp
View File

0
CocosDenshion/android/opensl/cddandroidOpenSLEngine.h → audio/android/opensl/cddandroidOpenSLEngine.h
View File

0
CocosDenshion/emscripten/SimpleAudioEngine.cpp → audio/emscripten/SimpleAudioEngine.cpp
View File

0
CocosDenshion/include/Export.h → audio/include/Export.h
View File

0
CocosDenshion/include/SimpleAudioEngine.h → audio/include/SimpleAudioEngine.h
View File

0
CocosDenshion/ios/CDAudioManager.h → audio/ios/CDAudioManager.h
View File

0
CocosDenshion/ios/CDAudioManager.m → audio/ios/CDAudioManager.m
View File

0
CocosDenshion/ios/CDConfig.h → audio/ios/CDConfig.h
View File

0
CocosDenshion/ios/CDOpenALSupport.h → audio/ios/CDOpenALSupport.h
View File

0
CocosDenshion/ios/CDOpenALSupport.m → audio/ios/CDOpenALSupport.m
View File

0
CocosDenshion/ios/CocosDenshion.h → audio/ios/CocosDenshion.h
View File

0
CocosDenshion/ios/CocosDenshion.m → audio/ios/CocosDenshion.m
View File

0
CocosDenshion/ios/SimpleAudioEngine.mm → audio/ios/SimpleAudioEngine.mm
View File

0
CocosDenshion/ios/SimpleAudioEngine_objc.h → audio/ios/SimpleAudioEngine_objc.h
View File

0
CocosDenshion/ios/SimpleAudioEngine_objc.m → audio/ios/SimpleAudioEngine_objc.m
View File

0
CocosDenshion/linux/AudioPlayer.h → audio/linux/AudioPlayer.h
View File

0
CocosDenshion/linux/FmodAudioPlayer.cpp → audio/linux/FmodAudioPlayer.cpp
View File

0
CocosDenshion/linux/FmodAudioPlayer.h → audio/linux/FmodAudioPlayer.h
View File

0
CocosDenshion/linux/SimpleAudioEngineFMOD.cpp → audio/linux/SimpleAudioEngineFMOD.cpp
View File

0
CocosDenshion/mac/CDAudioManager.h → audio/mac/CDAudioManager.h
View File

0
CocosDenshion/mac/CDAudioManager.m → audio/mac/CDAudioManager.m
View File

0
CocosDenshion/mac/CDConfig.h → audio/mac/CDConfig.h
View File

0
CocosDenshion/mac/CDOpenALSupport.h → audio/mac/CDOpenALSupport.h
View File

0
CocosDenshion/mac/CDOpenALSupport.m → audio/mac/CDOpenALSupport.m
View File

0
CocosDenshion/mac/CDXMacOSXSupport.h → audio/mac/CDXMacOSXSupport.h
View File

0
CocosDenshion/mac/CDXMacOSXSupport.mm → audio/mac/CDXMacOSXSupport.mm
View File

0
CocosDenshion/mac/CocosDenshion.h → audio/mac/CocosDenshion.h
View File

0
CocosDenshion/mac/CocosDenshion.m → audio/mac/CocosDenshion.m
View File

0
CocosDenshion/mac/SimpleAudioEngine.mm → audio/mac/SimpleAudioEngine.mm
View File

0
CocosDenshion/mac/SimpleAudioEngine_objc.h → audio/mac/SimpleAudioEngine_objc.h
View File

0
CocosDenshion/mac/SimpleAudioEngine_objc.m → audio/mac/SimpleAudioEngine_objc.m
View File

0
CocosDenshion/openal/OpenALDecoder.cpp → audio/openal/OpenALDecoder.cpp
View File

0
CocosDenshion/openal/OpenALDecoder.h → audio/openal/OpenALDecoder.h
View File

0
CocosDenshion/openal/SimpleAudioEngineOpenAL.cpp → audio/openal/SimpleAudioEngineOpenAL.cpp
View File

0
CocosDenshion/proj.emscripten/Makefile → audio/proj.emscripten/Makefile
View File

0
CocosDenshion/proj.ios/CocosDenshion.xcodeproj/project.pbxproj → audio/proj.ios/CocosDenshion.xcodeproj/project.pbxproj
View File

0
CocosDenshion/proj.linux/.cproject → audio/proj.linux/.cproject
View File

0
CocosDenshion/proj.linux/.project → audio/proj.linux/.project
View File

0
CocosDenshion/proj.linux/CocosDenshion.prf → audio/proj.linux/CocosDenshion.prf
View File

0
CocosDenshion/proj.linux/Makefile → audio/proj.linux/Makefile
View File

0
CocosDenshion/proj.mac/CocosDenshion.xcodeproj/project.pbxproj → audio/proj.mac/CocosDenshion.xcodeproj/project.pbxproj
View File

0
CocosDenshion/proj.nacl/Makefile → audio/proj.nacl/Makefile
View File

0
CocosDenshion/proj.qt5/cocosdenshion.pro → audio/proj.qt5/cocosdenshion.pro
View File

0
CocosDenshion/proj.tizen/.cproject → audio/proj.tizen/.cproject
View File

0
CocosDenshion/proj.tizen/.project → audio/proj.tizen/.project
View File

0
CocosDenshion/proj.tizen/src/placeholder.txt → audio/proj.tizen/src/placeholder.txt
View File

0
CocosDenshion/proj.win32/CocosDenshion.vcxproj → audio/proj.win32/CocosDenshion.vcxproj
View File

0
CocosDenshion/proj.win32/CocosDenshion.vcxproj.filters → audio/proj.win32/CocosDenshion.vcxproj.filters
View File

0
CocosDenshion/proj.win32/CocosDenshion.vcxproj.user → audio/proj.win32/CocosDenshion.vcxproj.user
View File

0
CocosDenshion/qt5/SimpleAudioEngineQt5.cpp → audio/qt5/SimpleAudioEngineQt5.cpp
View File

0
CocosDenshion/third_party/fmod/Makefile → audio/third_party/fmod/Makefile vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmod.h.REMOVED.git-id → audio/third_party/fmod/api/inc/fmod.h.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmod.hpp → audio/third_party/fmod/api/inc/fmod.hpp vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmod_codec.h → audio/third_party/fmod/api/inc/fmod_codec.h vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmod_dsp.h → audio/third_party/fmod/api/inc/fmod_dsp.h vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmod_errors.h → audio/third_party/fmod/api/inc/fmod_errors.h vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmod_memoryinfo.h → audio/third_party/fmod/api/inc/fmod_memoryinfo.h vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmod_output.h → audio/third_party/fmod/api/inc/fmod_output.h vendored
View File

0
CocosDenshion/third_party/fmod/api/inc/fmodlinux.h → audio/third_party/fmod/api/inc/fmodlinux.h vendored
View File

0
CocosDenshion/third_party/fmod/api/lib/libfmodex-4.36.01.so.REMOVED.git-id → audio/third_party/fmod/api/lib/libfmodex-4.36.01.so.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/api/lib/libfmodex.so.REMOVED.git-id → audio/third_party/fmod/api/lib/libfmodex.so.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/api/lib/libfmodexL-4.36.01.so.REMOVED.git-id → audio/third_party/fmod/api/lib/libfmodexL-4.36.01.so.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/api/lib/libfmodexL.so.REMOVED.git-id → audio/third_party/fmod/api/lib/libfmodexL.so.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/lib64/Makefile → audio/third_party/fmod/lib64/Makefile vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmod.h.REMOVED.git-id → audio/third_party/fmod/lib64/api/inc/fmod.h.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmod.hpp → audio/third_party/fmod/lib64/api/inc/fmod.hpp vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmod_codec.h → audio/third_party/fmod/lib64/api/inc/fmod_codec.h vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmod_dsp.h → audio/third_party/fmod/lib64/api/inc/fmod_dsp.h vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmod_errors.h → audio/third_party/fmod/lib64/api/inc/fmod_errors.h vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmod_memoryinfo.h → audio/third_party/fmod/lib64/api/inc/fmod_memoryinfo.h vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmod_output.h → audio/third_party/fmod/lib64/api/inc/fmod_output.h vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/inc/fmodlinux.h → audio/third_party/fmod/lib64/api/inc/fmodlinux.h vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/lib/libfmodex64-4.38.00.so.REMOVED.git-id → audio/third_party/fmod/lib64/api/lib/libfmodex64-4.38.00.so.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/lib/libfmodex64.so.REMOVED.git-id → audio/third_party/fmod/lib64/api/lib/libfmodex64.so.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/lib/libfmodexL64-4.38.00.so.REMOVED.git-id → audio/third_party/fmod/lib64/api/lib/libfmodexL64-4.38.00.so.REMOVED.git-id vendored
View File

0
CocosDenshion/third_party/fmod/lib64/api/lib/libfmodexL64.so.REMOVED.git-id → audio/third_party/fmod/lib64/api/lib/libfmodexL64.so.REMOVED.git-id vendored
View File

0
CocosDenshion/win32/MciPlayer.cpp → audio/win32/MciPlayer.cpp
View File

0
CocosDenshion/win32/MciPlayer.h → audio/win32/MciPlayer.h
View File

0
CocosDenshion/win32/SimpleAudioEngine.cpp → audio/win32/SimpleAudioEngine.cpp
View File

2
cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
8ad5afb135018cfa93b3aee4dddbea24f0ef9b9e b8bac548f5a84cbc6b7bd9c99617868737bb103f

4
cocos2dx/proj.linux/cocos2dx.mk
View File

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

2
extensions/Android.mk
View File

@ -161,7 +161,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
$(call import-module,cocos2dx) $(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,cocos2dx/platform/third_party/android/prebuilt/libcurl)
$(call import-module,external/Box2D) $(call import-module,external/Box2D)
$(call import-module,external/chipmunk) $(call import-module,external/chipmunk)

2
extensions/proj.linux/Makefile
View File

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

2
samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk
View File

@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
$(call import-module,cocos2dx) $(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/spidermonkey-android)
$(call import-module,scripting/javascript/bindings) $(call import-module,scripting/javascript/bindings)
$(call import-module,cocos2dx/platform/android) $(call import-module,cocos2dx/platform/android)

2
samples/Cpp/HelloCpp/proj.android/jni/Android.mk
View File

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

2
samples/Cpp/SimpleGame/proj.android/jni/Android.mk
View File

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

2
samples/Cpp/SimpleGame/proj.linux/Makefile
View File

@ -12,7 +12,7 @@ include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk
SHAREDLIBS += -lcocos2d -lcocosdenshion SHAREDLIBS += -lcocos2d -lcocosdenshion
COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libcocosdenshion.so 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) $(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST)
@mkdir -p $(@D) @mkdir -p $(@D)

2
samples/Cpp/TestCpp/Android.mk
View File

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

2
samples/Cpp/TestCpp/proj.android/jni/Android.mk
View File

@ -22,7 +22,7 @@ include $(BUILD_SHARED_LIBRARY)
$(call import-module,samples/Cpp/TestCpp) $(call import-module,samples/Cpp/TestCpp)
$(call import-module,cocos2dx) $(call import-module,cocos2dx)
$(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl) $(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,extensions)
$(call import-module,external/Box2D) $(call import-module,external/Box2D)
$(call import-module,cocos2dx/platform/android) $(call import-module,cocos2dx/platform/android)

Some files were not shown because too many files have changed in this diff Show More