From 2a9f09893e3202daea03a49bded7e86e3a9299b3 Mon Sep 17 00:00:00 2001 From: skyjake Date: Tue, 6 Nov 2012 18:50:18 +0200 Subject: [PATCH] qmake|Win32: Fixed tests.pro, added "deng_nodirectsound" option The main config.pri was not being included from tests.pro, which meant that the user's configuration was not being applied. CONFIG+=deng_nodirectsound will disable the DirectSound sound driver. --- doomsday/config.pri | 1 + doomsday/plugins/plugins.pro | 5 ++++- doomsday/tests/tests.pro | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doomsday/config.pri b/doomsday/config.pri index bf9370ca68..29aa3f0c0b 100644 --- a/doomsday/config.pri +++ b/doomsday/config.pri @@ -16,6 +16,7 @@ # - deng_fluidsynth Build the FluidSynth sound driver # - deng_fmod Build the FMOD Ex sound driver # - deng_nativesdk (Mac) Use current OS's SDK for non-distrib use +# - deng_nodirectsound (Windows) Disable the DirectSound sound driver # - deng_nodisplaymode Disable native display mode changes # - deng_nofixedasm Disable assembler fixed-point math # - deng_noopenal Disable building of the OpenAL sound driver diff --git a/doomsday/plugins/plugins.pro b/doomsday/plugins/plugins.pro index e9a8acc00d..6081576ded 100644 --- a/doomsday/plugins/plugins.pro +++ b/doomsday/plugins/plugins.pro @@ -20,4 +20,7 @@ deng_fmod: SUBDIRS += fmod deng_fluidsynth: SUBDIRS += fluidsynth # Platform-specific plugins. -win32: SUBDIRS += directsound winmm +win32 { + !deng_nodirectsound: SUBDIRS += directsound + SUBDIRS += winmm +} diff --git a/doomsday/tests/tests.pro b/doomsday/tests/tests.pro index 4ce45813f5..b943493537 100644 --- a/doomsday/tests/tests.pro +++ b/doomsday/tests/tests.pro @@ -1,3 +1,8 @@ +# The Doomsday Engine Project +# Copyright (c) 2012 Jaakko Keränen + +include(../config.pri) + TEMPLATE = subdirs deng_tests: SUBDIRS += \