diff options
| author | Stefan Gartner <stefang@aon.at> | 2008-11-24 17:15:05 +0300 |
|---|---|---|
| committer | Stefan Gartner <stefang@aon.at> | 2008-11-24 17:15:05 +0300 |
| commit | f1474648d318808664ac37c77524b3171a65456a (patch) | |
| tree | 36be28cf29275d0582202658d14bcd083be3f578 /intern | |
| parent | 1a28bf797e4103926bf181389bb68a8c97fccaa8 (diff) | |
patch #8583: Add support for gcc on irix
to compile blender with gcc on IRIX, IRIX_USE_GCC needs to be set to true in
user-def.mk.
Other changes related to irix:
* compile solid from extern/
* don't build plugins (yet) with "make release" when using gcc (the shell
script used assumes MIPSpro is installed)
* use statvfs instead of statfs on irix, like done on solaris
* use external libs from $(LCGDIR) instead of /usr/freeware
* use glew header files from $(LCGDIR)/glew instead of the ones installed on
the system (this applies to other platforms as well)
* ffmpeg support currently is disabled on irix
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 ) |