Changeset 5757 for pjproject

Timestamp:

Mar 19, 2018 12:26:55 AM (7 years ago)

Author:

ming

Message:

Re #2059: Fixed the ordering of CXXFLAGS to prevent build issue on Android, such as below:

In file included from /android-ndk-r15c/platforms/android-15/arch-arm/usr/include/linux/posix_types.h:41:0,

from /android-ndk-r15c/platforms/android-15/arch-arm/usr/include/sys/types.h:37,
from /android-ndk-r15c/platforms/android-15/arch-arm/usr/include/stdio.h:50,
from ../../pjlib/include/pj/compat/string.h:39,
from ../../pjlib/include/pj/string.h:29,
from ../include/pjmedia/frame.h:28,
from ../include/pjmedia/port.h:30,
from ../include/pjmedia/codec.h:29,
from ../include/pjmedia-codec/types.h:29,
from ../include/pjmedia-codec/openh264.h:22,
from ../src/pjmedia-codec/openh264.cpp:19:

/android-ndk-r15c/sysroot/usr/include/arm-linux-androideabi/asm/posix_types.h:33:37: fatal error: asm-generic/posix_types.h: No such file or directory

#include <asm-generic/posix_types.h>

File:

• pjproject/trunk/pjmedia/build/Makefile (modified) (1 diff)

pjproject/trunk/pjmedia/build/Makefile

@@ -46 +46 @@
                    $(CC_INC)../../pjnath/include \
                    $(CC_INC)../..
-export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
-                   $(HOST_CXXFLAGS) $(CXXFLAGS)
+export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+                   $(HOST_CXXFLAGS) $(CXXFLAGS) $(_CFLAGS) 
 
 export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \