diff --git a/Jamfile b/Jamfile index 52349e2..6613206 100644 --- a/Jamfile +++ b/Jamfile @@ -45,7 +45,16 @@ alias usrsctp : # no default build : # usage requirements ./deps/usrsctp/usrsctplib - libusrsctp.a + libusrsctp.a + ; + +alias usrsctp + : # no sources + : msvc + : # no default build + : # usage requirements + ./deps/usrsctp/usrsctplib + libusrsctp.lib ; alias juice @@ -54,32 +63,72 @@ alias juice : # no default build : # usage requirements ./deps/libjuice/include - libjuice.a + libjuice-static.a + ; + +alias juice + : # no sources + : msvc + : # no default build + : # usage requirements + ./deps/libjuice/include + libjuice-static.lib ; make libusrsctp.a : : @make_libusrsctp ; +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) + cp $(CWD)/deps/usrsctp/build/usrsctplib/libusrsctp.lib $(<) +} -make libjuice.a : : @make_libjuice ; +make libjuice-static.a : : @make_libjuice ; +make libjuice-static.lib : : @make_libjuice_msvc ; rule make_libjuice ( targets * : sources * : properties * ) { if gnutls in $(properties) { - MAKEOPTS on $(targets) = "USE_NETTLE=1" ; + CMAKEOPTS on $(targets) = "-D USE_NETTLE=1" ; } else { - MAKEOPTS on $(targets) = "USE_NETTLE=0" ; + CMAKEOPTS on $(targets) = "-D USE_NETTLE=0" ; } } actions make_libjuice { - (cd $(CWD)/deps/libjuice && cmake -B build -D CMAKE_C_FLAGS="-fPIC" && 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 * ) +{ + if gnutls in $(properties) + { + CMAKEOPTS on $(targets) = "-D USE_NETTLE=1" ; + } + else + { + CMAKEOPTS on $(targets) = "-D USE_NETTLE=0" ; + } +} +actions make_libjuice_msvc +{ + (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.lib $(<) +}