Skip to content

Commit

Permalink
Added Apple Silicon build
Browse files Browse the repository at this point in the history
  • Loading branch information
pixsperdavid committed Nov 18, 2021
1 parent ee999dc commit a5637d7
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ if (APPLE)
elseif(${XCODE_VERSION} VERSION_GREATER_EQUAL 12)
set(C74_BUILD_FAT YES)
endif ()
elseif (${CMAKE_GENERATOR} MATCHES "Unix Makefiles")
# This is for the benefit of CLion which identifies as Unix Makefiles
set(C74_BUILD_FAT YES)
endif ()

if (NOT CMAKE_OSX_ARCHITECTURES)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The [NewTek NDI®](https://ndi.tv/) protocol allows high-quality, high-performan
jit.ndi is licensed under LGPL 3.0. This means you are free to use the objects in any commercial/non-commercial project but any changes to the source code must be released under the same license.

## Installation
- jit.ndi is supplied as a Max package. Download available from the [releases](https://github.com/impsnldavid/jit.ndi/releases/latest) page.
- jit.ndi is supplied as a Max package. Download available from the [releases](https://github.com/pixsper/jit.ndi/releases/latest) page.
- Unzip and place the entire jit.ndi directory in your Max packages directory (`C:/Users/[username]/Documents/Max 8/Packages` on Windows, `/Users/[username]/Documents/Max 8/Packages` on Mac OS).

## Documentation
Expand Down
2 changes: 1 addition & 1 deletion docs/jit.ndi.receive~.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!--METADATA-->

<metadatalist>
<metadata name='author'>David Butler / The Impersonal Stereo</metadata>
<metadata name='author'>Pixsper</metadata>
<metadata name='tag'>video</metadata>
<metadata name='tag'>streaming</metadata>
<metadata name='tag'>network</metadata>
Expand Down
2 changes: 1 addition & 1 deletion docs/jit.ndi.send~.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!--METADATA-->

<metadatalist>
<metadata name='author'>David Butler / The Impersonal Stereo</metadata>
<metadata name='author'>Pixsper</metadata>
<metadata name='tag'>video</metadata>
<metadata name='tag'>streaming</metadata>
<metadata name='tag'>network</metadata>
Expand Down
2 changes: 1 addition & 1 deletion package-info.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
},
"tags" : [ ],
"version" : "0.3.0",
"website" : "https://github.com/impsnldavid/jit.ndi"
"website" : "https://github.com/pixsper/jit.ndi"
}
1 change: 1 addition & 0 deletions source/jit.ndi/jit.ndi.receive~/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include_directories(
set(PROJECT_SRC
"jit.ndi.receive.c"
"max.jit.ndi.receive~.c"
"${MAX_SDK_INCLUDES}/common/commonsyms.c"
)

add_library(
Expand Down
1 change: 1 addition & 0 deletions source/jit.ndi/jit.ndi.receive~/max.jit.ndi.receive~.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <z_dsp.h>
#include <max.jit.mop.h>
#include <ext_dictobj.h>
#include <commonsyms.h>

#include <Processing.NDI.Lib.h>

Expand Down
1 change: 1 addition & 0 deletions source/jit.ndi/jit.ndi.send~/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include_directories(
set(PROJECT_SRC
"jit.ndi.send.c"
"max.jit.ndi.send~.c"
"${MAX_SDK_INCLUDES}/common/commonsyms.c"
)

add_library(
Expand Down
8 changes: 1 addition & 7 deletions source/jit.ndi/jit.ndi.send~/max.jit.ndi.send~.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <ext_atomic.h>
#include <z_dsp.h>
#include <max.jit.mop.h>
#include <commonsyms.h>

#include <Processing.NDI.Lib.h>

Expand Down Expand Up @@ -284,13 +285,6 @@ void max_jit_ndi_send_printversion(t_max_jit_ndi_send* x)
void max_jit_ndi_send_getruntimeurl(t_max_jit_ndi_send* x)
{
t_atom argv;

// TODO: Update this when NewTek fixes their link to the Mac runtime
#ifdef MAC_VERSION
atom_setsym(&argv, gensym("https://ndi.tv/tools/"));
#else
atom_setsym(&argv, gensym(NDILIB_REDIST_URL));
#endif

max_jit_obex_dumpout(x, _sym_runtimeurl, 1, &argv);
}

0 comments on commit a5637d7

Please sign in to comment.