From 3cfa1a987349db989f59ac738844d4cf28069ef4 Mon Sep 17 00:00:00 2001 From: James Chen Date: Sun, 9 Jun 2013 15:08:52 +0800 Subject: [PATCH 1/2] [Android] Don't use c++11 feature in OpenSLEngine.cpp. --- CocosDenshion/android/opensl/OpenSLEngine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CocosDenshion/android/opensl/OpenSLEngine.cpp b/CocosDenshion/android/opensl/OpenSLEngine.cpp index 101bf59790..28d83fe448 100644 --- a/CocosDenshion/android/opensl/OpenSLEngine.cpp +++ b/CocosDenshion/android/opensl/OpenSLEngine.cpp @@ -289,7 +289,8 @@ bool initAudioPlayer(AudioPlayer* player, const char* filename) if(fp){ SLDataLocator_URI loc_fd = {SL_DATALOCATOR_URI , (SLchar*)filename}; SLDataFormat_MIME format_mime = {SL_DATAFORMAT_MIME, NULL, SL_CONTAINERTYPE_UNSPECIFIED}; - (player->audioSrc) = {&loc_fd, &format_mime}; + player->audioSrc.pLocator = &loc_fd; + player->audioSrc.pFormat = &format_mime; return createAudioPlayerBySource(player); } LOGD("file not found! Stop preload file: %s", filename); From 6b0c2667fdc9fd5b7c29b234ba744e13e81d5b90 Mon Sep 17 00:00:00 2001 From: James Chen Date: Sun, 9 Jun 2013 15:29:30 +0800 Subject: [PATCH 2/2] [iOS] Adding i386 arch for MoonWarriors. --- .../proj.ios/MoonWarriors.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/Javascript/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj b/samples/Javascript/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj index 55e4fcb618..7ef6a64af7 100644 --- a/samples/Javascript/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj +++ b/samples/Javascript/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj @@ -633,7 +633,7 @@ PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; - VALID_ARCHS = "armv7 armv7s"; + VALID_ARCHS = "armv7 armv7s i386"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -680,7 +680,7 @@ TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; VALIDATE_PRODUCT = YES; - VALID_ARCHS = "armv7 armv7s"; + VALID_ARCHS = "armv7 armv7s i386"; WRAPPER_EXTENSION = app; }; name = Release;