sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix sdl detection

Browse Source
This commit is contained in:
Stefan Gartner 2003-07-18 13:34:55 +00:00
parent e00a27f9fd
commit c8aed03108
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/nan_definitions.mk
View File

@ -75,13 +75,6 @@ all debug::
export NAN_GHOST ?= $(LCGDIR)/ghost
export NAN_TEST_VERBOSITY ?= 1
export NAN_BMFONT ?= $(LCGDIR)/bmfont
ifeq ($(FREE_WINDOWS), true)
export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
export NAN_SDL ?= $(LCGDIR)/gcc/sdl
else
export NAN_FTGL ?= $(LCGDIR)/ftgl
export NAN_SDL ?= $(LCGDIR)/sdl
endif
export NAN_SDL ?= $(shell sdl-config --prefix)
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
@ -107,7 +100,12 @@ all debug::
export NAN_ZLIB ?= $(LCGDIR)/zlib
export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_GETTEXT ?= $(LCGDIR)/gettext
export NAN_GETTEXT ?= $(LCGDIR)/gettext
ifeq ($(FREE_WINDOWS), true)
export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
else
export NAN_FTGL ?= $(LCGDIR)/ftgl
endif
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
@ -150,11 +148,11 @@ all debug::
export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= /sw
export NAN_GETTEXT ?= $(LCGDIR)/gettext
ifndef NAN_SDL
ifeq ($(NAN_SDL),)
export NAN_SDL = $(LCGDIR)/sdl
export NAN_SDLCFLAGS = -I$(NAN_SDL)/include
export NAN_SDLLIBS = $(NAN_SDL)/lib/libSDL.a -framework Cocoa
endif
endif
# Uncomment the following line to use Mozilla inplace of netscape
# CPPFLAGS +=-DMOZ_NOT_NET
@ -279,7 +277,7 @@ all debug::
export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= /usr
export NAN_GETTEXT ?= /usr
ifndef NAN_SDL
ifeq ($(NAN_SDL),)
export NAN_SDL = $(LCGDIR)/sdl
export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL
@ -326,7 +324,7 @@ all debug::
export NAN_GETTEXT ?= $(LCGDIR)/gettext
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
ifndef NAN_SDL
ifeq ($(NAN_SDL),)
export NAN_SDL = $(LCGDIR)/sdl
export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL
@ -370,7 +368,7 @@ all debug::
export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_GETTEXT ?= $(LCGDIR)/gettext
ifndef NAN_SDL
ifeq ($(NAN_SDL),)
export NAN_SDL = $(LCGDIR)/sdl
export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL
@ -405,15 +403,20 @@ all debug::
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
export NAN_ODE ?= $(LCGDIR)/gcc/ode
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
ifeq ($(NAN_SDL),)
export NAN_SDL = $(LCGDIR)/gcc/sdl
export NAN_SDLCFLAGS = -I$(NAN_SDL)/include
endif
else
export NAN_PYTHON_BINARY ?= python
export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_ODE ?= $(LCGDIR)/ode
export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
endif
export NAN_OPENAL ?= $(LCGDIR)/openal
ifeq ($(NAN_SDL),)
export NAN_SDL = $(LCGDIR)/sdl
export NAN_SDLCFLAGS = -I$(NAN_SDL)/include
endif
endif
export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= $(LCGDIR)/jpeg
export NAN_PNG ?= $(LCGDIR)/png
@ -462,7 +465,7 @@ all debug::
export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_GETTEXT ?= $(LCGDIR)/gettext
ifndef NAN_SDL
ifeq ($(NAN_SDL),)
export NAN_SDL = $(LCGDIR)/sdl
export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL