diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-02-09 14:38:30 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-02-09 14:38:30 +0000 |
| commit | 333fbd7e724d93411250a86659eca9f14d6ff5c8 (patch) | |
| tree | 6dbfeeb75efe5e4ded677cf42216909778928a0f /pjmedia | |
| parent | 34f4ce979c4d04a00460988325dc3c28748f1834 (diff) | |
Failed attempt to build pjmedia with DirectSound on Linux
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@171 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/Makefile | 30 | ||||
| -rw-r--r-- | pjmedia/build/os-win32.mak | 13 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/codec.h | 4 |
3 files changed, 31 insertions, 16 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 3febac90..4394c7d2 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -12,7 +12,8 @@ export PJMEDIA_LIB:=../lib/libpjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIB # export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include \ - $(CC_INC)../../pjlib-util/include + $(CC_INC)../../pjlib-util/include \ + $(CC_INC)../src/pjmedia/portaudio export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ @@ -27,18 +28,18 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ PA_DIR:=portaudio export PJMEDIA_SRCDIR = ../src/pjmedia export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - codec.o errno.o g711.o jbuf.o mediamgr.o rtcp.o \ - rtp.o sdp.o sdp_cmp.o sdp_neg.o stream.o \ -# pasound.o \ -# $(PA_DIR)/pa_allocation.o \ -# $(PA_DIR)/pa_converters.o \ -# $(PA_DIR)/pa_cpuload.o \ -# $(PA_DIR)/pa_dither.o \ -# $(PA_DIR)/pa_front.o \ -# $(PA_DIR)/pa_process.o \ -# $(PA_DIR)/pa_skeleton.o \ -# $(PA_DIR)/pa_stream.o \ -# $(PA_DIR)/pa_trace.o + codec.o endpoint.o errno.o g711.o jbuf.o rtcp.o \ + rtp.o sdp.o sdp_cmp.o sdp_neg.o session.o stream.o \ + pasound.o \ + $(PA_DIR)/pa_allocation.o \ + $(PA_DIR)/pa_converters.o \ + $(PA_DIR)/pa_cpuload.o \ + $(PA_DIR)/pa_dither.o \ + $(PA_DIR)/pa_front.o \ + $(PA_DIR)/pa_process.o \ + $(PA_DIR)/pa_skeleton.o \ + $(PA_DIR)/pa_stream.o \ + $(PA_DIR)/pa_trace.o export PJMEDIA_CFLAGS += $(_CFLAGS) @@ -59,7 +60,8 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT # # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. # -TARGETS := pjmedia pjmedia-test +TARGETS := pjmedia +#pjmedia-test all: $(TARGETS) diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak new file mode 100644 index 00000000..cb58993f --- /dev/null +++ b/pjmedia/build/os-win32.mak @@ -0,0 +1,13 @@ +# +# OS specific configuration for Win32 OS target. +# + +# +# PJMEDIA_OBJS specified here are object files to be included in PJMEDIA +# (the library) for this specific operating system. Object files common +# to all operating systems should go in Makefile instead. +# +export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \ + $(PA_DIR)/pa_win_ds.o + +export OS_CFLAGS += -DPA_NO_ASIO diff --git a/pjmedia/include/pjmedia/codec.h b/pjmedia/include/pjmedia/codec.h index 75135d62..f10e9ab5 100644 --- a/pjmedia/include/pjmedia/codec.h +++ b/pjmedia/include/pjmedia/codec.h @@ -338,12 +338,12 @@ struct pjmedia_codec_factory /** * Codec manager maintains codec factory etc. */ -typedef struct pjmedia_codec_mgr +struct pjmedia_codec_mgr { pjmedia_codec_factory factory_list; unsigned codec_cnt; pjmedia_codec_info codecs[PJMEDIA_CODEC_MGR_MAX_CODECS]; -} pjmedia_codec_mgr; +}; |