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

Merge pull request #2842 from dumganhar/develop 

[Android] Don't use c++11 feature in OpenSLEngine.cpp. [iOS] Adding i386 arch for MoonWarriors.
This commit is contained in:
James Chen 2013-06-09 01:02:22 -07:00
parent d1a628f364 6b0c2667fd
commit b1206700f3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CocosDenshion/android/opensl/OpenSLEngine.cpp
View File

@ -289,7 +289,8 @@ bool initAudioPlayer(AudioPlayer* player, const char* filename)
if(fp){ if(fp){
SLDataLocator_URI loc_fd = {SL_DATALOCATOR_URI , (SLchar*)filename}; SLDataLocator_URI loc_fd = {SL_DATALOCATOR_URI , (SLchar*)filename};
SLDataFormat_MIME format_mime = {SL_DATAFORMAT_MIME, NULL, SL_CONTAINERTYPE_UNSPECIFIED}; 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); return createAudioPlayerBySource(player);
} }
LOGD("file not found! Stop preload file: %s", filename); LOGD("file not found! Stop preload file: %s", filename);

4
samples/Javascript/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj
View File

@ -633,7 +633,7 @@
PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "armv7 armv7s"; VALID_ARCHS = "armv7 armv7s i386";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Debug; name = Debug;
@ -680,7 +680,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv7 armv7s"; VALID_ARCHS = "armv7 armv7s i386";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Release; name = Release;