Skip to content

Commit

Permalink
qmake|Win32: Fixed tests.pro, added "deng_nodirectsound" option
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
skyjake committed Nov 6, 2012
1 parent 2551bbf commit 2a9f098
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions doomsday/config.pri
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion doomsday/plugins/plugins.pro
Expand Up @@ -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
}
5 changes: 5 additions & 0 deletions doomsday/tests/tests.pro
@@ -1,3 +1,8 @@
# The Doomsday Engine Project
# Copyright (c) 2012 Jaakko Keränen <jaakko.keranen@iki.fi>

include(../config.pri)

TEMPLATE = subdirs

deng_tests: SUBDIRS += \
Expand Down

0 comments on commit 2a9f098

Please sign in to comment.