generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename cpufeatures symbols to avoid colisions in static builds

Browse Source 
This fixes potential duplicated symbols in static links
with other libraries including the cpufeatures.o object file
This commit is contained in:
Andoni Morales Alastruey 2014-03-25 17:16:28 +01:00
parent f305096f01
commit 3a4cea63ef
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/platform-android.mk
View File

@ -59,5 +59,10 @@ encdemo: libraries
COMMON_INCLUDES += -I$(NDKROOT)/sources/android/cpufeatures
COMMON_OBJS += $(COMMON_SRCDIR)/cpu-features.$(OBJ)
COMMON_CFLAGS += \
-Dandroid_getCpuIdArm=wels_getCpuIdArm -Dandroid_setCpuArm=wels_setCpuArm \
-Dandroid_getCpuCount=wels_getCpuCount -Dandroid_getCpuFamily=wels_getCpuFamily \
-Dandroid_getCpuFeatures=wels_getCpuFeatures -Dandroid_setCpu=wels_setCpu \
codec/common/cpu-features.$(OBJ): $(NDKROOT)/sources/android/cpufeatures/cpu-features.c
$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c $(CXX_O) $<