caddy: 2.9.0 -> 2.9.1 (#375655)
[NixPkgs.git] / pkgs / by-name / me / megacmd / fix-darwin.patch
blob7fa87b43163a0fae9566f03b905f8ce7da6894ae
1 --- a/Makefile.am
2 +++ b/Makefile.am
3 @@ -25,6 +25,11 @@ AM_CPPFLAGS = \
5 AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/sdk/include
7 +if DARWIN
8 +AM_LIBTOOLFLAGS="--tag=CXX"
9 +AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx -I$(top_srcdir)/sdk/include/mega/osx
10 +endif
12 if WIN32
13 AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/win32
14 else
15 --- a/src/megacmdshell/megacmdshellcommunications.cpp
16 +++ b/src/megacmdshell/megacmdshellcommunications.cpp
17 @@ -306,10 +306,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
18 #endif
19 const char executable2[] = "./mega-cmd-server";
20 #else
21 - #ifdef __MACH__
22 - const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd";
23 - const char executable2[] = "./mega-cmd";
24 - #else
25 const char executable[] = "mega-cmd-server";
26 #ifdef __linux__
27 char executable2[PATH_MAX];
28 @@ -317,7 +313,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
29 #else
30 const char executable2[] = "./mega-cmd-server";
31 #endif
32 - #endif
33 #endif
35 std::vector<char*> argsVector{
36 --- a/sdk/Makefile.am
37 +++ b/sdk/Makefile.am
38 @@ -27,6 +27,11 @@ AM_CPPFLAGS = \
40 include m4/aminclude.am
42 +if DARWIN
43 +AM_LIBTOOLFLAGS="--tag=CXX"
44 +AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx
45 +endif
47 if WIN32
48 AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/win32
49 else