Fixed Jamfile

This commit is contained in:
Paul-Louis Ageneau
2020-06-20 21:09:33 +02:00
parent d8ab5b4820
commit 98f02c5195

20
Jamfile
View File

@ -20,9 +20,8 @@ lib libdatachannel
: # usage requirements
<include>./include
<library>/libdatachannel//plog
<cxxflags>-pthread
<toolset>gcc:<cxxflags>"-Wno-pedantic -Wno-unused-parameter -Wno-unused-variable"
<toolset>clang:<cxxflags>"-Wno-pedantic -Wno-unused-parameter -Wno-unused-variable"
<toolset>gcc:<cxxflags>"-pthread -Wno-pedantic -Wno-unused-parameter -Wno-unused-variable"
<toolset>clang:<cxxflags>"-pthread -Wno-pedantic -Wno-unused-parameter -Wno-unused-variable"
;
feature gnutls : off on : composite propagated ;
@ -80,16 +79,12 @@ make libusrsctp.lib : : @make_libusrsctp_msvc ;
actions make_libusrsctp
{
(cd $(CWD)/deps/usrsctp \
&& cmake -B build -D CMAKE_C_FLAGS="-fPIC" \
&& cd build && make -j2 usrsctplib-static)
(cd $(CWD)/deps/usrsctp && cmake -B build -D CMAKE_C_FLAGS="-fPIC" && cd build && make -j2 usrsctplib-static)
cp $(CWD)/deps/usrsctp/build/usrsctplib/libusrsctp.a $(<)
}
actions make_libusrsctp_msvc
{
(cd $(CWD)/deps/usrsctp \
&& cmake -B build -G "NMake Makefiles" \
&& cd build && nmake usrsctplib-static)
(cd $(CWD)/deps/usrsctp && cmake -B build -G "NMake Makefiles" && cd build && nmake usrsctplib-static)
cp $(CWD)/deps/usrsctp/build/usrsctplib/libusrsctp.lib $(<)
}
@ -109,8 +104,7 @@ rule make_libjuice ( targets * : sources * : properties * )
}
actions make_libjuice
{
(cd $(CWD)/deps/libjuice && cmake -B build -D CMAKE_C_FLAGS="-fPIC" $(CMAKEOPTS) \
&& cd build && make -j2 juice-static)
(cd $(CWD)/deps/libjuice && cmake -B build -D CMAKE_C_FLAGS="-fPIC" $(CMAKEOPTS) && cd build && make -j2 juice-static)
cp $(CWD)/deps/libjuice/build/libjuice-static.a $(<)
}
rule make_libjuice_msvc ( targets * : sources * : properties * )
@ -126,9 +120,7 @@ rule make_libjuice_msvc ( targets * : sources * : properties * )
}
actions make_libjuice_msvc
{
(cd $(CWD)/deps/libjuice \
&& cmake -B build -D CMAKE_C_FLAGS="-fPIC" $(CMAKEOPTS) \
&& cd build && make -j2 juice-static)
(cd $(CWD)/deps/libjuice && cmake -B build -G "NMake Makefiles" $(CMAKEOPTS) && cd build && nmake juice-static)
cp $(CWD)/deps/libjuice/build/libjuice-static.lib $(<)
}