mirror of https://github.com/mgba-emu/mgba.git
Merge branch 'master' into medusa
This commit is contained in:
commit
d76e26c39d
1
CHANGES
1
CHANGES
|
@ -101,6 +101,7 @@ Misc:
|
|||
- FFmpeg: Force MP4 files to YUV420P
|
||||
- Qt: Make "Mute" able to be bound to a key
|
||||
- Core: Restore sleep callback
|
||||
- Qt: Add .gb/.gbc files to the extension list in Info.plist
|
||||
|
||||
medusa alpha 1: (2017-04-08)
|
||||
Features:
|
||||
|
|
|
@ -44,6 +44,17 @@
|
|||
<key>CFBundleTypeRole</key>
|
||||
<string>Viewer</string>
|
||||
</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>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
file(GLOB TRANSLATION_FILES "${QM_BASE}/*.qm")
|
||||
file(WRITE ${TRANSLATION_QRC} "<RCC>\n\t<qresource prefix=\"/translations/\">\n")
|
||||
message(STATUS ${TRANSLATION_FILES})
|
||||
foreach(TS ${TRANSLATION_FILES})
|
||||
message(STATUS ${TS})
|
||||
get_filename_component(TS_BASE "${TS}" NAME)
|
||||
file(APPEND ${TRANSLATION_QRC} "\t\t<file>${TS_BASE}</file>\n")
|
||||
endforeach()
|
||||
|
|
Loading…
Reference in New Issue