Skip to content

Changes to enable the build process to work on Xcode 10.1 / OS X High… #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajnewlands wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changes to enable the build process to work on Xcode 10.1 / OS X High… #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff85375
Changes to enable the build process to work on Xcode 10.1 / OS X High…
ajnewlands Nov 23, 2018
779358a
Reinstated the loading of the kernel module (before the next 'clean' …
ajnewlands Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions SoundflowerBed/AppController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
#include <CoreServices/CoreServices.h>
#include <CoreAudio/CoreAudio.h>

/* verify_noerr was deprecated and removed in OS X High Sierra */
#ifndef verify_noerr
#define verify_noerr __Verify_noErr
#endif

@implementation AppController

void CheckErr(OSStatus err)
Expand Down
5 changes: 5 additions & 0 deletions SoundflowerBed/AudioDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@

#include "AudioDevice.h"

/* verify_noerr was deprecated and removed in OS X High Sierra */
#ifndef verify_noerr
#define verify_noerr __Verify_noErr
#endif

void AudioDevice::Init(AudioDeviceID devid, bool isInput)
{
mID = devid;
Expand Down
5 changes: 5 additions & 0 deletions SoundflowerBed/AudioDeviceList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
#include "AudioDeviceList.h"
#include "AudioDevice.h"

/* verify_noerr was deprecated and removed in OS X High Sierra */
#ifndef verify_noerr
#define verify_noerr __Verify_noErr
#endif

AudioDeviceList::AudioDeviceList(bool inputs) :
mInputs(inputs)
{
Expand Down
5 changes: 5 additions & 0 deletions SoundflowerBed/AudioThruEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
AudioBufferList *gInputIOBuffer = NULL;
#endif

/* verify_noerr was deprecated and removed in OS X High Sierra */
#ifndef verify_noerr
#define verify_noerr __Verify_noErr
#endif

#define kSecondsInRingBuffer 2.

AudioThruEngine::AudioThruEngine() :
Expand Down
4 changes: 4 additions & 0 deletions SoundflowerBed/Soundflowerbed.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 22952B1E104EC967003AF61F /* Soundflower.xcconfig */;
buildSettings = {
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES;
Expand All @@ -326,6 +327,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Applications/Soundflower;
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Soundflowerbed;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
Expand All @@ -340,13 +342,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 22952B1E104EC967003AF61F /* Soundflower.xcconfig */;
buildSettings = {
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEPLOYMENT_LOCATION = YES;
DSTROOT = "$(SRCROOT)/../Build/InstallerRoot";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Applications/Soundflower;
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Soundflowerbed;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
Expand Down
12 changes: 6 additions & 6 deletions Tools/build.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
`sudo chown -R root #{@svn_root}/Build/InstallerRoot/System/Library/Extensions/Soundflower.kext`
`sudo chgrp -R wheel #{@svn_root}/Build/InstallerRoot/System/Library/Extensions/Soundflower.kext`

#if /BUILD SUCCEEDED/.match(out)
# puts " BUILD SUCCEEDED"
# puts `ruby #{@svn_root}/Tools/load.rb`
#else
# puts " BUILD FAILED"
#end
if /BUILD SUCCEEDED/.match(out)
puts " BUILD SUCCEEDED"
puts `ruby #{@svn_root}/Tools/load.rb`
else
puts " BUILD FAILED"
end


###################################################################
Expand Down