mirror of https://github.com/mgba-emu/mgba.git
All: Enable static linking for OS X
This commit is contained in:
parent
920d5b71cb
commit
a2cba75819
1
CHANGES
1
CHANGES
|
@ -44,6 +44,7 @@ Misc:
|
|||
- GBA SIO: Add a dummy driver for Normal mode
|
||||
- GBA: GBARewind now returns how many states it has rewound
|
||||
- All: Enable static linking for Windows
|
||||
- All: Enable static linking for OS X
|
||||
|
||||
0.2.1: (2015-05-13)
|
||||
Bugfixes:
|
||||
|
|
|
@ -268,6 +268,10 @@ if(USE_FFMPEG)
|
|||
list(APPEND DEPENDENCY_LIB ${LIBAVCODEC_LIBRARIES} ${LIBAVFORMAT_LIBRARIES} ${LIBAVRESAMPLE_LIBRARIES} ${LIBAVUTIL_LIBRARIES} ${LIBSWSCALE_LIBRARIES})
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libavcodec${LIBAVCODEC_VERSION_MAJOR}|libavcodec-extra-${LIBAVCODEC_VERSION_MAJOR},libavformat${LIBAVFORMAT_VERSION_MAJOR},libavresample${LIBAVRESAMPLE_VERSION_MAJOR},libavutil${LIBAVUTIL_VERSION_MAJOR},libswscale${LIBSWSCALE_VERSION_MAJOR}")
|
||||
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libavcodec-extra")
|
||||
if(APPLE)
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework VideoDecodeAcceleration -framework CoreVideo")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework VideoDecodeAcceleration -framework CoreVideo")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(USE_BLIP)
|
||||
|
|
|
@ -7,7 +7,7 @@ if (SDL_VERSION EQUAL "2")
|
|||
if (SDL2_FOUND)
|
||||
set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS})
|
||||
set(SDL_LIBRARY ${SDL2_LIBRARIES})
|
||||
set(SDLMAIN_LIBRARY)
|
||||
set(SDLMAIN_LIBRARY "")
|
||||
link_directories(${SDL2_LIBDIR})
|
||||
set(SDL_VERSION_DEBIAN "2-2.0-0")
|
||||
endif()
|
||||
|
@ -33,6 +33,9 @@ endif()
|
|||
|
||||
if(WIN32)
|
||||
list(APPEND SDL_LIBRARY imm32 version winmm)
|
||||
elseif(APPLE)
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AppKit -framework AudioUnit -framework Carbon -framework CoreAudio -framework ForceFeedback -framework IOKit")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libsdl${SDL_VERSION_DEBIAN}" PARENT_SCOPE)
|
||||
|
|
Loading…
Reference in New Issue