mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 20:43:44 +02:00
Reorg.
This commit is contained in:
Adam Ierymenko
parent
4e44fa009c
commit
a0374da4f3
63 changed files with 11 additions and 11 deletions
|
|
@ -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)
|
||||||
|
|
|
||||||
2
Makefile
2
Makefile
|
|
@ -18,4 +18,4 @@ clean:
|
||||||
rm -rf ${BUILDDIR}
|
rm -rf ${BUILDDIR}
|
||||||
|
|
||||||
distclean:
|
distclean:
|
||||||
rm -rf ${BUILDDIR} cmake-build-*
|
rm -rf ${BUILDDIR}
|
||||||
|
|
|
||||||
|
|
@ -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; }
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
package zerotier
|
package zerotier
|
||||||
|
|
||||||
// #include "../../native/GoGlue.h"
|
// #include "../../serviceiocore/GoGlue.h"
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
package zerotier
|
package zerotier
|
||||||
|
|
||||||
// #include "../../native/GoGlue.h"
|
// #include "../../serviceiocore/GoGlue.h"
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
package zerotier
|
package zerotier
|
||||||
|
|
||||||
//#include "../../native/GoGlue.h"
|
// #include "../../serviceiocore/GoGlue.h"
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
package zerotier
|
package zerotier
|
||||||
|
|
||||||
// #include "../../native/GoGlue.h"
|
// #include "../../serviceiocore/GoGlue.h"
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|
|
||||||
|
|
@ -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 (
|
||||||
|
|
|
||||||
|
|
@ -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 (
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
package zerotier
|
package zerotier
|
||||||
|
|
||||||
// #include "../../native/GoGlue.h"
|
// #include "../../serviceiocore/GoGlue.h"
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import "unsafe"
|
import "unsafe"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue