diff options
| author | Kent Mein <mein@cs.umn.edu> | 2003-07-16 23:00:04 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2003-07-16 23:00:04 +0400 |
| commit | 8dd015e9b085c227aeacf9989356c8c0243b34a8 (patch) | |
| tree | 636f3e789c3378d4321310564f2f424b3346a906 /source | |
| parent | ce3e8ecf0d82340c6749a63d98dc18277f68aa77 (diff) | |
Hopefully update for NaN Makefiles for the moving of SoundSystem.
I need to get openal working on my machine before I can test it so
if it doesn't work feel free to fix it. Hopefully this will be
the majority of the stuff though.
Kent
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 1 | ||||
| -rw-r--r-- | source/gameengine/Makefile | 2 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index 459e98c11d3..2709fe9a107 100644 --- a/source/Makefile +++ b/source/Makefile @@ -77,6 +77,7 @@ PYPLAYERLIB ?= $(PYLIB) GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a GRPLIB += $(NAN_DECIMATION)/lib/libdecimation.a GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a + GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libsoundsystem.a GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a GRPLIB += $(OCGDIR)/blender/img/$(DEBUG_DIR)libimg.a diff --git a/source/gameengine/Makefile b/source/gameengine/Makefile index 3111f3afbdd..efba2f83a3a 100644 --- a/source/gameengine/Makefile +++ b/source/gameengine/Makefile @@ -38,6 +38,6 @@ DIR = $(OCGDIR)/gameengine DIRS = BlenderRoutines DIRS += Converter DIRS += Expressions GameLogic Ketsji Rasterizer SceneGraph -DIRS += SoundSystem Network GamePlayer Physics +DIRS += Network GamePlayer Physics include nan_subdirs.mk diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index ecd1623576c..af7be1392ac 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -66,6 +66,7 @@ all debug:: export NAN_GUARDEDALLOC ?= $(LCGDIR)/guardedalloc export NAN_IKSOLVER ?= $(LCGDIR)/iksolver export NAN_BSP ?= $(LCGDIR)/bsp + export NAN_SOUNDSYSTEM ?= $(LCGDIR)/SoundSystem export NAN_STRING ?= $(LCGDIR)/string export NAN_MEMUTIL ?= $(LCGDIR)/memutil export NAN_CONTAINER ?= $(LCGDIR)/container |