summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar archshift2015-03-07 18:15:10 -0800
committerGravatar archshift2015-03-07 18:15:10 -0800
commit30e41de3471814339d6cf0f5cc5b18d2258fa567 (patch)
tree3cb600688d0a6ec3fa2b92ad27f2577dd38d36f1 /src
parentMerge pull request #640 from archshift/ini (diff)
parentBuild app bundles on OS X. Fixes the issue where the menubar would not appear. (diff)
downloadyuzu-30e41de3471814339d6cf0f5cc5b18d2258fa567.tar.gz
yuzu-30e41de3471814339d6cf0f5cc5b18d2258fa567.tar.xz
yuzu-30e41de3471814339d6cf0f5cc5b18d2258fa567.zip
Merge pull request #639 from archshift/appbundle
Build app bundles on OS X. Fixes the issue where the menubar would not appear.
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index a1ad00f57..ff780cad4 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -64,7 +64,11 @@ else()
64 qt4_wrap_ui(UI_HDRS ${UIS}) 64 qt4_wrap_ui(UI_HDRS ${UIS})
65endif() 65endif()
66 66
67add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) 67if (APPLE)
68 add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS})
69else()
70 add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
71endif()
68target_link_libraries(citra-qt core common video_core qhexedit) 72target_link_libraries(citra-qt core common video_core qhexedit)
69target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) 73target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
70target_link_libraries(citra-qt ${PLATFORM_LIBRARIES}) 74target_link_libraries(citra-qt ${PLATFORM_LIBRARIES})