mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
Merge pull request #1576 from comex/osx-qt-build-fixes
OS X Qt build fixes
This commit is contained in:
@ -23,19 +23,9 @@ set(UIS
|
||||
SystemInfo.ui
|
||||
)
|
||||
|
||||
set(LIBS core uicommon)
|
||||
list(APPEND LIBS core uicommon)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# Link against OS X system frameworks.
|
||||
list(APPEND LIBS
|
||||
${APPKIT_LIBRARY}
|
||||
${AU_LIBRARY}
|
||||
${COREAUDIO_LIBRARY}
|
||||
${COREFUND_LIBRARY}
|
||||
${CORESERV_LIBRARY}
|
||||
${IOK_LIBRARY}
|
||||
${FORCEFEEDBACK}
|
||||
)
|
||||
set(DOLPHINQT_BINARY DolphinQt)
|
||||
else()
|
||||
set(DOLPHINQT_BINARY dolphin-emu-qt)
|
||||
@ -83,7 +73,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
COMMAND ln -nfs ${CMAKE_SOURCE_DIR}/Data/Sys ${BUNDLE_PATH}/Contents/Resources/Sys
|
||||
VERBATIM
|
||||
)
|
||||
add_custom_target(CopyDataIntoBundle ALL
|
||||
add_custom_target(CopyDataIntoBundleQt ALL
|
||||
DEPENDS ${BUNDLE_PATH}/Contents/Resources/Sys
|
||||
)
|
||||
endif()
|
||||
|
@ -1,18 +1,3 @@
|
||||
set(LIBS core
|
||||
uicommon
|
||||
${LZO}
|
||||
${GTK2_LIBRARIES})
|
||||
|
||||
if(NOT ANDROID)
|
||||
link_directories(${CMAKE_PREFIX_PATH}/lib)
|
||||
else()
|
||||
set(LIBS ${LIBS} png iconv)
|
||||
endif()
|
||||
|
||||
if(LIBAV_FOUND)
|
||||
set(LIBS ${LIBS} ${LIBAV_LIBRARIES})
|
||||
endif()
|
||||
|
||||
set(GUI_SRCS
|
||||
ARCodeAddEdit.cpp
|
||||
AboutDolphin.cpp
|
||||
@ -65,24 +50,21 @@ set(GUI_SRCS
|
||||
|
||||
set(WXLIBS ${wxWidgets_LIBRARIES} dl)
|
||||
|
||||
list(APPEND LIBS core uicommon)
|
||||
|
||||
if(ANDROID)
|
||||
list(APPEND LIBS png)
|
||||
endif()
|
||||
|
||||
|
||||
set(ANDROID_SRCS Android/ButtonManager.cpp
|
||||
MainAndroid.cpp)
|
||||
|
||||
set(NOGUI_SRCS MainNoGUI.cpp)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# Link against OS X system frameworks.
|
||||
list(APPEND LIBS
|
||||
${APPKIT_LIBRARY}
|
||||
${AU_LIBRARY}
|
||||
${COREAUDIO_LIBRARY}
|
||||
${COREFUND_LIBRARY}
|
||||
${CORESERV_LIBRARY}
|
||||
${IOK_LIBRARY}
|
||||
${FORCEFEEDBACK}
|
||||
)
|
||||
if(wxWidgets_FOUND)
|
||||
list(APPEND LIBS
|
||||
list(APPEND WXLIBS
|
||||
${APPSERV_LIBRARY}
|
||||
${COCOA_LIBRARY}
|
||||
)
|
||||
@ -94,11 +76,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
MACOSX_PACKAGE_LOCATION Resources)
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
|
||||
${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
|
||||
set(LIBS ${LIBS} usbhid)
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
set(DOLPHIN_EXE_BASE Dolphin)
|
||||
else()
|
||||
@ -107,10 +84,6 @@ endif()
|
||||
|
||||
set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE})
|
||||
|
||||
if(USE_UPNP)
|
||||
set(LIBS ${LIBS} miniupnpc)
|
||||
endif()
|
||||
|
||||
include(FindGettext)
|
||||
if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
|
||||
file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
|
||||
@ -145,7 +118,7 @@ if(ANDROID)
|
||||
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})
|
||||
elseif(wxWidgets_FOUND)
|
||||
add_executable(${DOLPHIN_EXE} ${SRCS} ${GUI_SRCS})
|
||||
target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS} ${LLVM_LIBRARIES})
|
||||
target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
include(BundleUtilities)
|
||||
set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app)
|
||||
@ -181,7 +154,7 @@ elseif(wxWidgets_FOUND)
|
||||
COMMAND ln -nfs ${CMAKE_SOURCE_DIR}/Data/Sys ${BUNDLE_PATH}/Contents/Resources/Sys
|
||||
VERBATIM
|
||||
)
|
||||
add_custom_target(CopyDataIntoBundle ALL
|
||||
add_custom_target(CopyDataIntoBundleWx ALL
|
||||
DEPENDS ${BUNDLE_PATH}/Contents/Resources/Sys
|
||||
)
|
||||
endif()
|
||||
@ -219,7 +192,7 @@ elseif(wxWidgets_FOUND)
|
||||
${CMAKE_SOURCE_DIR}/Data/Sys
|
||||
VERBATIM
|
||||
)
|
||||
add_custom_target(CopyTranslationsIntoBundle ALL
|
||||
add_custom_target(CopyTranslationsIntoBundleWx ALL
|
||||
DEPENDS ${BUNDLE_PATH}/Contents/Resources/en.lproj
|
||||
)
|
||||
endif()
|
||||
|
Reference in New Issue
Block a user