lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Android] Removed ogg, FLAC, vorbis and vorbisenc dependencies

Browse source
This commit is contained in:
Jonathan De Wachter 2013-09-23 13:39:08 +02:00
parent cc0d982f72
commit 90d8b37442
20 changed files with 6 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/SFML/Android.mk
View file

@ -4,7 +4,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sfml-system
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-system.so
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_LDLIBS := -llog -landroid
include $(PREBUILT_SHARED_LIBRARY)
@ -12,7 +11,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sfml-window
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-window.so
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_LDLIBS := -lEGL
LOCAL_EXPORT_LDLIBS := -lEGL -llog -landroid
LOCAL_SHARED_LIBRARIES := sfml-system
include $(PREBUILT_SHARED_LIBRARY)
@ -21,10 +20,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sfml-graphics
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-graphics.so
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
#LOCAL_EXPORT_LDLIBS := -lGLESv1_CM
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/extlibs/include
LOCAL_SHARED_LIBRARIES := freetype jpeg
LOCAL_SHARED_LIBRARIES += sfml-system sfml-window
include $(PREBUILT_SHARED_LIBRARY)
@ -33,9 +28,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sfml-audio
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio.so
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
#LOCAL_EXPORT_LDLIBS := -lOpenSLES
LOCAL_SHARED_LIBRARIES := openal sndfile
LOCAL_SHARED_LIBRARIES += sfml-system sfml-window
LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal sndfile
include $(PREBUILT_SHARED_LIBRARY)
@ -51,7 +44,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sfml-main
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-main.a
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_SHARED_LIBRARIES := sfml-system sfml-window
LOCAL_SHARED_LIBRARIES := sfml-window sfml-system
include $(PREBUILT_STATIC_LIBRARY)

9
src/SFML/Audio/CMakeLists.txt
View file

@ -49,14 +49,7 @@ else()
find_host_package(OpenAL REQUIRED)
find_host_package(Sndfile REQUIRED)
set(AUDIO_EXT_INCLUDE_PATHS ${OPENAL_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIR})
set(AUDIO_EXT_LIBS -landroid
-lOpenSLES
${OPENAL_LIBRARY}
${SNDFILE_LIBRARY}
${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libvorbisenc.so
${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libvorbis.so
${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libFLAC.so
${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libogg.so)
set(AUDIO_EXT_LIBS -landroid -lOpenSLES ${OPENAL_LIBRARY} ${SNDFILE_LIBRARY})
endif()
# add include paths of external libraries

10
src/SFML/Main/SFMLActivity.cpp
View file

@ -67,7 +67,7 @@ void* loadLibrary(const char* libraryName, JNIEnv* lJNIEnv, jobject& ObjectActiv
}
// Release the Java string
lJNIEnv->ReleaseStringUTFChars(THESTRING, pathStr);
lJNIEnv->ReleaseStringUTFChars(javaLibraryPath, libraryPath);
return handle;
}
@ -103,7 +103,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
lResult=lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs);
if (lResult == JNI_ERR) {
LOG("Couldn't attach the current thread to the Java virtual machine");
LOGE("Couldn't attach the current thread to the Java virtual machine");
exit(1);
}
@ -137,13 +137,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
loadLibrary("stlport_shared", lJNIEnv, ObjectActivityInfo);
loadLibrary("sfml-system", lJNIEnv, ObjectActivityInfo);
loadLibrary("sfml-window", lJNIEnv, ObjectActivityInfo);
loadLibrary("jpeg", lJNIEnv, ObjectActivityInfo);
loadLibrary("freetype", lJNIEnv, ObjectActivityInfo);
loadLibrary("sfml-graphics", lJNIEnv, ObjectActivityInfo);
loadLibrary("ogg", lJNIEnv, ObjectActivityInfo);
loadLibrary("FLAC", lJNIEnv, ObjectActivityInfo);
loadLibrary("vorbis", lJNIEnv, ObjectActivityInfo);
loadLibrary("vorbisenc", lJNIEnv, ObjectActivityInfo);
loadLibrary("sndfile", lJNIEnv, ObjectActivityInfo);
loadLibrary("openal", lJNIEnv, ObjectActivityInfo);
loadLibrary("sfml-audio", lJNIEnv, ObjectActivityInfo);