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

Supporting mingw-w64 (#2598)

This commit is contained in:
Nanang Izzuddin 2020-12-10 15:50:56 +07:00 committed by GitHub
parent d34228fedd
commit 2a0095175f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -134,7 +134,7 @@ install:
sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
sed -e "s!@PJ_INSTALL_LDFLAGS@!$(PJ_INSTALL_LDFLAGS)!" | \
sed -e "s!@PJ_INSTALL_LDFLAGS_PRIVATE@!$(PJ_INSTALL_LDFLAGS_PRIVATE)!" | \
sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc
sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc
uninstall:
$(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc

6
aconfigure
View File

@ -5160,6 +5160,12 @@ case $target in
$as_echo "#define WIN32_LEAN_AND_MEAN 1" >>confdefs.h
case $target in
*_64-w64-mingw* )
$as_echo "#define PJ_WIN64 1" >>confdefs.h
;;
esac
;;
*darwin*)
$as_echo "#define PJ_DARWINOS 1" >>confdefs.h

5
aconfigure.ac
View File

@ -164,6 +164,11 @@ case $target in
AC_DEFINE(PJ_WIN32,1)
AC_DEFINE(PJ_WIN32_WINNT,0x0400)
AC_DEFINE(WIN32_LEAN_AND_MEAN)
case $target in
*_64-w64-mingw* )
AC_DEFINE(PJ_WIN64,1)
;;
esac
;;
*darwin*)
AC_DEFINE(PJ_DARWINOS,1)

1
pjlib/include/pj/compat/os_auto.h.in
View File

@ -30,6 +30,7 @@
#undef PJ_OS_NAME
/* Legacy macros */
#undef PJ_WIN64
#undef PJ_WIN32
#undef PJ_WIN32_WINNT
#undef WIN32_LEAN_AND_MEAN

1
pjnath/src/pjnath-test/stun_sock_test.c
View File

@ -25,7 +25,6 @@ enum {
RESPOND_STUN = 1,
WITH_MAPPED = 2,
WITH_XOR_MAPPED = 4,
ECHO = 8
};