ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into medusa

This commit is contained in:
Vicki Pfau 2017-04-11 13:31:05 -07:00
parent 2493e7e521 06d6586e6f
commit d76e26c39d
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -101,6 +101,7 @@ Misc:
- FFmpeg: Force MP4 files to YUV420P - FFmpeg: Force MP4 files to YUV420P
- Qt: Make "Mute" able to be bound to a key - Qt: Make "Mute" able to be bound to a key
- Core: Restore sleep callback - Core: Restore sleep callback
- Qt: Add .gb/.gbc files to the extension list in Info.plist
medusa alpha 1: (2017-04-08) medusa alpha 1: (2017-04-08)
Features: Features:

11
res/info.plist.in
View File

@ -44,6 +44,17 @@
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>gb</string>
<string>gbc</string>
</array>
<key>CFBundleTypeName</key>
<string>Game Boy ROM Image</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
</array> </array>
</dict> </dict>
</plist> </plist>

2
src/platform/qt/ts.cmake
View File

@ -1,8 +1,6 @@
file(GLOB TRANSLATION_FILES "${QM_BASE}/*.qm") file(GLOB TRANSLATION_FILES "${QM_BASE}/*.qm")
file(WRITE ${TRANSLATION_QRC} "<RCC>\n\t<qresource prefix=\"/translations/\">\n") file(WRITE ${TRANSLATION_QRC} "<RCC>\n\t<qresource prefix=\"/translations/\">\n")
message(STATUS ${TRANSLATION_FILES})
foreach(TS ${TRANSLATION_FILES}) foreach(TS ${TRANSLATION_FILES})
message(STATUS ${TS})
get_filename_component(TS_BASE "${TS}" NAME) get_filename_component(TS_BASE "${TS}" NAME)
file(APPEND ${TRANSLATION_QRC} "\t\t<file>${TS_BASE}</file>\n") file(APPEND ${TRANSLATION_QRC} "\t\t<file>${TS_BASE}</file>\n")
endforeach() endforeach()