thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove separate OpenSL .so, update native accordingly. Fix connection error reporting in HomebrewStore

Browse source
This commit is contained in:
Henrik Rydgard 2015-07-19 17:33:38 +02:00
parent 0393da5a59
commit b6e9a47974
5 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Core/FileLoaders/HTTPFileLoader.cpp
View file

@ -23,6 +23,7 @@
HTTPFileLoader::HTTPFileLoader(const std::string &filename) HTTPFileLoader::HTTPFileLoader(const std::string &filename)
: filesize_(0), filepos_(0), url_(filename), filename_(filename), connected_(false) { : filesize_(0), filepos_(0), url_(filename), filename_(filename), connected_(false) {
if (!client_.Resolve(url_.Host().c_str(), url_.Port())) { if (!client_.Resolve(url_.Host().c_str(), url_.Port())) {
// TODO: Should probably set some flag?
return; return;
} }

3
UI/Store.cpp
View file

@ -320,12 +320,15 @@ void StoreScreen::update(InputState &input) {
listing_->buffer().TakeAll(&listingJson); listing_->buffer().TakeAll(&listingJson);
// printf("%s\n", listingJson.c_str()); // printf("%s\n", listingJson.c_str());
loading_ = false; loading_ = false;
connectionError_ = false;
ParseListing(listingJson); ParseListing(listingJson);
RecreateViews(); RecreateViews();
} else { } else {
// Failed to contact store. Don't do anything. // Failed to contact store. Don't do anything.
ELOG("Download failed : error code %d", listing_->ResultCode());
connectionError_ = true; connectionError_ = true;
loading_ = false;
RecreateViews(); RecreateViews();
} }

20
android/jni/Android.mk
View file

@ -1,25 +1,5 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
# BEGIN Native Audio Separate Library - copy paste this section to your Android.mk
include $(CLEAR_VARS)
LOCAL_MODULE := native_audio
LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -D__STDC_CONSTANT_MACROS
# yes, it's really CPPFLAGS for C++
LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti
NATIVE := ../../native
LOCAL_SRC_FILES := \
$(NATIVE)/android/native-audio-so.cpp
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/$(NATIVE) \
$(LOCAL_PATH)
LOCAL_LDLIBS := -lOpenSLES -llog
include $(BUILD_SHARED_LIBRARY)
# END Native Audio Separate Library - copy paste this section to your Android.mk
include $(CLEAR_VARS) include $(CLEAR_VARS)
#TARGET_PLATFORM := android-8 #TARGET_PLATFORM := android-8

2
android/jni/Locals.mk
View file

@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH) $(LOCAL_PATH)
LOCAL_STATIC_LIBRARIES := native libzip LOCAL_STATIC_LIBRARIES := native libzip
LOCAL_LDLIBS := -lz -lGLESv2 -lEGL -ldl -llog LOCAL_LDLIBS := -lz -lGLESv2 -lOpenSLES -lEGL -ldl -llog
# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) # ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)

2
native

@ -1 +1 @@
Subproject commit ad5301873f7db44eb4b13bc7592ffe511928325a Subproject commit 166d07df0c37c038a02bda687ba77a5bbfd1d01c