Fix building on Windows with OpenAL when

DirectSound libraries are missing.
rohit-n · Nov 23, 2023 · b6a4061 · b6a4061
1 parent 7e1a2fb
commit b6a4061
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/runtime/client/CMakeLists.txt b/runtime/client/CMakeLists.txt
@@ -178,7 +178,6 @@ if(WIN32)
 	../kernel/src/sys/win/input.cpp
 	../kernel/src/sys/win/InputSim.cpp
 	../kernel/src/sys/win/load_pcx.cpp
-	../kernel/src/sys/win/ltdirectmusicloader.cpp
 	../kernel/src/sys/win/lthread.cpp
 	../kernel/src/sys/win/ltlibraryloader.cpp
 	../kernel/src/sys/win/ltrendermgr_impl.cpp
@@ -237,6 +236,7 @@ endif (ENABLE_OPENAL)
 if (ENABLE_DIRECTMUSIC)
 	set(exec_src ${exec_src}
 	../kernel/src/sys/win/ltdirectmusic_impl.cpp
+	../kernel/src/sys/win/ltdirectmusicloader.cpp
     )
 else (ENABLE_DIRECTMUSIC)
 	set(exec_src ${exec_src}

diff --git a/runtime/sound/src/soundmgr.h b/runtime/sound/src/soundmgr.h
@@ -54,7 +54,7 @@ extern ILTSoundSys* SoundSys( bool bTerminate = false );
 #include "soundbuffer.h"
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(USE_OPENAL)
 #ifndef __DMUSICI_H__
 #include <dmusici.h>
 #define __DMUSICI_H__
@@ -176,13 +176,13 @@ class CSoundMgr : public ILTClientSoundMgr
 #ifdef USE_ABSTRACT_SOUND_INTERFACES
 //	===========================================================================
 
-#ifdef _LINUX
+#if defined(_LINUX) || defined(USE_OPENAL)
 #define LPDIRECTSOUND8 void*
 #define LPDIRECTSOUNDBUFFER void*
 #endif
 
 	LPDIRECTSOUND8 GetDirectSound( );
-#ifdef WIN32
+#if defined(WIN32) && !defined(USE_OPENAL)
 	IDirectMusicPerformance8* GetDirectMusicPerformance( );
 	IDirectMusic* GetDirectMusic();
 #else