mirror of https://github.com/PCSX2/pcsx2.git
cmake: fix commit f3a50a01a7
* link common with c lib (required for gold linker) * fix the macro to properly set the library variable => use the variable instead to hardcoded value
This commit is contained in:
parent
cee80eb5f4
commit
5b3f031654
|
@ -17,20 +17,20 @@ macro(check_lib var lib)
|
|||
# Make sure include directories for headers found using find_path below
|
||||
# are re-added when reconfiguring
|
||||
include_directories(${${var}_INCLUDE})
|
||||
_internal_message("${lib} found")
|
||||
_internal_message("-- ${lib} found")
|
||||
else()
|
||||
find_library(${var} ${lib})
|
||||
find_library(${var}_LIBRARIES ${lib})
|
||||
if(_arg_list)
|
||||
find_path(${var}_INCLUDE ${_arg_list})
|
||||
else()
|
||||
set(${var}_INCLUDE FALSE)
|
||||
endif()
|
||||
if(${var} AND ${var}_INCLUDE)
|
||||
if(${var}_LIBRARIES AND ${var}_INCLUDE)
|
||||
include_directories(${${var}_INCLUDE})
|
||||
_internal_message("${lib} found")
|
||||
_internal_message("-- ${lib} found")
|
||||
set(${var}_FOUND 1 CACHE INTERNAL "")
|
||||
else()
|
||||
_internal_message("${lib} not found")
|
||||
_internal_message("-- ${lib} not found")
|
||||
endif()
|
||||
endif()
|
||||
endmacro()
|
||||
|
|
|
@ -172,6 +172,7 @@ set(UtilitiesFinalSources
|
|||
)
|
||||
|
||||
set(UtilitiesFinalLibs
|
||||
${LIBC_LIBRARIES} # Gold (new linux linker) does not get automatically dependency of dependency
|
||||
${wxWidgets_LIBRARIES}
|
||||
)
|
||||
|
||||
|
|
|
@ -692,7 +692,7 @@ set(pcsx2FinalLibs
|
|||
${wxWidgets_LIBRARIES}
|
||||
${GTK2_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
aio
|
||||
${AIO_LIBRARIES}
|
||||
)
|
||||
|
||||
# additonal include directories
|
||||
|
|
|
@ -147,7 +147,9 @@ set(spu2xFinalSources
|
|||
set(spu2xFinalLibs
|
||||
Utilities
|
||||
${ALSA_LIBRARIES}
|
||||
portaudio
|
||||
${PORTAUDIO_LIBRARIES}
|
||||
${GTK2_LIBRARIES}
|
||||
${SOUNDTOUCH_LIBRARIES}
|
||||
)
|
||||
|
||||
if (SDL2_API)
|
||||
|
@ -162,10 +164,4 @@ else()
|
|||
)
|
||||
endif()
|
||||
|
||||
set(spu2xFinalLibs
|
||||
${spu2xFinalLibs}
|
||||
SoundTouch
|
||||
${GTK2_LIBRARIES}
|
||||
)
|
||||
|
||||
add_pcsx2_plugin(${Output} "${spu2xFinalSources}" "${spu2xFinalLibs}" "${spu2xFinalFlags}")
|
||||
|
|
Loading…
Reference in New Issue