Merge pull request #52 from Mystro256/master

Various fixes
This commit is contained in:
Zach Bacon 2016-12-10 19:50:19 -05:00 committed by GitHub
commit 0e9fb98393
10 changed files with 97 additions and 45 deletions

View File

@ -276,10 +276,10 @@ if( ENABLE_NLS )
IF(ENABLE_LINK)
FIND_PATH(LIBINTL_INC libintl.h )
FIND_LIBRARY(LIBINTL_LIB intl )
IF(LIBINTL_LIB)
IF(LIBINTL_LIB)
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBINTL_LIB})
SET(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${LIBINTL_LIB})
ENDIF(LIBINTL_LIB)
ENDIF(LIBINTL_LIB)
INCLUDE(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(gettext GETTEXT_FN)
IF(NOT LIBINTL_INC OR NOT GETTEXT_FN)
@ -674,25 +674,27 @@ IF( ENABLE_SDL )
${WIN32_LIBRARIES}
${LIRC_CLIENT_LIBRARY}
)
IF( WIN32 )
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}
RENAME vbam.cfg)
ELSE( WIN32 )
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${SYSCONF_INSTALL_DIR}
RENAME vbam.cfg)
ENDIF( WIN32 )
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
IF( WIN32 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}
RENAME vbam.cfg)
ELSE( WIN32 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${SYSCONF_INSTALL_DIR}
RENAME vbam.cfg)
ENDIF( WIN32 )
ENDIF( ENABLE_SDL )
IF( ENABLE_GTK OR ENABLE_GTK3 )
add_subdirectory (src/gtk)
add_subdirectory (src/gtk)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
IF( ENABLE_WX )
add_subdirectory(src/wx)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
ENDIF( ENABLE_WX )
if( ENABLE_GTK OR ENABLE_GTK3 OR ENABLE_WX )
@ -708,15 +710,29 @@ ENDIF(NOT APPLE)
# manual pages
IF( UNIX )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
IF( ENABLE_GTK )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
ENDIF( ENABLE_GTK )
IF( ENABLE_SDL )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
ENDIF( ENABLE_SDL )
IF( ENABLE_GTK OR ENABLE_GTK3 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
IF( ENABLE_WX )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/wxvbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
ENDIF( ENABLE_WX )
ENDIF( UNIX )
# linux data files
IF( NOT WIN32 AND NOT APPLE )
IF( ENABLE_GTK OR ENABLE_GTK3 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
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)
ENDIF( ENABLE_WX )
ENDIF( NOT WIN32 AND NOT APPLE )
SET(CPACK_GENERATOR "ZIP")
set(CPACK_SOURCE_GENERATOR "TGZ")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")

View File

@ -1,9 +1,9 @@
.TH gvbam 1 "March 28, 2012"
.TH gvbam 6 "December 10, 2016"
.SH NAME
VBAM-GTK \- (aka
.B gvbam
) A gtk GUI for a high compatibility Gameboy Advance
Emulator combining Visual Boy Advance developments.
) A gtk+ GUI for a high compatibility Gameboy Advance
Emulator integrating the best features from various Visual Boy Advance builds.
.SH SYNOPSIS
.B GVBAM
.RI [ options ]
@ -17,7 +17,7 @@ addition to the original Game Boy hand held systems and its Super and Color
variants.
.P
VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
Advance project, with many improvements from various builds of VBA.
.P
This application is the GTK GUI version of VisualBoyAdvance-M.
.SH OPTIONS
@ -28,5 +28,5 @@ Output version information
.B \-v, \-\-version
Output version information
.SH AUTHOR
This manual page was written by Jeremy Newton <alexjnewt@hotmail.com>,
for the RPMFusion and VBAM. This man page can be free used by anyone.
This manual page was written by Jeremy Newton (Mystro256).
This man page is licensed as GPLv2 or later.

View File

@ -1,4 +1,4 @@
.TH "VBAM" "1" "January 2008" "VBA-M development team" "User Commands"
.TH "VBAM" "6" "January 2008" "VBA-M development team" "User Commands"
.SH "NAME"
vbam \- manual page for VisualBoy Advance\-M
.SH "DESCRIPTION"

View File

@ -1,11 +1,9 @@
.TH wxvbam 1 "March 28, 2012"
.TH visualboyadvance-m 6 "December 10, 2016"
.SH NAME
VBAM-WX \- (aka
.B wxvbam
) A wxWidgets GUI for a high compatibility Gameboy Advance
Emulator combining Visual Boy Advance developments.
VisualBoyAdvance-M - A wxWidgets GUI for a high compatibility Gameboy Advance
Emulator integrating the best features from various Visual Boy Advance builds.
.SH SYNOPSIS
.B WXVBAM
.B visualboyadvance-m
.RI [ options ]
.SH DESCRIPTION
.B VisualBoyAdvance-M
@ -17,7 +15,7 @@ addition to the original Game Boy hand held systems and its Super and Color
variants.
.P
VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
Advance project, with many improvements from various builds of VBA.
.P
This application is the wxWidgets GUI version of VisualBoyAdvance-M.
.SH OPTIONS
@ -31,10 +29,10 @@ Generate verbose log messages
.B \-\-save-xrc=<str>
Save built-in XRC file and exit
.TP
.B \-\-save-over=<str>
.B \-\-save-over=<str>
Save built-in vba-over.ini and exit
.TP
.B \-\-print-cfg-path
.B \-\-print-cfg-path
Print configuration path and exit
.TP
.B \-f, \-\-fullscreen
@ -46,5 +44,5 @@ Delete shared link state first, if it exists
.B \-o, \-\-list-options
List all settable options and exit
.SH AUTHOR
This manual page was written by Jeremy Newton <alexjnewt@hotmail.com>,
for the RPMFusion and VBAM. This man page can be free used by anyone.
This manual page was written by Jeremy Newton (Mystro256).
This man page is licensed as GPLv2 or later.

View File

@ -14,8 +14,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, Andrea Mazzoleni
* gives permission to link the code of this program with

View File

@ -14,8 +14,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, Andrea Mazzoleni
* gives permission to link the code of this program with

View File

@ -14,8 +14,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, Andrea Mazzoleni
* gives permission to link the code of this program with

19
src/gtk/gvbam.appdata.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>gvbam.desktop</id>
<metadata_license>GPLv2</metadata_license>
<project_license>GPLv2</project_license>
<name>VBAM (GTK)</name>
<summary>GTK3 GUI for VBA-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>
</component>

View File

@ -14,8 +14,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/* Code originally from fceu/drawing.h file, adapted by Forgotten

19
src/wx/wxvbam.appdata.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>wxvbam.desktop</id>
<metadata_license>GPLv2</metadata_license>
<project_license>GPLv2</project_license>
<name>VisualBoyAdvance-M</name>
<summary>WX GUI for VBA-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>
</component>