dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-25 05:51:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of all idAudioHardware implementations

Browse source
This commit is contained in:
dhewg 2011-12-14 17:56:04 +01:00 committed by Daniel Gibson
parent bdc063379f
commit bc5f5c785a
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -21,10 +21,6 @@ cmake_minimum_required(VERSION 2.6)
# ID_NOLANADDRESS -DID_NOLANADDRESS # ID_NOLANADDRESS -DID_NOLANADDRESS
# ID_MCHECK -DID_MCHECK # ID_MCHECK -DID_MCHECK
# don't add these as options at all
# ALSA remove all sound backends except openal
# OPENAL will always be enabled
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/sys/cmake") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/sys/cmake")
set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE) set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
@ -109,8 +105,6 @@ else()
add_definitions(-DID_ENABLE_CURL=0) add_definitions(-DID_ENABLE_CURL=0)
endif() endif()
add_definitions(-DNO_ALSA)
# compiler specific flags # compiler specific flags
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
add_definitions(-pipe) add_definitions(-pipe)
@ -197,7 +191,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
message(FATAL_ERROR "Unsupported CPU architecture for OSX") message(FATAL_ERROR "Unsupported CPU architecture for OSX")
endif() endif()
set(sys_libs ${sys_libs} "-framework Carbon -framework Cocoa -framework OpenGL -framework OpenAL -framework CoreAudio -framework IOKit") set(sys_libs ${sys_libs} "-framework Carbon -framework Cocoa -framework OpenGL -framework OpenAL -framework IOKit")
else() else()
if (cpu STREQUAL "x86" AND X86) if (cpu STREQUAL "x86" AND X86)
add_definitions(-m32) add_definitions(-m32)
@ -223,7 +217,6 @@ if (WIN32)
set(sys_libs ${sys_libs} set(sys_libs ${sys_libs}
dinput8 dinput8
dsound
ksuser ksuser
dxguid dxguid
dxerr8 dxerr8
@ -655,7 +648,6 @@ if (APPLE)
sys/osx/PickMonitor.cpp sys/osx/PickMonitor.cpp
sys/osx/PreferencesDialog.cpp sys/osx/PreferencesDialog.cpp
sys/osx/macosx_guids.cpp sys/osx/macosx_guids.cpp
sys/osx/macosx_sound.cpp
sys/osx/DOOMController.mm sys/osx/DOOMController.mm
sys/osx/macosx_event.mm sys/osx/macosx_event.mm
sys/osx/macosx_glimp.mm sys/osx/macosx_glimp.mm
@ -674,7 +666,6 @@ elseif (WIN32)
sys/win32/win_net.cpp sys/win32/win_net.cpp
sys/win32/win_qgl.cpp sys/win32/win_qgl.cpp
sys/win32/win_shared.cpp sys/win32/win_shared.cpp
sys/win32/win_snd.cpp
sys/win32/win_syscon.cpp sys/win32/win_syscon.cpp
sys/win32/win_taskkeyhook.cpp sys/win32/win_taskkeyhook.cpp
sys/win32/win_wndproc.cpp sys/win32/win_wndproc.cpp
@ -690,7 +681,6 @@ else()
sys/posix/posix_signal.cpp sys/posix/posix_signal.cpp
sys/posix/posix_threads.cpp sys/posix/posix_threads.cpp
sys/posix/posix_main.cpp sys/posix/posix_main.cpp
sys/linux/sound.cpp
sys/linux/main.cpp sys/linux/main.cpp
) )

3
idlib/precompiled.h
View file

@ -47,9 +47,6 @@ If you have questions concerning this license or the applicable additional terms
#include <mmreg.h> #include <mmreg.h>
#define DIRECTINPUT_VERSION 0x0800 // was 0x0700 with the old mssdk #define DIRECTINPUT_VERSION 0x0800 // was 0x0700 with the old mssdk
#define DIRECTSOUND_VERSION 0x0800
#include <dsound.h>
#include <dinput.h> #include <dinput.h>
#pragma warning(disable : 4100) // unreferenced formal parameter #pragma warning(disable : 4100) // unreferenced formal parameter