forked from bartvdbraak/blender
This commit makes it so openal finally works on solaris.
Kent
This commit is contained in:
parent
8712c7dab4
commit
80b25309b1
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
#if defined (_WIN32) && !defined(FREE_WINDOWS)
|
#if defined (_WIN32) && !defined(FREE_WINDOWS)
|
||||||
# define USE_OPENAL
|
# define USE_OPENAL
|
||||||
#elif defined (__linux__) || (__FreeBSD__) || defined(__APPLE__)
|
#elif defined (__linux__) || (__FreeBSD__) || defined(__APPLE__) || defined(__sun)
|
||||||
# define USE_OPENAL
|
# define USE_OPENAL
|
||||||
#else
|
#else
|
||||||
# ifdef USE_OPENAL
|
# ifdef USE_OPENAL
|
||||||
|
@ -48,10 +48,6 @@ extern "C" {
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(WIN32)
|
#if defined(WIN32)
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#else
|
#else
|
||||||
@ -73,7 +69,7 @@ typedef enum
|
|||||||
SND_endianLittle
|
SND_endianLittle
|
||||||
} SND_TEndian;
|
} SND_TEndian;
|
||||||
|
|
||||||
#ifdef __BIG_ENDIAN__
|
#if defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__)
|
||||||
const SND_TEndian SND_fEndian = SND_endianBig;
|
const SND_TEndian SND_fEndian = SND_endianBig;
|
||||||
#else
|
#else
|
||||||
const SND_TEndian SND_fEndian = SND_endianLittle;
|
const SND_TEndian SND_fEndian = SND_endianLittle;
|
||||||
|
@ -400,7 +400,7 @@ else
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
ifeq ($(OS),darwin)
|
ifeq ($(OS),$(findstring $(OS), "darwin solaris"))
|
||||||
NAN_SND_LIBS = $(SOUNDSYSTEM)
|
NAN_SND_LIBS = $(SOUNDSYSTEM)
|
||||||
NAN_SND_LIBS += $(DUMMYSOUND)
|
NAN_SND_LIBS += $(DUMMYSOUND)
|
||||||
NAN_SND_LIBS += $(OPENALSOUND)
|
NAN_SND_LIBS += $(OPENALSOUND)
|
||||||
|
Loading…
Reference in New Issue
Block a user