diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-26 17:51:36 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-26 17:51:36 -0400 |
| commit | 335733f110e326ef9a501ad5227a5063436b8817 (patch) | |
| tree | f54a705d480c70c1e9b18523677287d3ed6019d8 | |
| parent | 4a370c5f3f31dad945d37bfc83fc7a7b01735acb (diff) | |
| download | infinitytier-335733f110e326ef9a501ad5227a5063436b8817.tar.gz infinitytier-335733f110e326ef9a501ad5227a5063436b8817.zip | |
Build fixes for *nix
| -rw-r--r-- | Makefile.linux | 10 | ||||
| -rw-r--r-- | Makefile.mac | 10 | ||||
| -rw-r--r-- | node/Defaults.cpp | 2 |
3 files changed, 3 insertions, 19 deletions
diff --git a/Makefile.linux b/Makefile.linux index dca4048f..68b2437e 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -24,7 +24,7 @@ LIBS=ext/bin/libcrypto/linux-$(ARCH)/libcrypto.a -lm -ldl include objects.mk -all: one cli launcher +all: one cli one: $(OBJS) $(CXX) $(CXXFLAGS) -o zerotier-one main.cpp $(OBJS) $(LIBS) @@ -42,13 +42,5 @@ idtool: $(OBJS) $(CXX) $(CXXFLAGS) -o zerotier-idtool idtool.cpp $(OBJS) $(LIBS) $(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: rm -f $(OBJS) zerotier-* diff --git a/Makefile.mac b/Makefile.mac index d47d18cc..a4565fc9 100644 --- a/Makefile.mac +++ b/Makefile.mac @@ -17,7 +17,7 @@ LIBS=-lcrypto -lm include objects.mk -all: one cli launcher mac-tap +all: one cli mac-tap one: $(OBJS) $(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 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) $(CXX) $(CXXFLAGS) -o zerotier-makekeypair makekeypair.cpp $(OBJS) $(LIBS) diff --git a/node/Defaults.cpp b/node/Defaults.cpp index 293fd465..9f7d04fe 100644 --- a/node/Defaults.cpp +++ b/node/Defaults.cpp @@ -80,7 +80,7 @@ static inline std::string _mkDefaultHomePath() { #ifdef __UNIX_LIKE__ #ifdef __APPLE__ - return std::string("/Library/Application\ Support/ZeroTier/One"); + return std::string("/Library/Application Support/ZeroTier/One"); #else return std::string("/var/lib/zerotier-one"); #endif |