This commit is contained in:
Adam Ierymenko 2020-06-05 13:42:34 -07:00
parent 4e44fa009c
commit a0374da4f3
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
63 changed files with 11 additions and 11 deletions

View file

@ -113,7 +113,7 @@ set(
add_custom_target(zerotier ALL add_custom_target(zerotier ALL
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND rm -f ./build/zerotier && go build -trimpath -ldflags -s -o ./build/zerotier cmd/zerotier/zerotier.go COMMAND rm -f ./build/zerotier && go build -trimpath -ldflags -s -w -buildmode=pie -o ./build/zerotier cmd/zerotier/zerotier.go
) )
add_dependencies(zerotier zt_osdep zt_core zt_controller zt_service_io_core) add_dependencies(zerotier zt_osdep zt_core zt_controller zt_service_io_core)
ADDITIONAL_CLEAN_FILES(./build/zerotier) ADDITIONAL_CLEAN_FILES(./build/zerotier)

View file

@ -18,4 +18,4 @@ clean:
rm -rf ${BUILDDIR} rm -rf ${BUILDDIR}
distclean: distclean:
rm -rf ${BUILDDIR} cmake-build-* rm -rf ${BUILDDIR}

View file

@ -1,6 +1,6 @@
package zerotier package zerotier
// #include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
// static inline const ZT_Fingerprint *_getFP(const ZT_Endpoint *ep) { return &(ep->value.fp); } // static inline const ZT_Fingerprint *_getFP(const ZT_Endpoint *ep) { return &(ep->value.fp); }
// static inline uint64_t _getAddress(const ZT_Endpoint *ep) { return ep->value.fp.address; } // static inline uint64_t _getAddress(const ZT_Endpoint *ep) { return ep->value.fp.address; }
// static inline uint64_t _getMAC(const ZT_Endpoint *ep) { return ep->value.mac; } // static inline uint64_t _getMAC(const ZT_Endpoint *ep) { return ep->value.mac; }

View file

@ -13,7 +13,7 @@
package zerotier package zerotier
// #include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
import "C" import "C"
import ( import (

View file

@ -13,7 +13,7 @@
package zerotier package zerotier
// #include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
import "C" import "C"
import ( import (

View file

@ -13,7 +13,7 @@
package zerotier package zerotier
//#include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
import "C" import "C"
import ( import (

View file

@ -13,7 +13,7 @@
package zerotier package zerotier
// #include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
import "C" import "C"
import ( import (

View file

@ -16,7 +16,7 @@
package zerotier package zerotier
//#cgo CFLAGS: -O3 //#cgo CFLAGS: -O3
//#include "../../native/GoGlue.h" //#include "../../serviceiocore/GoGlue.h"
import "C" import "C"
import ( import (

View file

@ -16,7 +16,7 @@ package zerotier
// #cgo CFLAGS: -O3 // #cgo CFLAGS: -O3
// #cgo darwin LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lc++ -lpthread // #cgo darwin LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lc++ -lpthread
// #cgo linux android LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lstdc++ -lpthread -lm // #cgo linux android LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lstdc++ -lpthread -lm
// #include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
import "C" import "C"
import ( import (

View file

@ -13,7 +13,7 @@
package zerotier package zerotier
// #include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
import "C" import "C"
// Path is a path to another peer on the network // Path is a path to another peer on the network

View file

@ -13,7 +13,7 @@
package zerotier package zerotier
// #include "../../native/GoGlue.h" // #include "../../serviceiocore/GoGlue.h"
import "C" import "C"
import "unsafe" import "unsafe"