diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-08-04 07:26:07 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-08-04 07:26:07 +0400 |
| commit | 4796c8599b66d2ccf8936d5c6a2835dfbe4da7ea (patch) | |
| tree | 491d711d2ce1f9cd4a2f96b2e43e04b4dd3452b9 /source | |
| parent | 41211edfeeb3b0f2c597818ceb6b8c1d49ddf2ee (diff) | |
Irix mips3 build, Part 2
Ensuring that the build uses the rebuilt
mips3 libs.
Please test!
Diffstat (limited to 'source')
| -rw-r--r-- | source/nan_compile.mk | 4 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 4 | ||||
| -rw-r--r-- | source/nan_link.mk | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/nan_compile.mk b/source/nan_compile.mk index 41d722d000f..49c275305d2 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -107,8 +107,8 @@ ifeq ($(OS),irix) CCC = CC CFLAGS += -n32 -mips3 -Xcpluscomm CCFLAGS += -n32 -mips3 -Xcpluscomm -LANG:std - REL_CFLAGS += -O2 -OPT:Olimit=0 - REL_CCFLAGS += -O2 -OPT:Olimit=0 + REL_CFLAGS += -n32 -mips3 -O2 -OPT:Olimit=0 + REL_CCFLAGS += -n32 -mips3 -O2 -OPT:Olimit=0 OPENGL_HEADERS = /usr/include NAN_DEPEND = true AR = CC diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 7c3334bc335..a107fce0934 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -224,7 +224,7 @@ all debug:: export ID = $(shell whoami) export HOST = $(shell /usr/bsd/hostname -s) export NAN_PYTHON ?= $(LCGDIR)/python - export NAN_PYTHON_VERSION ?= 2.1 + export NAN_PYTHON_VERSION ?= 2.2 export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_FMOD ?= $(LCGDIR)/fmod @@ -235,7 +235,7 @@ all debug:: export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= /usr/freeware - export NAN_NSPR ?= /usr/local/apps/openblender/nspr/target/dist + export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_FREETYPE ?= /usr/freeware export NAN_GETTEXT ?= /usr/freeware export NAN_SDLLIBS ?= $(shell sdl-config --libs) diff --git a/source/nan_link.mk b/source/nan_link.mk index fdaf44c59d1..326765eb027 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -77,6 +77,7 @@ ifeq ($(OS),freebsd) endif ifeq ($(OS),irix) + LDFLAGS += -mips3 LLIBS = -lmovieGL -lGLU -lGL -lXmu -lXext -lX11 -lc -lm -ldmedia LLIBS += -lcl -laudio -ldb -lCio -lz LLIBS += -lpthread |