mirror of
https://github.com/DrBeef/JKXR.git
synced 2024-11-21 19:51:33 +00:00
Modified PCVR build to use 64 bit OpenAL
This commit is contained in:
parent
e2c4cfd015
commit
9387dea98f
4 changed files with 6 additions and 4 deletions
|
@ -173,6 +173,7 @@ set(JK2SPDir "${CMAKE_SOURCE_DIR}/codeJK2")
|
|||
set(SharedDir ${CMAKE_SOURCE_DIR}/shared)
|
||||
set(OpenJKLibDir "${CMAKE_SOURCE_DIR}/lib")
|
||||
set(GSLIncludeDirectory "${OpenJKLibDir}/gsl-lite/include")
|
||||
set(OpenALIncludeDirectory "${CMAKE_SOURCE_DIR}/code/client/OpenAL")
|
||||
set(JKXRDir "${CMAKE_SOURCE_DIR}/JKXR")
|
||||
set(OpenXRLibDir "${OpenJKLibDir}/openxr/include")
|
||||
set(OpenGLExternalIncludeDir "${OpenJKLibDir}/external/include")
|
||||
|
|
|
@ -56,7 +56,7 @@ if(BuildSPEngine OR BuildJK2SPEngine)
|
|||
|
||||
# Dependencies
|
||||
# OpenAL (is optionally included for Windows)
|
||||
if(MSVC AND NOT WIN64)
|
||||
if(MSVC)
|
||||
if(UseInternalOpenAL)
|
||||
# There's a libs/OpenAL32.lib
|
||||
# (mrw) TODO Is this actually required on windows? It is loaded at runtime, should not be linked?
|
||||
|
@ -65,6 +65,7 @@ if(BuildSPEngine OR BuildJK2SPEngine)
|
|||
message(FATAL_ERROR "UseInternalOpenAL enabled, but lib/OpenAL32.lib not found!")
|
||||
endif(NOT OpenALLibrary)
|
||||
set(SPEngineLibraries ${SPEngineLibraries} ${OpenALLibrary})
|
||||
set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${OpenALIncludeDirectory})
|
||||
else(UseInternalOpenAL)
|
||||
find_package(OpenAL REQUIRED)
|
||||
set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${OPENAL_INCLUDE_DIR})
|
||||
|
|
|
@ -31,14 +31,14 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|||
#include "snd_public.h"
|
||||
#include "../mp3code/mp3struct.h"
|
||||
|
||||
#if defined(_MSC_VER) && !defined(WIN64)
|
||||
#if defined(_MSC_VER)
|
||||
#define USE_OPENAL
|
||||
#endif
|
||||
|
||||
// Open AL Specific
|
||||
#ifdef USE_OPENAL
|
||||
#include "AL/al.h"
|
||||
#include "AL/alc.h"
|
||||
#include "al.h"
|
||||
#include "alc.h"
|
||||
#include "eax/eax.h"
|
||||
#include "eax/EaxMan.h"
|
||||
/*#elif defined MACOS_X
|
||||
|
|
Binary file not shown.
Loading…
Reference in a new issue