diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-14 20:32:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-14 20:32:24 +0300 |
| commit | ec00764dd2349f723ba22b45515ec34ee81edcc3 (patch) | |
| tree | cf506e71af7172ec63b89aa3d284fab27a2085e6 /intern | |
| parent | 131fa2e00c35ff78042a4f793891eaeb880d715c (diff) | |
| parent | 8449f0d77640c466acbda7d6ceeb71bc48317b44 (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/SoundSystem/Makefile | 3 | ||||
| -rw-r--r-- | intern/elbeem/intern/utilities.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index d00339f351c..051e2643a87 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -47,6 +47,9 @@ ifneq ($(NAN_NO_OPENAL),true) ifeq ($(OS),$(findstring $(OS), "linux freebsd solaris")) DIRS += openal sdl endif + ifeq ($(OS), irix) + DIRS += sdl + endif else export CPPFLAGS += -DNO_SOUND endif diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h index 825e92251fe..a5f63e696a6 100644 --- a/intern/elbeem/intern/utilities.h +++ b/intern/elbeem/intern/utilities.h @@ -154,12 +154,18 @@ int writePng(const char *fileName, unsigned char **rowsp, int w, int h); */ /* minimum */ +#ifdef MIN +#undef MIN +#endif template < class T > inline T MIN( T a, T b ) { return (a < b) ? a : b ; } /* maximum */ +#ifdef MAX +#undef MAX +#endif template < class T > inline T MAX( T a, T b ) |