void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fixes for *nix

Browse source
This commit is contained in:
Adam Ierymenko 2013-08-26 17:51:36 -04:00
parent 4a370c5f3f
commit 335733f110
3 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.linux
View file

@ -24,7 +24,7 @@ LIBS=ext/bin/libcrypto/linux-$(ARCH)/libcrypto.a -lm -ldl
include objects.mk include objects.mk
all: one cli launcher all: one cli
one: $(OBJS) one: $(OBJS)
$(CXX) $(CXXFLAGS) -o zerotier-one main.cpp $(OBJS) $(LIBS) $(CXX) $(CXXFLAGS) -o zerotier-one main.cpp $(OBJS) $(LIBS)
@ -42,13 +42,5 @@ idtool: $(OBJS)
$(CXX) $(CXXFLAGS) -o zerotier-idtool idtool.cpp $(OBJS) $(LIBS) $(CXX) $(CXXFLAGS) -o zerotier-idtool idtool.cpp $(OBJS) $(LIBS)
$(STRIP) zerotier-idtool $(STRIP) zerotier-idtool
launcher:
$(CC) -Os -o zerotier-launcher launcher.c
$(STRIP) zerotier-launcher
launcher-fakebin:
$(CC) $(CFLAGS) -DZEROTIER_FAKE_VERSION_MAJOR=1 -DZEROTIER_FAKE_VERSION_MINOR=2 -DZEROTIER_FAKE_VERSION_REVISION=3 -o zerotier-launcher-fakebin-123 launcher-fakebin.c
$(CC) $(CFLAGS) -DZEROTIER_FAKE_VERSION_MAJOR=1 -DZEROTIER_FAKE_VERSION_MINOR=2 -DZEROTIER_FAKE_VERSION_REVISION=4 -o zerotier-launcher-fakebin-124 launcher-fakebin.c
clean: clean:
rm -f $(OBJS) zerotier-* rm -f $(OBJS) zerotier-*

10
Makefile.mac
View file

@ -17,7 +17,7 @@ LIBS=-lcrypto -lm
include objects.mk include objects.mk
all: one cli launcher mac-tap all: one cli mac-tap
one: $(OBJS) one: $(OBJS)
$(CXX) $(CXXFLAGS) -o zerotier-one main.cpp $(OBJS) $(LIBS) $(CXX) $(CXXFLAGS) -o zerotier-one main.cpp $(OBJS) $(LIBS)
@ -44,14 +44,6 @@ install-mac-tap: FORCE
cp -R mac-tap/tuntap/tap.kext /Library/Application\ Support/ZeroTier/One cp -R mac-tap/tuntap/tap.kext /Library/Application\ Support/ZeroTier/One
chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext
launcher: FORCE
$(CC) -Os -arch i386 -arch x86_64 -o zerotier-launcher launcher.c
$(STRIP) zerotier-launcher
launcher-fakebin:
$(CC) $(CFLAGS) -DZEROTIER_FAKE_VERSION_MAJOR=1 -DZEROTIER_FAKE_VERSION_MINOR=2 -DZEROTIER_FAKE_VERSION_REV
$(CC) $(CFLAGS) -DZEROTIER_FAKE_VERSION_MAJOR=1 -DZEROTIER_FAKE_VERSION_MINOR=2 -DZEROTIER_FAKE_VERSION_REV
makekeypair: $(OBJS) makekeypair: $(OBJS)
$(CXX) $(CXXFLAGS) -o zerotier-makekeypair makekeypair.cpp $(OBJS) $(LIBS) $(CXX) $(CXXFLAGS) -o zerotier-makekeypair makekeypair.cpp $(OBJS) $(LIBS)

2
node/Defaults.cpp
View file

@ -80,7 +80,7 @@ static inline std::string _mkDefaultHomePath()
{ {
#ifdef __UNIX_LIKE__ #ifdef __UNIX_LIKE__
#ifdef __APPLE__ #ifdef __APPLE__
return std::string("/Library/Application\ Support/ZeroTier/One"); return std::string("/Library/Application Support/ZeroTier/One");
#else #else
return std::string("/var/lib/zerotier-one"); return std::string("/var/lib/zerotier-one");
#endif #endif