App name cleanup.
Rename all icon basenames and references to them from "vbam" to "visualboyadvance-m". Change app name in desktop file from "VBA-M" to "visualboyadvance-m" as well. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
|
@ -1061,15 +1061,6 @@ if(UNIX)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# linux data and icon files
|
|
||||||
if(NOT WIN32 AND NOT APPLE)
|
|
||||||
if(ENABLE_WX)
|
|
||||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wx/wxvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
|
|
||||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wx/wxvbam.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
|
|
||||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/wx/icons/sizes/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CPACK_GENERATOR "ZIP")
|
set(CPACK_GENERATOR "ZIP")
|
||||||
set(CPACK_SOURCE_GENERATOR "TGZ")
|
set(CPACK_SOURCE_GENERATOR "TGZ")
|
||||||
set(CPACK_PACKAGE_VERSION_MAJOR "2")
|
set(CPACK_PACKAGE_VERSION_MAJOR "2")
|
||||||
|
|
|
@ -85,7 +85,7 @@ parts:
|
||||||
apps:
|
apps:
|
||||||
visualboyadvance-m:
|
visualboyadvance-m:
|
||||||
command: bin/visualboyadvance-m
|
command: bin/visualboyadvance-m
|
||||||
desktop: share/applications/wxvbam.desktop
|
desktop: share/applications/visualboyadvance-m.desktop
|
||||||
extensions: [gnome-3-28]
|
extensions: [gnome-3-28]
|
||||||
environment:
|
environment:
|
||||||
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
|
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
|
||||||
|
|
|
@ -751,7 +751,7 @@ set(
|
||||||
cmdhandlers.h
|
cmdhandlers.h
|
||||||
cmd-evtable.h
|
cmd-evtable.h
|
||||||
# icon File
|
# icon File
|
||||||
xrc/vbam.xpm
|
xrc/visualboyadvance-m.xpm
|
||||||
../common/version.cpp
|
../common/version.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -828,7 +828,7 @@ endif()
|
||||||
|
|
||||||
link_directories(${CMAKE_BINARY_DIR})
|
link_directories(${CMAKE_BINARY_DIR})
|
||||||
|
|
||||||
set(VBAM_ICON vbam.icns)
|
set(VBAM_ICON visualboyadvance-m.icns)
|
||||||
|
|
||||||
set(VBAM_ICON_PATH ${CMAKE_CURRENT_SOURCE_DIR}/icons/${VBAM_ICON})
|
set(VBAM_ICON_PATH ${CMAKE_CURRENT_SOURCE_DIR}/icons/${VBAM_ICON})
|
||||||
|
|
||||||
|
@ -935,7 +935,9 @@ elseif(MSVC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT WIN32 AND NOT APPLE)
|
if(NOT WIN32 AND NOT APPLE)
|
||||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
|
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/visualboyadvance-m.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
|
||||||
|
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/visualboyadvance-m.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
|
||||||
|
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/icons/sizes/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
// ImageMagick makes the name wxvbam, but wx expects wxvbam_xpm
|
// ImageMagick makes the name wxvbam, but wx expects wxvbam_xpm
|
||||||
#define wxvbam wxvbam_xpm
|
#define wxvbam wxvbam_xpm
|
||||||
const
|
const
|
||||||
#include "xrc/vbam.xpm"
|
#include "xrc/visualboyadvance-m.xpm"
|
||||||
#undef wxvbam
|
#undef wxvbam
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 9.8 KiB |
Before Width: | Height: | Size: 594 B After Width: | Height: | Size: 594 B |
Before Width: | Height: | Size: 935 B After Width: | Height: | Size: 935 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 141 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
@ -0,0 +1,21 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<component type="desktop">
|
||||||
|
<id>visualboyadvance-m.desktop</id>
|
||||||
|
<metadata_license>CC-BY-SA-3.0</metadata_license>
|
||||||
|
<project_license>GPL-2.0</project_license>
|
||||||
|
<name>VisualBoyAdvance-M</name>
|
||||||
|
<summary>VisualBoyAdvance-M, a high compatibility Gameboy Advance Emulator</summary>
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility
|
||||||
|
with commercial games. It emulates the Nintendo Game Boy Advance hand held
|
||||||
|
console, in addition to the original Game Boy systems and its Super and
|
||||||
|
Color variants. VisualBoyAdvance-M is the continued development of the now
|
||||||
|
inactive VisualBoy Advance project, with many improvements from various
|
||||||
|
forks.
|
||||||
|
</p>
|
||||||
|
</description>
|
||||||
|
<url type="homepage">http://vba-m.com/</url>
|
||||||
|
<url type="bugtracker">https://github.com/visualboyadvance-m/visualboyadvance-m/issues</url>
|
||||||
|
<update_contact>zachbacon_at_vba-m.com</update_contact>
|
||||||
|
</component>
|
|
@ -1,7 +1,6 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Version=1.0
|
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=VBA-M
|
Name=visualboyadvance-m
|
||||||
GenericName=Game Boy Advance Emulator
|
GenericName=Game Boy Advance Emulator
|
||||||
Comment=Nintendo Game Boy Advance Emulator
|
Comment=Nintendo Game Boy Advance Emulator
|
||||||
Exec=visualboyadvance-m %f
|
Exec=visualboyadvance-m %f
|
|
@ -1,21 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!-- Copyright 2016 Jeremy Newton -->
|
|
||||||
<component type="desktop">
|
|
||||||
<id>wxvbam.desktop</id>
|
|
||||||
<metadata_license>CC-BY-SA-3.0</metadata_license>
|
|
||||||
<project_license>GPL-2.0</project_license>
|
|
||||||
<name>VisualBoyAdvance-M</name>
|
|
||||||
<summary>WX GUI for VisualBoyAdvance-M, a high compatibility Gameboy Advance Emulator</summary>
|
|
||||||
<description>
|
|
||||||
<p>
|
|
||||||
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
|
|
||||||
commercial games. It emulates the Nintendo Game Boy Advance hand held console,
|
|
||||||
in addition to the original Game Boy hand held systems and its Super and Color
|
|
||||||
variants. VBA-M is a continued development of the now inactive VisualBoy
|
|
||||||
Advance project, with many improvements from various developments of VBA.
|
|
||||||
</p>
|
|
||||||
</description>
|
|
||||||
<url type="homepage">http://vba-m.com/</url>
|
|
||||||
<url type="bugtracker">https://github.com/visualboyadvance-m/visualboyadvance-m/issues</url>
|
|
||||||
<update_contact>alexjnewt_at_hotmail.com</update_contact>
|
|
||||||
</component>
|
|
|
@ -1,5 +1,6 @@
|
||||||
#pragma code_page(65001)
|
#pragma code_page(65001)
|
||||||
AAAAA_MAINICON ICON "icons/vbam.ico"
|
|
||||||
|
AAAAA_MAINICON ICON "icons/visualboyadvance-m.ico"
|
||||||
|
|
||||||
#include "wx/msw/wx.rc"
|
#include "wx/msw/wx.rc"
|
||||||
|
|
||||||
|
@ -39,12 +40,12 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "040904b0"
|
BLOCK "040904b0"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "Comments", "VBA-M comes with NO WARRANTY. Use it at your own risk."
|
VALUE "Comments", "VisualBoyAdvance-M comes with NO WARRANTY. Use it at your own risk."
|
||||||
VALUE "CompanyName", "http://vba-m.com/"
|
VALUE "CompanyName", "http://vba-m.com/"
|
||||||
VALUE "FileDescription", "VisualBoyAdvance-M"
|
VALUE "FileDescription", "VisualBoyAdvance-M"
|
||||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||||
VALUE "InternalName", "VBA-M"
|
VALUE "InternalName", "wxvbam"
|
||||||
VALUE "LegalCopyright", "Copyright © 2008-2019 VBA-M development team"
|
VALUE "LegalCopyright", "Copyright © 2008-2019 VisualBoyAdvance-M development team"
|
||||||
VALUE "OriginalFilename", "VisualBoyAdvance-M.exe"
|
VALUE "OriginalFilename", "VisualBoyAdvance-M.exe"
|
||||||
VALUE "ProductName", "VisualBoyAdvance-M"
|
VALUE "ProductName", "VisualBoyAdvance-M"
|
||||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||||
|
|