CMake fixes for OpenMPT
This commit is contained in:
parent
4a17e9ed9b
commit
1bfc4c02e4
|
@ -218,7 +218,7 @@ set(SRB2_CONFIG_HAVE_ZLIB ON CACHE BOOL
|
||||||
"Enable zlib support.")
|
"Enable zlib support.")
|
||||||
set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL
|
set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL
|
||||||
"Enable GME support.")
|
"Enable GME support.")
|
||||||
set(SRB2_CONFIG_HAVE_OPENMPT OFF CACHE BOOL
|
set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL
|
||||||
"Enable OpenMPT support.")
|
"Enable OpenMPT support.")
|
||||||
set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
|
set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
|
||||||
"Enable hardware rendering through OpenGL.")
|
"Enable hardware rendering through OpenGL.")
|
||||||
|
@ -345,11 +345,11 @@ endif()
|
||||||
if(${SRB2_CONFIG_HAVE_OPENMPT})
|
if(${SRB2_CONFIG_HAVE_OPENMPT})
|
||||||
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
set(OPENMPT_FOUND ON)
|
set(OPENMPT_FOUND ON)
|
||||||
set(OPENMPT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/inc/libopenmpt)
|
set(OPENMPT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/inc)
|
||||||
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86 -llibopenmpt")
|
set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86_64/mingw -lopenmpt")
|
||||||
else() # 32-bit
|
else() # 32-bit
|
||||||
set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86_64 -llibopenmpt")
|
set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86/mingw -lopenmpt")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
find_package(OPENMPT)
|
find_package(OPENMPT)
|
||||||
|
|
|
@ -284,12 +284,14 @@ if(${SDL2_FOUND})
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/x86_64
|
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/x86_64
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/bin
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/bin
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/x86_64-w64-mingw32/bin
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/x86_64-w64-mingw32/bin
|
||||||
|
HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86_64/mingw
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
|
find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/i686
|
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/i686
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/bin
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/bin
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/i686-w64-mingw32/bin
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/i686-w64-mingw32/bin
|
||||||
|
HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86/mingw
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
|
@ -298,12 +300,14 @@ if(${SDL2_FOUND})
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/x86_64
|
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/x86_64
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x64
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x64
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x64
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x64
|
||||||
|
HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86_64/mingw
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
|
find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/i686
|
HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/i686
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x86
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x86
|
||||||
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x86
|
HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x86
|
||||||
|
HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86/mingw
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue