sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finishing autoconf work, also fixed compilation error in publish.h 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@689 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2006-08-20 20:47:34 +00:00
parent c8141a834a
commit c4c61d0216
20 changed files with 2001 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1709
aconfigure
View File

File diff suppressed because it is too large Load Diff

247
aconfigure.ac
View File

@ -1,9 +1,51 @@
AC_INIT(pjproject,0.5.7)
AC_INIT(pjproject,0.5.8)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AC_CONFIG_HEADER(pjlib/include/pj/compat/os_auto.h)
AC_CONFIG_HEADER([pjlib/include/pj/compat/os_auto.h
pjlib/include/pj/compat/m_auto.h
])
AC_CONFIG_FILES([build.mak
build/os-auto.mak
pjlib/build/os-auto.mak
pjlib-util/build/os-auto.mak
pjmedia/build/os-auto.mak
pjsip/build/os-auto.mak
])
AC_PROG_CC
AC_PROG_CXX
AC_LANG_C
AC_CHECK_LIB(pthread,pthread_create)
AC_MSG_RESULT([Setting PJ_M_NAME to $target_cpu])
AC_DEFINE_UNQUOTED(PJ_M_NAME,["$target_cpu"])
# Endianness detection
AC_C_BIGENDIAN([AC_SUBST(ac_bigendian,1)
AC_DEFINE(PJ_IS_LITTLE_ENDIAN,0)
AC_DEFINE(PJ_IS_BIG_ENDIAN,1)
],
[AC_SUBST(ac_bigendian,0)
AC_DEFINE(PJ_IS_LITTLE_ENDIAN,1)
AC_DEFINE(PJ_IS_BIG_ENDIAN,0)
])
# --disable-floating-point option
AC_ARG_ENABLE(floating-point,
AC_HELP_STRING([--disable-floating-point],
[Disable floating point where possible]),
[if test "$enable_floating_point" = "no"; then
AC_DEFINE(PJ_HAS_FLOATING_POINT,0)
AC_MSG_RESULT([Checking if floating point is disabled... yes])
fi],
[
AC_DEFINE(PJ_HAS_FLOATING_POINT,1)
AC_MSG_RESULT([Checking if floating point is disabled... no])
AC_CHECK_LIB(m,fmod)
])
AC_CHECK_HEADER(arpa/inet.h,[AC_DEFINE(PJ_HAS_ARPA_INET_H,1)])
AC_CHECK_HEADER(assert.h,[AC_DEFINE(PJ_HAS_ASSERT_H,1)])
AC_CHECK_HEADER(ctype.h,[AC_DEFINE(PJ_HAS_CTYPE_H,1)])
@ -30,7 +72,23 @@ AC_CHECK_HEADER(mswsock.h,[AC_DEFINE(PJ_HAS_MSWSOCK_H,1)])
AC_CHECK_HEADER(winsock.h,[AC_DEFINE(PJ_HAS_WINSOCK_H,1)])
AC_CHECK_HEADER(winsock2.h,[AC_DEFINE(PJ_HAS_WINSOCK2_H,1)])
AC_CHECK_HEADER(alsa/version.h)
AC_MSG_RESULT([Setting PJ_OS_NAME to $target])
AC_DEFINE_UNQUOTED(PJ_OS_NAME,["$target"])
AC_MSG_RESULT([Setting PJ_HAS_ERRNO_VAR to 1])
AC_DEFINE(PJ_HAS_ERRNO_VAR,1)
AC_MSG_RESULT([Setting PJ_HAS_HIGH_RES_TIMER to 1])
AC_DEFINE(PJ_HAS_HIGH_RES_TIMER,1)
AC_MSG_RESULT([Setting PJ_HAS_MALLOC to 1])
AC_DEFINE(PJ_HAS_MALLOC,1)
AC_MSG_RESULT([Setting PJ_NATIVE_STRING_IS_UNICODE to 0])
AC_DEFINE(PJ_NATIVE_STRING_IS_UNICODE,0)
AC_MSG_RESULT([Setting PJ_ATOMIC_VALUE_TYPE to long])
AC_DEFINE(PJ_ATOMIC_VALUE_TYPE,long)
# Determine if inet_aton() is available
AC_MSG_CHECKING([if inet_aton is available])
@ -68,14 +126,156 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
[pthread_rwlock_t *x;])],
[AC_DEFINE(PJ_EMULATE_RWMUTEX,0)
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
[AC_DEFINE(PJ_EMULATE_RWMUTEX,1)
AC_MSG_RESULT(no)])
##########################################
#
# PJMEDIA
#
# Sound device backend selection
AC_SUBST(ac_pjmedia_snd)
case $target in
*cygwin* | *win* | *mingw*)
ac_pjmedia_snd=pa_win32
AC_MSG_RESULT([Checking sound device backend... win32 sound])
;;
*rtems*)
ac_pjmedia_snd=null
AC_MSG_RESULT([Checking sound device backend... null sound])
;;
*darwin*)
ac_pjmedia_snd=pa_darwin_os
AC_MSG_RESULT([Checking sound device backend... coreaudio])
;;
*)
ac_pjmedia_snd=pa_unix
AC_CHECK_HEADER(alsa/version.h,
[AC_SUBST(ac_pa_use_alsa,1)
LIBS="$LIBS -lasound"
],
[AC_SUBST(ac_pa_use_alsa,0)])
AC_MSG_RESULT([Checking sound device backend... unix])
;;
esac
# Include resampling small filter
AC_SUBST(ac_no_small_filter)
AC_ARG_ENABLE(small-filter,
AC_HELP_STRING([--disable-small-filter],
[Exclude small filter in resampling]),
[if test "$enable_small_filter" = "no"; then
[ac_no_small_filter='-DPJMEDIA_HAS_SMALL_FILTER=0']
AC_MSG_RESULT([Checking if small filter is disabled... yes])
fi],
AC_MSG_RESULT([Checking if small filter is disabled... no]))
# Include resampling large filter
AC_SUBST(ac_no_large_filter)
AC_ARG_ENABLE(large-filter,
AC_HELP_STRING([--disable-large-filter],
[Exclude large filter in resampling]),
[if test "$enable_large_filter" = "no"; then
[ac_no_large_filter='-DPJMEDIA_HAS_LARGE_FILTER=0']
AC_MSG_RESULT([Checking if large filter is disabled... yes])
fi],
AC_MSG_RESULT([Checking if large filter is disabled... no]))
# Include G.711 Annex A PLC
AC_SUBST(ac_no_g711_plc)
AC_ARG_ENABLE(g711-plc,
AC_HELP_STRING([--disable-g711-plc],
[Exclude G.711 Annex A PLC]),
[if test "$enable_g711_plc" = "no"; then
[ac_no_g711_plc='-DPJMEDIA_HAS_G711_PLC=0']
AC_MSG_RESULT([Checking if G.711 Annex A PLC is disabled...yes])
fi],
AC_MSG_RESULT([Checking if G.711 Annex A PLC is disabled...no]))
# Include Speex AEC
AC_SUBST(ac_no_speex_aec)
AC_ARG_ENABLE(speex-aec,
AC_HELP_STRING([--disable-speex-aec],
[Exclude Speex Acoustic Echo Canceller/AEC]),
[if test "$enable_speex_aec" = "no"; then
[ac_no_speex_aec='-DPJMEDIA_HAS_SPEEX_AEC=0']
AC_MSG_RESULT([Checking if Speex AEC is disabled...yes])
fi],
AC_MSG_RESULT([Checking if Speex AEC is disabled...no]))
# Include G711 codec
AC_SUBST(ac_no_g711_codec)
AC_ARG_ENABLE(g711-codec,
AC_HELP_STRING([--disable-g711-codec],
[Exclude G.711 codecs from the build]),
[if test "$enable_g711_codec" = "no"; then
[ac_no_g711_codec=1]
AC_MSG_RESULT([Checking if G.711 codec is disabled...yes])
fi],
AC_MSG_RESULT([Checking if G.711 codec is disabled...no]))
# Include L16 codec
AC_SUBST(ac_no_l16_codec)
AC_ARG_ENABLE(l16-codec,
AC_HELP_STRING([--disable-l16-codec],
[Exclude Linear/L16 codec family from the build]),
[if test "$enable_l16_codec" = "no"; then
[ac_no_l16_codec=1]
AC_MSG_RESULT([Checking if L16 codecs are disabled...yes])
fi],
AC_MSG_RESULT([Checking if G.711 codec is disabled...no]))
# Include GSM codec
AC_SUBST(ac_no_gsm_codec)
AC_ARG_ENABLE(gsm-codec,
AC_HELP_STRING([--disable-gsm-codec],
[Exclude GSM codec in the build]),
[if test "$enable_gsm_codec" = "no"; then
[ac_no_gsm_codec=1]
AC_MSG_RESULT([Checking if GSM codec is disabled...yes])
fi],
AC_MSG_RESULT([Checking if GSM codec is disabled...no]))
# Include Speex codec
AC_SUBST(ac_no_speex_codec)
AC_ARG_ENABLE(speex-codec,
AC_HELP_STRING([--disable-speex-codec],
[Exclude Speex codecs in the build]),
[if test "$enable_speex_codec" = "no"; then
[ac_no_speex_codec=1]
AC_MSG_RESULT([Checking if Speex codec is disabled...yes])
fi],
AC_MSG_RESULT([Checking if Speex codec is disabled...no]))
# Include iLBC codec
AC_SUBST(ac_no_ilbc_codec)
AC_ARG_ENABLE(ilbc-codec,
AC_HELP_STRING([--disable-ilbc-codec],
[Exclude iLBC codec in the build]),
[if test "$enable_ilbc_codec" = "no"; then
[ac_no_ilbc_codec=1]
AC_MSG_RESULT([Checking if iLBC codec is disabled...yes])
fi],
AC_MSG_RESULT([Checking if iLBC codec is disabled...no]))
##########################################
#
# MANUAL CONFIG
#
# Determine if select() requires nfds to be filled up with
# correct value (max_fd+1). If zero, nfds will be filled up with
# PJ_FD_SETSIZE
AC_MSG_CHECKING([if select() needs correct nfds])
case $target in
*rtems*) AC_DEFINE(PJ_SELECT_NEEDS_NFDS,1)
AC_MSG_CHECKING([if select() needs correct nfds])
AC_MSG_RESULT(yes)
;;
*) AC_DEFINE(PJ_SELECT_NEEDS_NFDS,0)
@ -125,24 +325,25 @@ case $target in
;;
esac
AC_MSG_RESULT([Setting PJ_OS_NAME to $target])
AC_DEFINE_UNQUOTED(PJ_OS_NAME,["$target"])
AC_MSG_RESULT([Setting PJ_HAS_ERRNO_VAR to 1])
AC_DEFINE(PJ_HAS_ERRNO_VAR,1)
AC_MSG_RESULT([Setting PJ_HAS_HIGH_RES_TIMER to 1])
AC_DEFINE(PJ_HAS_HIGH_RES_TIMER,1)
AC_MSG_RESULT([Setting PJ_HAS_MALLOC to 1])
AC_DEFINE(PJ_HAS_MALLOC,1)
AC_MSG_RESULT([Setting PJ_NATIVE_STRING_IS_UNICODE to 0])
AC_DEFINE(PJ_NATIVE_STRING_IS_UNICODE,0)
AC_MSG_RESULT([Setting PJ_ATOMIC_VALUE_TYPE to long])
AC_DEFINE(PJ_ATOMIC_VALUE_TYPE,long)
AC_SUBST(target)
AC_SUBST(ac_cross_compile)
if test "$build" = "$host"; then
ac_cross_compile=
else
ac_cross_compile=${host}-
fi
AC_SUBST(ac_linux_poll,select)
AC_SUBST(ac_host,unix)
AC_SUBST(ac_main_obj)
case $target in
*rtems*)
ac_main_obj=main_rtems.o
;;
*)
ac_main_obj=main.o
;;
esac
AC_SUBST(CC)
AC_OUTPUT()

8
build.mak.in Normal file
View File

@ -0,0 +1,8 @@
# @configure_input@
export MACHINE_NAME := auto
export OS_NAME := auto
export HOST_NAME := unix
export CC_NAME := @CC@
export TARGET_NAME := @target@
export CROSS_COMPILE := @ac_cross_compile@
export LINUX_POLL := @ac_linux_poll@

1
build/m-auto.mak Normal file
View File

@ -0,0 +1 @@
# Nothing needs to be defined here

11
build/os-auto.mak.in Normal file
View File

@ -0,0 +1,11 @@
# @configure_input@
export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CFLAGS@
export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CXXFLAGS@
export OS_LDFLAGS := @LDFLAGS@ @LIBS@
export OS_SOURCES :=

2
build/os-darwinos.mak
View File

@ -2,7 +2,7 @@ export OS_CFLAGS := $(CC_DEF)PJ_DARWINOS=1
export OS_CXXFLAGS :=
export OS_LDFLAGS := $(CC_LIB)pthread$(LIBEXT2) -framework CoreAudio
export OS_LDFLAGS := $(CC_LIB)pthread$(LIBEXT2) -framework CoreAudio -lm
export OS_SOURCES :=

2
build/os-linux.mak
View File

@ -2,7 +2,7 @@ export OS_CFLAGS := $(CC_DEF)PJ_LINUX=1
export OS_CXXFLAGS :=
export OS_LDFLAGS := $(CC_LIB)pthread$(LIBEXT2)
export OS_LDFLAGS := $(CC_LIB)pthread$(LIBEXT2) -lm
export OS_SOURCES :=

2
build/os-rtems.mak
View File

@ -11,7 +11,7 @@ export OS_CFLAGS := $(CC_DEF)PJ_RTEMS=1 \
export OS_CXXFLAGS :=
export OS_LDFLAGS := -B$(RTEMS_LIBRARY_PATH)/lib/ -specs bsp_specs -qrtems
export OS_LDFLAGS := -B$(RTEMS_LIBRARY_PATH)/lib/ -specs bsp_specs -qrtems -lm
export OS_SOURCES :=

3
build/os-sunos.mak
View File

@ -5,7 +5,8 @@ export OS_CXXFLAGS :=
export OS_LDFLAGS := $(CC_LIB)pthread$(LIBEXT2) \
$(CC_LIB)socket$(LIBEXT2) \
$(CC_LIB)rt$(LIBEXT2) \
$(CC_LIB)nsl$(LIBEXT2)
$(CC_LIB)nsl$(LIBEXT2) \
$(CC_LIB)m$(LIBEXT2)
export OS_SOURCES :=

3
build/os-win32.mak
View File

@ -4,7 +4,8 @@ export OS_CXXFLAGS :=
export OS_LDFLAGS := $(CC_LIB)wsock32$(LIBEXT2) \
$(CC_LIB)ws2_32$(LIBEXT2)\
$(CC_LIB)ole32$(LIBEXT2)
$(CC_LIB)ole32$(LIBEXT2)\
$(CC_LIB)m$(LIBEXT2)
export OS_SOURCES :=

3
pjlib-util/build/os-auto.mak.in Normal file
View File

@ -0,0 +1,3 @@
# @configure_input@
export UTIL_TEST_OBJS = @ac_main_obj@

35
pjlib/build/os-auto.mak.in Normal file
View File

@ -0,0 +1,35 @@
# @configure_input@
#
# PJLIB_OBJS specified here are object files to be included in PJLIB
# (the library) for this specific operating system. Object files common
# to all operating systems should go in Makefile instead.
#
export PJLIB_OBJS += addr_resolv_sock.o guid_simple.o \
log_writer_stdout.o os_core_unix.o \
os_error_unix.o os_time_unix.o \
os_timestamp_common.o os_timestamp_posix.o \
pool_policy_malloc.o sock_bsd.o sock_select.o
export PJLIB_OBJS += ioqueue_select.o
export PJLIB_OBJS += file_access_unistd.o file_io_ansi.o
#
# TEST_OBJS are operating system specific object files to be included in
# the test application.
#
export TEST_OBJS += @ac_main_obj@
#
# Additional LDFLAGS for pjlib-test
#
export TEST_LDFLAGS += @LDFLAGS@ @LIBS@
#
# TARGETS are make targets in the Makefile, to be executed for this given
# operating system.
#
export TARGETS = pjlib pjlib-test

38
pjlib/include/pj/compat/m_auto.h.in Normal file
View File

@ -0,0 +1,38 @@
/* $Id$ */
/*
* Copyright (C)2003-2006 Benny Prijono <benny@prijono.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __PJ_COMPAT_M_AUTO_H__
#define __PJ_COMPAT_M_AUTO_H__
/**
* @file m_auto.h
* @brief Automatically generated process definition file.
*/
#undef PJ_M_NAME
#undef PJ_IS_LITTLE_ENDIAN
#undef PJ_IS_BIG_ENDIAN
/* Specify if floating point is present/desired */
#undef PJ_HAS_FLOATING_POINT
/* Deprecated */
#define PJ_HAS_PENTIUM 0
#endif /* __PJ_COMPAT_M_AUTO_H__ */

16
pjlib/include/pj/config.h
View File

@ -39,7 +39,13 @@
/********************************************************************
* Include target OS specific configuration.
*/
#if defined(PJ_WIN32_WINCE) || defined(_WIN32_WCE) || defined(UNDER_CE)
#if defined(PJ_AUTOCONF)
/*
* Autoconf
*/
# include <pj/compat/os_auto.h>
#elif defined(PJ_WIN32_WINCE) || defined(_WIN32_WCE) || defined(UNDER_CE)
/*
* Windows CE
*/
@ -108,7 +114,13 @@
/********************************************************************
* Target machine specific configuration.
*/
#if defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \
#if defined(PJ_AUTOCONF)
/*
* Autoconf configured
*/
#include <pj/compat/m_auto.h>
#elif defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \
defined(_X86_) || defined(x86) || defined(__i386__) || \
defined(__i386) || defined(_M_IX86) || defined(__I86__)
/*

4
pjmedia/build/Makefile
View File

@ -11,7 +11,7 @@ export SOUND_OBJS = $(PORTAUDIO_OBJS)
# E.g., to exclude Speex, we need to exclude SPEEX_OBJS from CODEC_OBJS, AND specify
# "#define PJMEDIA_HAS_SPEEX_CODEC 0" in pj/config_site.h.
#
export CODEC_OBJS = $(GSM_OBJS) $(SPEEX_OBJS) $(ILBC_OBJS)
export CODEC_OBJS = l16.o $(GSM_OBJS) $(SPEEX_OBJS) $(ILBC_OBJS)
include ../../build/common.mak
@ -133,7 +133,7 @@ ILBC_OBJS := ilbc.o \
ILBC_CFLAGS :=
export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
export PJMEDIA_CODEC_OBJS += l16.o \
export PJMEDIA_CODEC_OBJS += \
$(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
$(CODEC_OBJS)
export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \

123
pjmedia/build/os-auto.mak.in Normal file
View File

@ -0,0 +1,123 @@
# @configure_input@
# PJMEDIA features exclusion
export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_g711_plc@ @ac_no_speex_aec@
# Define the desired sound device backend
# Valid values are:
# - pa_unix: PortAudio on Unix (OSS or ALSA)
# - pa_darwinos: PortAudio on MacOSX (CoreAudio)
# - pa_win32: PortAudio on Win32 (WMME)
# - ds: Win32 DirectSound (dsound.c)
# - null: Null sound device (nullsound.c)
AC_PJMEDIA_SND=@ac_pjmedia_snd@
# For Unix, specify if ALSA should be supported
AC_PA_USE_ALSA=@ac_pa_use_alsa@
# PortAudio endianness
AC_PA_BIGENDIAN=@ac_bigendian@
ifeq ($(AC_PA_BIGENDIAN),1)
export CFLAGS += -DPA_BIG_ENDIAN=1
else
export CFLAGS += -DPA_LITTLE_ENDIAN=1
endif
#
# Codecs
#
AC_NO_G711_CODEC=@ac_no_g711_codec@
AC_NO_L16_CODEC=@ac_no_l16_codec@
AC_NO_GSM_CODEC=@ac_no_gsm_codec@
AC_NO_SPEEX_CODEC=@ac_no_speex_codec@
AC_NO_ILBC_CODEC=@ac_no_ilbc_codec@
export CODEC_OBJS=
ifeq ($(AC_NO_G711_CODEC),1)
export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0
else
export CODEC_OBJS +=
endif
ifeq ($(AC_NO_L16_CODEC),1)
export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0
else
export CODEC_OBJS += l16.o
endif
ifeq ($(AC_NO_GSM_CODEC),1)
export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0
else
export CODEC_OBJS += $(GSM_OBJS)
endif
ifeq ($(AC_NO_SPEEX_CODEC),1)
export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0
else
export CODEC_OBJS += $(SPEEX_OBJS)
endif
ifeq ($(AC_NO_ILBC_CODEC),1)
export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0
else
export CODEC_OBJS += $(ILBC_OBJS)
endif
#
# PortAudio on Unix
#
ifeq ($(AC_PJMEDIA_SND),pa_unix)
# Host APIs and utils
export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_hostapis.o $(PA_DIR)/pa_unix_util.o
# Include ALSA?
ifeq ($(AC_PA_USE_ALSA),1)
export CFLAGS += -DPA_USE_ALSA=1
export PJMEDIA_OBJS += $(PA_DIR)/pa_linux_alsa.o
endif
export CFLAGS += -DPA_USE_OSS=1 \
-DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_oss.o
endif
#
# PortAudio on MacOS X
#
ifeq ($(AC_PJMEDIA_SND),pa_darwinos)
export PJMEDIA_OBJS += $(PA_DIR)/pa_mac_hostapis.o $(PA_DIR)/pa_unix_util.o \
$(PA_DIR)/pa_mac_core.o
export CFLAGS += -DPA_USE_COREAUDIO=1 \
-DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
endif
#
# PortAudio on Win32 (WMME)
#
ifeq ($(AC_PJMEDIA_SND),pa_win32)
export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \
$(PA_DIR)/pa_win_wmme.o
export CFLAGS += -DDPA_NO_ASIO -DPA_NO_DS \
-DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
endif
#
# Win32 DirectSound
#
ifeq ($(AC_PJMEDIA_SND),ds)
export SOUND_OBJS = dsound.o
export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND
endif
#
# Last resort, null sound device
#
ifeq ($(AC_PJMEDIA_SND),null)
export SOUND_OBJS = nullsound.o
export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND
endif

8
pjmedia/src/pjmedia/portaudio/pa_unix_hostapis.c
View File

@ -41,14 +41,14 @@ PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex
PaUtilHostApiInitializer *paHostApiInitializers[] =
{
#ifdef PA_USE_OSS
PaOSS_Initialize,
#endif
#ifdef PA_USE_ALSA
PaAlsa_Initialize,
#endif
#ifdef PA_USE_OSS
PaOSS_Initialize,
#endif
#ifdef PA_USE_JACK
PaJack_Initialize,
#endif

2
pjsip/build/Makefile
View File

@ -34,7 +34,7 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \
$(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
$(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
$(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
$(LDFLAGS) -lm
$(LDFLAGS)
###############################################################################

0
pjsip/build/os-auto.mak.in Normal file
View File

1
pjsip/include/pjsip-simple/publish.h
View File

@ -25,6 +25,7 @@
*/
#include <pjsip/sip_util.h>
#include <pjsip/sip_auth.h>
PJ_BEGIN_DECL