Reference bzip2 and iconv on Mac OS X properly.

This removes the need for the arbitrary other linker flags.

This is required to allow for proper building of ffmpeg (the next goal).
This commit is contained in:
Jason Felds
2015-10-03 20:38:38 -04:00
parent 12296352f7
commit f9a1f728af
3 changed files with 34 additions and 7 deletions
+2 -1
View File
@@ -204,7 +204,6 @@ elseif(APPLE)
XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/archutils/Darwin/StepMania.pch"
XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS "NO"
XCODE_ATTRIBUTE_LIBRARY_SEARCH_PATHS "${SM_XCODE_DIR}/ffmpeg/lib ${SM_XCODE_DIR}/Libraries"
XCODE_ATTRIBUTE_OTHER_LDFLAGS "-lbz2"
)
sm_add_compile_definition("${SM_EXE_NAME}" _XOPEN_SOURCE)
@@ -403,6 +402,8 @@ elseif(APPLE)
"vorbis"
)
list(APPEND SMDATA_LINK_LIB
"${BZIP2_LIBRARY_RELEASE}"
"${ICONV_LIBRARIES}"
"pcre"
"avcodec"
"avdevice"