mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: Fixed building and linking

Browse Source
This commit is contained in:
Mario Liebisch 2014-12-26 18:29:13 +01:00
parent 592a25b768
commit 26f8c74c43
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SFML/Android.mk
View File

@ -42,7 +42,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sfml-audio LOCAL_MODULE := sfml-audio
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio.so LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio.so
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal sndfile LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal
prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
prebuilt := $(strip $(wildcard $(prebuilt_path))) prebuilt := $(strip $(wildcard $(prebuilt_path)))
@ -132,7 +132,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sfml-audio-d LOCAL_MODULE := sfml-audio-d
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio-d.so LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio-d.so
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d openal sndfile LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d openal
prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
prebuilt := $(strip $(wildcard $(prebuilt_path))) prebuilt := $(strip $(wildcard $(prebuilt_path)))

1
src/SFML/Main/SFMLActivity.cpp
View File

@ -174,7 +174,6 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
#undef _SFML_S #undef _SFML_S
#undef _SFML_QS #undef _SFML_QS
#endif #endif
loadLibrary("sndfile", lJNIEnv, ObjectActivityInfo);
loadLibrary("openal", lJNIEnv, ObjectActivityInfo); loadLibrary("openal", lJNIEnv, ObjectActivityInfo);
#if !defined(SFML_DEBUG) #if !defined(SFML_DEBUG)