Browse Source

For scons based compilation on OSX

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1735 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.69
sletz 17 years ago
parent
commit
d945e90f13
5 changed files with 21 additions and 8 deletions
  1. +0
    -2
      common/JackDriverLoader.cpp
  2. +0
    -4
      common/JackGlobalsClient.cpp
  3. +0
    -2
      common/JackServerLaunch.cpp
  4. +4
    -0
      common/JackTools.h
  5. +17
    -0
      config.h.in

+ 0
- 2
common/JackDriverLoader.cpp View File

@@ -22,11 +22,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#pragma warning (disable : 4786)
#endif

#ifdef __linux__
#ifndef ADDON_DIR
#include "config.h"
#endif
#endif

#include "JackDriverLoader.h"
#include "JackError.h"


+ 0
- 4
common/JackGlobalsClient.cpp View File

@@ -334,10 +334,6 @@ JackThread* JackFactoryOSXClient::MakeThread(JackRunnableInterface* runnable)
return new JackMachThread(runnable, PTHREAD_CANCEL_ASYNCHRONOUS);
}

JackThread* JackFactoryOSXClient::MakeThread(JackRunnableInterface* runnable, int priority)
{
return new JackMachThread(runnable, false, priority, PTHREAD_CANCEL_ASYNCHRONOUS);
}
#endif

#if defined(MACH_RPC_FIFO_SEMA)


+ 0
- 2
common/JackServerLaunch.cpp View File

@@ -18,11 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#ifdef __linux__
#ifndef ADDON_DIR
#include "config.h"
#endif
#endif

#include "JackChannel.h"
#include "JackLibGlobals.h"


+ 4
- 0
common/JackTools.h View File

@@ -28,6 +28,10 @@
#include <dirent.h>
#endif

#ifdef __APPLE__
#include <sys/syslimits.h>
#endif

namespace Jack
{



+ 17
- 0
config.h.in View File

@@ -0,0 +1,17 @@
/* config.h.in. */
#ifndef CONFIG_H
#define CONFIG_H

/* Name of package */
#define PACKAGE $PACKAGE

/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "<jack-devel@jackaudio.org>"

#define ADDON_DIR "$ADDON_DIR"

#define LIB_DIR "$LIB_DIR"

#define JACK_LOCATION "$JACK_LOCATION"

#endif // CONFIG_H

Loading…
Cancel
Save