Changeset 113 for trunk/builders/androidapplestreaming/jni/Android.mk

Timestamp:

09/01/10 08:55:52 (21 months ago)

Author:

shiretu

Message:

-- android stuff

File:

• trunk/builders/androidapplestreaming/jni/Android.mk (modified) (3 diffs)

trunk/builders/androidapplestreaming/jni/Android.mk

@@ -17 +17 @@
 PROJDIR := $(PWD)/../..
 
+REVISION= $(shell svnversion $(PROJDIR))
 PLATFORM_DEFINES := -DLITTLE_ENDIAN_BYTE_ALIGNED -DNET_EPOLL -DANDROID -DHAS_SAFE_LOGGER
 
@@ -24 +25 @@
 MODULES_DEFINES += -DHAS_PROTOCOL_TS
 MODULES_DEFINES += -DHAS_PROTOCOL_VAR
-MODULES_DEFINES += -DHAS_PROTOCOL_RTMP
+#MODULES_DEFINES += -DHAS_PROTOCOL_RTMP
 #MODULES_DEFINES += -DHAS_PROTOCOL_LIVEFLV
 #MODULES_DEFINES += -DHAS_MEDIA_MP4
@@ -30 +31 @@
 #MODULES_DEFINES += -DHAS_MEDIA_FLV
 
+
+#RTSP related defines
+CreateRTCPPacket=CreateRTCPPacket_mystyle
+#CreateRTCPPacket=CreateRTCPPacket_live555style
+#CreateRTCPPacket=CreateRTCPPacket_none
+FeedDataAudioMPEG4Generic=FeedDataAudioMPEG4Generic_one_by_one
+#FeedDataAudioMPEG4Generic=FeedDataAudioMPEG4Generic_aggregate
+HAS_MS_TIMER=0
+
+MODULES_DEFINES+=-DCreateRTCPPacket=$(CreateRTCPPacket)
+MODULES_DEFINES+=-DFeedDataAudioMPEG4Generic=$(FeedDataAudioMPEG4Generic)
+ifeq ($(HAS_MS_TIMER), 1)
+        MODULES_DEFINES+=-DHAS_MS_TIMER
+endif
+
 GLOBAL_DEFINES := $(PLATFORM_DEFINES) $(MODULES_DEFINES)
+GLOBAL_DEFINES := $(GLOBAL_DEFINES) -DBUILD_SIGNATURE="\"$(REVISION),$(GLOBAL_DEFINES)\""
 
 INCLUDE_DIRECTORIES := $(PROJDIR)/sources/common/include $(PROJDIR)/sources/thelib/include $(PROJDIR)/sources/applications/applestreamingclient/include \