diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index b6ceeaf7..63f3eecd 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -24,7 +24,7 @@ if(SWIG_FOUND)
         if(PYTHONLIBS_FOUND)
             unset(CMAKE_SWIG_FLAGS)
             include_directories(${PYTHON_INCLUDE_PATH})
-            swig_add_module(psmove python ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
+            swig_add_library(psmove LANGUAGE python SOURCES ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
             swig_link_libraries(psmove psmoveapi ${PYTHON_LIBRARIES})
             if (PSMOVE_BUILD_TRACKER)
                 swig_link_libraries(psmove psmoveapi_tracker)
@@ -45,7 +45,7 @@ if(SWIG_FOUND)
 
             set(CMAKE_SWIG_FLAGS -package ${PSMOVEAPI_JAVA_PKG})
             include_directories(${JNI_INCLUDE_DIRS})
-            swig_add_module(psmove_java java ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
+            swig_add_library(psmove_java LANGUAGE java SOURCES ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
             swig_link_libraries(psmove_java psmoveapi ${JNI_LIBRARIES})
             if (PSMOVE_BUILD_TRACKER)
                 swig_link_libraries(psmove_java psmoveapi_tracker)
@@ -146,7 +146,7 @@ if(SWIG_FOUND)
         set(PSMOVEAPI_CSHARP_NS "io.thp.psmove")
 
         set(CMAKE_SWIG_FLAGS -namespace ${PSMOVEAPI_CSHARP_NS})
-        swig_add_module(psmoveapi_csharp csharp ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
+        swig_add_library(psmoveapi_csharp LANGUAGE csharp SOURCES ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
         swig_link_libraries(psmoveapi_csharp psmoveapi)
         if (PSMOVE_BUILD_TRACKER)
             swig_link_libraries(psmoveapi_csharp psmoveapi_tracker)
diff --git a/scripts/build_package.sh b/scripts/build_package.sh
index 458f61fd..c184f660 100644
--- a/scripts/build_package.sh
+++ b/scripts/build_package.sh
@@ -85,12 +85,12 @@ case "$BUILD_TYPE" in
         BUILDDIR=build
         PLATFORM_BIN="
         build/psmove
-        build/test_tracker
         "
+        #build/test_tracker
         PLATFORM_LIB="
         build/libpsmoveapi.dylib
-        build/libpsmoveapi_tracker.dylib
         "
+        #build/libpsmoveapi_tracker.dylib
         pkg_tarball
 
         # Workaround for macOS to find the sphinx-build binary installed via pip
diff --git a/scripts/macos/build-macos b/scripts/macos/build-macos
index 07387f53..5ad33d76 100644
--- a/scripts/macos/build-macos
+++ b/scripts/macos/build-macos
@@ -101,7 +101,10 @@ mkdir build
 cd build
 cmake -DPSMOVE_USE_PS3EYE_DRIVER=ON \
       -DPSMOVE_BUILD_TRACKER=ON \
-      -DPSMOVE_BUILD_JAVA_BINDINGS=ON \
-      -DPSMOVE_BUILD_PROCESSING_BINDINGS=ON \
+      -DPSMOVE_BUILD_JAVA_BINDINGS=OFF \
+      -DPSMOVE_BUILD_PROCESSING_BINDINGS=OFF \
+      -DPSMOVE_BUILD_PYTHON_BINDINGS=OFF \
+      -DPSMOVE_BUILD_CSHARP_BINDINGS=OFF \
+      -DCMAKE_OSX_ARCHITECTURES="x86_64" \
       -DOpenCV_DIR="${OPENCV_BUILD_DIR}" ..
 make ${MAKE_ARGS}