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:
-rw-r--r--intern/SoundSystem/SND_DependKludge.h2
-rw-r--r--source/Makefile8
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/SoundSystem/SND_DependKludge.h b/intern/SoundSystem/SND_DependKludge.h
index 48679c8d87a..e924df5889b 100644
--- a/intern/SoundSystem/SND_DependKludge.h
+++ b/intern/SoundSystem/SND_DependKludge.h
@@ -35,7 +35,7 @@
*/
#if defined (_WIN32)
-#define USE_FMOD
+#define USE_OPENAL
#elif defined (__linux__)
# if defined (__i386__)
# define USE_OPENAL
diff --git a/source/Makefile b/source/Makefile
index a7fd1f61697..5cc69f41b20 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -336,10 +336,10 @@ ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
ifeq ($(OS),windows)
NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
-# NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
-# NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
- NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a
- NAN_SND_LIBS += $(NAN_FMOD)/lib/fmodvc.lib
+ NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
+ NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
+# NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a
+# NAN_SND_LIBS += $(NAN_FMOD)/lib/fmodvc.lib
NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
else
NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a