Merge pull request cisco#784 from mstorsjo/renamed-lib

Take the new external library name in use, fix building for android
huili2 · May 4, 2014 · 5c5a233 · 5c5a233
2 parents e4a9c7f + b4fdfa6
commit 5c5a233
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/build/platform-android.mk b/build/platform-android.mk
@@ -38,7 +38,7 @@ AR = $(TOOLCHAINPREFIX)ar
 CFLAGS += -DLINUX -DANDROID_NDK -fpic --sysroot=$(SYSROOT)
 CXXFLAGS += -fno-rtti -fno-exceptions
 LDFLAGS += --sysroot=$(SYSROOT)
-SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,libwels.so
+SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so
 
 STL_INCLUDES = \
     -I$(NDKROOT)/sources/cxx-stl/stlport/stlport

diff --git a/build/platform-msvc-common.mk b/build/platform-msvc-common.mk
@@ -33,5 +33,5 @@ EXEEXT=.exe
 OBJ=obj
 SHAREDLIBSUFFIX=dll
 SHARED=-LD
-SHLDFLAGS=-link -def:wels.def -implib:wels_dll.lib
-EXTRA_LIBRARY=wels_dll.lib
+SHLDFLAGS=-link -def:openh264.def -implib:$(PROJECT_NAME)_dll.lib
+EXTRA_LIBRARY=$(PROJECT_NAME)_dll.lib
diff --git a/codec/build/android/dec/jni/welsdecdemo.mk b/codec/build/android/dec/jni/welsdecdemo.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := wels
-LOCAL_SRC_FILES := ../../../../../libwels.so
+LOCAL_SRC_FILES := ../../../../../libopenh264.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 

diff --git a/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java b/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java
@@ -104,7 +104,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
     private static final String TAG = "welsdec";
     static {
         try {
-            System.loadLibrary("wels");
+            System.loadLibrary("openh264");
             System.loadLibrary("stlport_shared");
             System.loadLibrary("welsdecdemo");
             Log.v(TAG, "Load libwelsdec successful");

diff --git a/codec/build/android/enc/jni/welsencdemo.mk b/codec/build/android/enc/jni/welsencdemo.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := wels
-LOCAL_SRC_FILES := ../../../../../libwels.so
+LOCAL_SRC_FILES := ../../../../../libopenh264.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 

diff --git a/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java b/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java
@@ -104,7 +104,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
     private static final String TAG = "welsenc";
     static {
         try {
-            System.loadLibrary("wels");
+            System.loadLibrary("openh264");
             System.loadLibrary("stlport_shared");
             System.loadLibrary("welsencdemo");
             Log.v(TAG, "Load libwelsencdemo.so successful");

diff --git a/wels.def → openh264.def b/wels.def → openh264.def