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

issue #2905:modify project settings to include correct audio path

This commit is contained in:
minggo 2013-10-10 15:40:06 +08:00
parent 28b06ecde0
commit 866906fd58
22 changed files with 26 additions and 26 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)

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

@ -1 +1 @@
3959af89b6bbc8fb982769d22d2591991107d6e5 dd4a9b3e507a99df58e814b627efd3983fed2eb9

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
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/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)

2
samples/Javascript/CocosDragonJS/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/Javascript/CrystalCraze/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/Javascript/MoonWarriors/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/Javascript/TestJavascript/proj.android/jni/Android.mk
View File

@ -23,7 +23,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,extensions) $(call import-module,extensions)
$(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)

2
samples/Javascript/WatermelonWithMe/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/Lua/HelloLua/proj.android/jni/Android.mk
View File

@ -20,7 +20,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
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/lua/proj.android) $(call import-module,scripting/lua/proj.android)
$(call import-module,extensions) $(call import-module,extensions)
$(call import-module,cocos2dx/platform/android) $(call import-module,cocos2dx/platform/android)

2
samples/Lua/TestLua/proj.android/jni/Android.mk
View File

@ -24,7 +24,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
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/lua/proj.android) $(call import-module,scripting/lua/proj.android)
$(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl) $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
$(call import-module,extensions) $(call import-module,extensions)

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

@ -1 +1 @@
381c282bed409f4b41a82505460d4d6c84ba70ab 609e133ab0e4ace89f5ddf8710506b08ff2e952b

2
template/multi-platform-cpp/proj.android/jni/Android.mk
View File

@ -22,7 +22,7 @@ include $(BUILD_SHARED_LIBRARY)
$(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)

4
template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
View File

@ -821,7 +821,7 @@
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../CocosDenshion/include", "$(SRCROOT)/../../../audio/include",
"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
"\"$(SRCROOT)/../../../extensions\"", "\"$(SRCROOT)/../../../extensions\"",
@ -861,7 +861,7 @@
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../CocosDenshion/include", "$(SRCROOT)/../../../audio/include",
"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
"\"$(SRCROOT)/../../../extensions\"", "\"$(SRCROOT)/../../../extensions\"",

2
template/multi-platform-js/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)

4
template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
View File

@ -923,7 +923,7 @@
"\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx\"",
"\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"",
"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios", "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios",
"\"$(SRCROOT)/../../../CocosDenshion/include\"", "\"$(SRCROOT)/../../../audio/include\"",
"$(SRCROOT)/../../../cocos2dx/include", "$(SRCROOT)/../../../cocos2dx/include",
"$(SRCROOT)/../../../cocos2dx/platform/ios", "$(SRCROOT)/../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../external/chipmunk/include/chipmunk", "$(SRCROOT)/../../../external/chipmunk/include/chipmunk",
@ -965,7 +965,7 @@
"\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx\"",
"\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"",
"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios", "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios",
"\"$(SRCROOT)/../../../CocosDenshion/include\"", "\"$(SRCROOT)/../../../audio/include\"",
"$(SRCROOT)/../../../cocos2dx/include", "$(SRCROOT)/../../../cocos2dx/include",
"$(SRCROOT)/../../../cocos2dx/platform/ios", "$(SRCROOT)/../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../external/chipmunk/include/chipmunk", "$(SRCROOT)/../../../external/chipmunk/include/chipmunk",

2
template/multi-platform-lua/proj.android/jni/Android.mk
View File

@ -25,7 +25,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
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/lua/proj.android) $(call import-module,scripting/lua/proj.android)
$(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl) $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
$(call import-module,extensions) $(call import-module,extensions)

4
template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
View File

@ -992,7 +992,7 @@
"\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"",
"\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"",
"\"$(SRCROOT)/../../../cocos2dx/include\"", "\"$(SRCROOT)/../../../cocos2dx/include\"",
"\"$(SRCROOT)/../../../CocosDenshion/include\"", "\"$(SRCROOT)/../../../audio/include\"",
"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
"\"$(SRCROOT)/../../../external\"", "\"$(SRCROOT)/../../../external\"",
@ -1035,7 +1035,7 @@
"\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"",
"\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"",
"\"$(SRCROOT)/../../../cocos2dx/include\"", "\"$(SRCROOT)/../../../cocos2dx/include\"",
"\"$(SRCROOT)/../../../CocosDenshion/include\"", "\"$(SRCROOT)/../../../audio/include\"",
"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
"\"$(SRCROOT)/../../../external\"", "\"$(SRCROOT)/../../../external\"",