update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1497 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
e425e83049
commit
a4fc74c37e
|
@ -22,8 +22,10 @@ if CRASHPROT
|
||||||
AM_CFLAGS += -DCRASH_PROT
|
AM_CFLAGS += -DCRASH_PROT
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
AM_CFGARGS =
|
||||||
if IS64BITLINUX
|
if IS64BITLINUX
|
||||||
AM_CFLAGS += -m64 -march=k8 -fPIC
|
AM_CFLAGS += -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
|
||||||
|
AM_CFGARGS += --enable-64bit
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#put elsif win here
|
#put elsif win here
|
||||||
|
@ -183,6 +185,7 @@ modules: $(NAME)
|
||||||
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
|
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
|
||||||
@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
|
@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
|
||||||
@./build/addenv.sh build/freeswitch.env CC "$(CC)"
|
@./build/addenv.sh build/freeswitch.env CC "$(CC)"
|
||||||
|
@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
|
||||||
@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
|
@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
|
||||||
@rm -f build/freeswitch.env
|
@rm -f build/freeswitch.env
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,9 @@ build_triplet = @build@
|
||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
@ISLINUX_TRUE@am__append_1 = -Wl,-E
|
@ISLINUX_TRUE@am__append_1 = -Wl,-E
|
||||||
@CRASHPROT_TRUE@am__append_2 = -DCRASH_PROT
|
@CRASHPROT_TRUE@am__append_2 = -DCRASH_PROT
|
||||||
@IS64BITLINUX_TRUE@am__append_3 = -m64 -march=k8 -fPIC
|
@IS64BITLINUX_TRUE@am__append_3 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
|
||||||
@ISMAC_TRUE@am__append_4 = -DMACOSX
|
@IS64BITLINUX_TRUE@am__append_4 = --enable-64bit
|
||||||
|
@ISMAC_TRUE@am__append_5 = -DMACOSX
|
||||||
bin_PROGRAMS = freeswitch$(EXEEXT)
|
bin_PROGRAMS = freeswitch$(EXEEXT)
|
||||||
DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
|
DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
|
||||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||||
|
@ -246,7 +247,7 @@ APU_CONFIG = $(prefix)/bin/apu-1-config
|
||||||
AM_CFLAGS = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags \
|
AM_CFLAGS = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags \
|
||||||
--cppflags --includes) -I${prefix}/include/srtp $(shell \
|
--cppflags --includes) -I${prefix}/include/srtp $(shell \
|
||||||
$(APU_CONFIG) --includes) $(am__append_2) $(am__append_3) \
|
$(APU_CONFIG) --includes) $(am__append_2) $(am__append_3) \
|
||||||
$(am__append_4) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
|
$(am__append_5) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
|
||||||
-I$(PWD)/src/include -I$(PREFIX)/include \
|
-I$(PWD)/src/include -I$(PREFIX)/include \
|
||||||
-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
|
-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
|
||||||
-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
|
-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
|
||||||
|
@ -259,6 +260,7 @@ AM_LDFLAGS = -L$(PREFIX)/lib $(shell $(APR_CONFIG) --link-ld --libs ) \
|
||||||
$(shell $(APU_CONFIG) --link-ld --libs ) -lm \
|
$(shell $(APU_CONFIG) --link-ld --libs ) -lm \
|
||||||
-L/usr/local/lib/db42 -L/usr/local/lib $(am__append_1)
|
-L/usr/local/lib/db42 -L/usr/local/lib $(am__append_1)
|
||||||
OSARCH = $(shell uname -s)
|
OSARCH = $(shell uname -s)
|
||||||
|
AM_CFGARGS = $(am__append_4)
|
||||||
@ISMAC_FALSE@SOLINK = -shared -Xlinker -x
|
@ISMAC_FALSE@SOLINK = -shared -Xlinker -x
|
||||||
|
|
||||||
#put elsif win here
|
#put elsif win here
|
||||||
|
@ -1090,6 +1092,7 @@ modules: $(NAME)
|
||||||
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
|
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
|
||||||
@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
|
@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
|
||||||
@./build/addenv.sh build/freeswitch.env CC "$(CC)"
|
@./build/addenv.sh build/freeswitch.env CC "$(CC)"
|
||||||
|
@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
|
||||||
@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
|
@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
|
||||||
@rm -f build/freeswitch.env
|
@rm -f build/freeswitch.env
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,8 @@ all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)
|
||||||
|
|
||||||
depends:
|
depends:
|
||||||
#MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
|
#MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
|
||||||
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX)
|
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libosip2-2.2.3.tar.gz --prefix=$(PREFIX)
|
||||||
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libeXosip2-2.2.3-pre1.tar.gz --disable-josua --prefix=$(PREFIX)
|
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libeXosip2-2.2.3.tar.gz --disable-josua --prefix=$(PREFIX)
|
||||||
|
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
|
|
|
@ -78,7 +78,7 @@ int main(int argc, char *argv[])
|
||||||
SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
|
SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
|
||||||
#else
|
#else
|
||||||
int pid;
|
int pid;
|
||||||
nice(-20);
|
//nice(-20);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
|
|
Loading…
Reference in New Issue