diff options
| author | Alexander Ewering <blender@instinctive.de> | 2005-10-29 00:29:50 +0400 |
|---|---|---|
| committer | Alexander Ewering <blender@instinctive.de> | 2005-10-29 00:29:50 +0400 |
| commit | 8162961d315acb6c141b071dec6dc858baff5ba7 (patch) | |
| tree | 94f7a54a58ec197541bda8a7e42ddbbb1d299534 /source/nan_definitions.mk | |
| parent | 767bae35f28d2ed235aab14cad00771289279d52 (diff) | |
My local tree has iblender's Game engine soundsystem
(which uses SDL_mixer), one thing in nan_definitions.mk slipped
through.
My apologies :)
Diffstat (limited to 'source/nan_definitions.mk')
| -rw-r--r-- | source/nan_definitions.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 07b95ab2ede..28607295f28 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -115,7 +115,7 @@ endif export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_SDL ?= $(shell sdl-config --prefix) - export NAN_SDLLIBS ?= $(shell sdl-config --libs) -lSDL_mixer + export NAN_SDLLIBS ?= $(shell sdl-config --libs) export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) # Uncomment the following line to use Mozilla inplace of netscape @@ -167,7 +167,7 @@ endif export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_SDL ?= $(LCGDIR)/sdl export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include - export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa -framework IOKit -lSDL_mixer + export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa -framework IOKit # Uncomment the following line to use Mozilla inplace of netscape # CPPFLAGS +=-DMOZ_NOT_NET @@ -210,7 +210,7 @@ endif export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_SDL ?= $(shell sdl11-config --prefix) - export NAN_SDLLIBS ?= $(shell sdl11-config --libs) -lSDL_mixer + export NAN_SDLLIBS ?= $(shell sdl11-config --libs) export NAN_SDLCFLAGS ?= $(shell sdl11-config --cflags) # Uncomment the following line to use Mozilla inplace of netscape @@ -253,7 +253,7 @@ endif export NAN_FREETYPE ?= /usr/freeware export NAN_GETTEXT ?= /usr/freeware export NAN_SDL ?= $(LCGDIR)/sdl - export NAN_SDLLIBS ?= -L$(NAN_SDL)/lib -lSDL -lSDL_mixer + export NAN_SDLLIBS ?= -L$(NAN_SDL)/lib -lSDL export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include/SDL # Uncomment the following line to use Mozilla inplace of netscape @@ -298,7 +298,7 @@ endif export NAN_FREETYPE ?= /usr export NAN_GETTEXT ?= /usr export NAN_SDL ?= $(shell sdl-config --prefix) - export NAN_SDLLIBS ?= $(shell sdl-config --libs) -lSDL_mixer + export NAN_SDLLIBS ?= $(shell sdl-config --libs) export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) # Uncomment the following line to use Mozilla inplace of netscape @@ -340,7 +340,7 @@ endif export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_SDL ?= $(shell sdl-config --prefix) - export NAN_SDLLIBS ?= $(shell sdl-config --libs) -lSDL_mixer + export NAN_SDLLIBS ?= $(shell sdl-config --libs) export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) # Uncomment the following line to use Mozilla inplace of netscape @@ -381,7 +381,7 @@ endif export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_SDL ?= $(shell sdl-config --prefix) - export NAN_SDLLIBS ?= $(shell sdl-config --libs) -lSDL_mixer + export NAN_SDLLIBS ?= $(shell sdl-config --libs) export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) # Uncomment the following line to use Mozilla inplace of netscape @@ -475,7 +475,7 @@ endif export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_SDL ?= $(shell sdl-config --prefix) - export NAN_SDLLIBS ?= $(shell sdl-config --libs) -lSDL_mixer + export NAN_SDLLIBS ?= $(shell sdl-config --libs) export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) # Uncomment the following line to use Mozilla inplace of netscape |