Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Gartner <stefang@aon.at>2008-11-24 17:15:05 +0300
committerStefan Gartner <stefang@aon.at>2008-11-24 17:15:05 +0300
commitf1474648d318808664ac37c77524b3171a65456a (patch)
tree36be28cf29275d0582202658d14bcd083be3f578 /source/Makefile
parent1a28bf797e4103926bf181389bb68a8c97fccaa8 (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 'source/Makefile')
-rw-r--r--source/Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/source/Makefile b/source/Makefile
index 662cb1df0a6..e9671cdae35 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -194,7 +194,7 @@ ifeq ($(WITH_FREETYPE2), true)
else
COMLIB += $(NAN_FTGL)/lib/libftgl.a
ifeq ($(OS), irix)
- COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
+ COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
else
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
endif
@@ -395,9 +395,16 @@ else
NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(SOUNDSYSTEM)
+ ifeq ($(OS), irix)
+ NAN_SND_LIBS = $(SOUNDSYSTEM)
+ NAN_SND_LIBS += $(DUMMYSOUND)
+ NAN_SND_LIBS += $(SDLSOUND)
+ NAN_SND_LIBS += $(SOUNDSYSTEM)
+ else
+ NAN_SND_LIBS = $(SOUNDSYSTEM)
+ NAN_SND_LIBS += $(DUMMYSOUND)
+ NAN_SND_LIBS += $(SOUNDSYSTEM)
+ endif
endif
endif
endif