Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v0.9.10 #2052

Merged
merged 7 commits into from
Nov 11, 2022
Merged

v0.9.10 #2052

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
259114b
add omitted header
majestrate Nov 8, 2022
bb14a7b
when in rome, remove duplicate includes
tewinget Nov 8, 2022
27fd4d8
Merge pull request #2049 from majestrate/add-omitted-header-2022-11-08
Nov 9, 2022
135664c
Add mac .dmg background
jagerman Nov 10, 2022
4b5ab4b
Merge pull request #2051 from jagerman/mac-dmg-bg
Nov 10, 2022
7f3cb0f
Make dmg background retina capable
jagerman Nov 11, 2022
7906fac
Merge pull request #2053 from jagerman/mac-dmg-bg
jagerman Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmake/macos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ if(BUILD_PACKAGE)
COMMAND create-dmg
--volname "Lokinet ${PROJECT_VERSION}"
--volicon lokinet.icns
#--background ... FIXME
--background "${PROJECT_SOURCE_DIR}/contrib/macos/installer.png"
--text-size 16
--icon-size 128
--window-size 500 300
--icon Lokinet.app 100 100
--window-size 555 400
--icon Lokinet.app 151 196
--hide-extension Lokinet.app
--app-drop-link 350 100
--app-drop-link 403 196
--eula "${PROJECT_SOURCE_DIR}/LICENSE"
--no-internet-enable
"${lokinet_installer}.dmg"
Expand Down
Binary file added contrib/macos/installer.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions llarp/bootstrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "util/bencode.hpp"
#include "util/logging.hpp"
#include "util/logging/buffer.hpp"
#include "util/fs.hpp"

namespace llarp
{
Expand Down
2 changes: 1 addition & 1 deletion llarp/util/fs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once

#include <fstream>
#ifdef USE_GHC_FILESYSTEM
#include <ghc/filesystem.hpp>
namespace fs = ghc::filesystem;
Expand Down
5 changes: 2 additions & 3 deletions llarp/vpn/linux.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
#include <linux/if_tun.h>

#include <cstring>
#include <sys/types.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <linux/rtnetlink.h>
#include <llarp/net/net.hpp>
#include <llarp/util/str.hpp>
Expand All @@ -24,6 +21,8 @@
#include <llarp/router/abstractrouter.hpp>
#include <llarp.hpp>

#include <llarp/util/fs.hpp>

namespace llarp::vpn
{
struct in6_ifreq
Expand Down