diff --git a/CMakeLists.txt b/CMakeLists.txt index a7c7017..25b6c86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/README.md b/README.md index cd4e925..c091e46 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docs/jit.ndi.receive~.maxref.xml b/docs/jit.ndi.receive~.maxref.xml index 6deb81c..03b7803 100644 --- a/docs/jit.ndi.receive~.maxref.xml +++ b/docs/jit.ndi.receive~.maxref.xml @@ -14,7 +14,7 @@ - David Butler / The Impersonal Stereo + Pixsper video streaming network diff --git a/docs/jit.ndi.send~.maxref.xml b/docs/jit.ndi.send~.maxref.xml index 409cedf..191a50a 100644 --- a/docs/jit.ndi.send~.maxref.xml +++ b/docs/jit.ndi.send~.maxref.xml @@ -14,7 +14,7 @@ - David Butler / The Impersonal Stereo + Pixsper video streaming network diff --git a/package-info.json b/package-info.json index 70f13a3..15f5216 100644 --- a/package-info.json +++ b/package-info.json @@ -24,5 +24,5 @@ }, "tags" : [ ], "version" : "0.3.0", - "website" : "https://github.com/impsnldavid/jit.ndi" + "website" : "https://github.com/pixsper/jit.ndi" } diff --git a/source/jit.ndi/jit.ndi.receive~/CMakeLists.txt b/source/jit.ndi/jit.ndi.receive~/CMakeLists.txt index 487ab11..284158b 100644 --- a/source/jit.ndi/jit.ndi.receive~/CMakeLists.txt +++ b/source/jit.ndi/jit.ndi.receive~/CMakeLists.txt @@ -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( diff --git a/source/jit.ndi/jit.ndi.receive~/max.jit.ndi.receive~.c b/source/jit.ndi/jit.ndi.receive~/max.jit.ndi.receive~.c index 098f7af..1a5eefe 100644 --- a/source/jit.ndi/jit.ndi.receive~/max.jit.ndi.receive~.c +++ b/source/jit.ndi/jit.ndi.receive~/max.jit.ndi.receive~.c @@ -20,6 +20,7 @@ #include #include #include +#include #include diff --git a/source/jit.ndi/jit.ndi.send~/CMakeLists.txt b/source/jit.ndi/jit.ndi.send~/CMakeLists.txt index 9396de2..79434f7 100644 --- a/source/jit.ndi/jit.ndi.send~/CMakeLists.txt +++ b/source/jit.ndi/jit.ndi.send~/CMakeLists.txt @@ -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( diff --git a/source/jit.ndi/jit.ndi.send~/max.jit.ndi.send~.c b/source/jit.ndi/jit.ndi.send~/max.jit.ndi.send~.c index 7d0111d..0d0fb0a 100644 --- a/source/jit.ndi/jit.ndi.send~/max.jit.ndi.send~.c +++ b/source/jit.ndi/jit.ndi.send~/max.jit.ndi.send~.c @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -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); } \ No newline at end of file