Skip to content

Commit f514e57

Browse files
committed
compilation on macbook 2018 is working again
1 parent f5bcaa5 commit f514e57

File tree

5 files changed

+27
-30
lines changed

5 files changed

+27
-30
lines changed

README.md

+12
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,18 @@ $ ./configure_frontend
7878
$ ./bin/nidium
7979
```
8080

81+
On a mac-os based system you need xcode installed.
82+
83+
```
84+
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
85+
$ git clone https://github.com/nidium/NidiumTools.git
86+
$ git clone --recursive https://github.com/nidium/Nidium.git
87+
$ export PYTHONPATH=$(pwd)/NidiumTools/src
88+
$ cd Nidium
89+
$ ./configure_frontend
90+
$ ./bin/nidium
91+
```
92+
8193
## Documentation
8294

8395
We strive to have excellent documentation, both for our [getting started guide](http://www.nidium.com/docs/guide/get-started/hello-world.html) and for the [API Reference](http://www.nidium.com/docs/api/).

configure_frontend

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ def skia():
111111
"-Wno-unused-function",
112112
"-Wno-unused-template",
113113
"-Wno-zero-as-null-pointer-constant",
114+
"-Wno-expansion-to-defined",
114115
"-DGR_GL_CUSTOM_SETUP_HEADER=<../../../../../patch/skia_gl_config.h>"
115116
],
116117
"is_official_build": True,

gyp/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.xcodeproj
2+

gyp/nidium-server.gyp

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
'<(third_party_path)/linenoise/',
1616
'<(nidium_src_path)',
1717
],
18+
'cflags': [
19+
"-Wno-expansion-to-defined",
20+
],
1821
'sources': [
1922
'<(nidium_src_path)/Server/app/main.cpp',
2023
'<(nidium_src_path)/Server/Server.cpp',

patch/portaudio.patch

+9-30
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- portaudio/configure.in 2016-09-30 09:45:35.000000000 +0200
2-
+++ portaudio/configure.in 2016-09-30 09:47:22.000000000 +0200
1+
--- portaudio.org/configure.in 2014-01-16 18:49:33.000000000 +0100
2+
+++ portaudio/configure.in 2018-05-20 09:09:54.000000000 +0200
33
@@ -204,7 +204,7 @@
44

55
AC_DEFINE(PA_USE_COREAUDIO,1)
@@ -9,7 +9,7 @@
99
LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
1010

1111
if test "x$enable_mac_universal" = "xyes" ; then
12-
@@ -249,6 +249,15 @@
12+
@@ -249,8 +249,20 @@
1313
elif xcodebuild -version -sdk macosx10.9 Path >/dev/null 2>&1 ; then
1414
mac_version_min="-mmacosx-version-min=10.4"
1515
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.9 Path`"
@@ -22,33 +22,12 @@
2222
+ elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then
2323
+ mac_version_min="-mmacosx-version-min=10.4"
2424
+ mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`"
25-
else
26-
AC_MSG_ERROR([Couldn't find 10.5, 10.6, 10.7, 10.8 or 10.9 SDK])
27-
fi
28-
--- portaudio/configure 2016-09-30 09:45:26.000000000 +0200
29-
+++ portaudio/configure 2016-09-30 09:46:45.000000000 +0200
30-
@@ -15787,7 +15787,7 @@
31-
$as_echo "#define PA_USE_COREAUDIO 1" >>confdefs.h
32-
33-
34-
- CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Werror"
35-
+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wall"
36-
LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
37-
38-
if test "x$enable_mac_universal" = "xyes" ; then
39-
@@ -15819,6 +15819,15 @@
40-
elif xcodebuild -version -sdk macosx10.9 Path >/dev/null 2>&1 ; then
41-
mac_version_min="-mmacosx-version-min=10.4"
42-
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.9 Path`"
43-
+ elif xcodebuild -version -sdk macosx10.10 Path >/dev/null 2>&1 ; then
44-
+ mac_version_min="-mmacosx-version-min=10.4"
45-
+ mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.10 Path`"
46-
+ elif xcodebuild -version -sdk macosx10.11 Path >/dev/null 2>&1 ; then
25+
+ elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then
4726
+ mac_version_min="-mmacosx-version-min=10.4"
48-
+ mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.11 Path`"
49-
+ elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then
50-
+ mac_version_min="-mmacosx-version-min=10.4"
51-
+ mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`"
27+
+ mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`"
5228
else
53-
as_fn_error $? "Couldn't find 10.5, 10.6, 10.7, 10.8 or 10.9 SDK" "$LINENO" 5
29+
- AC_MSG_ERROR([Couldn't find 10.5, 10.6, 10.7, 10.8 or 10.9 SDK])
30+
+ AC_MSG_ERROR([Couldn't find SDK 10.5-10.13])
5431
fi
32+
esac
33+

0 commit comments

Comments
 (0)