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

rename exe and added more cpack stuff.

This commit is contained in:
DoctorWho11 2015-06-15 09:00:47 -04:00
parent f5600cef71
commit 65f7546798
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -403,7 +403,8 @@ IF( UNIX )
ENDIF( UNIX ) ENDIF( UNIX )
SET(CPACK_GENERATOR "ZIP") SET(CPACK_GENERATOR "ZIP")
set(CPACK_SOURCE_GENERATOR "TGZ")
SET(CPACK_PACKAGE_VERSION_MAJOR "2") SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "0") SET(CPACK_PACKAGE_VERSION_MINOR "0")
SET(CPACK_PACKAGE_VERSION_PATCH "0-Git:" ${COMMITHASH}) SET(CPACK_PACKAGE_VERSION_PATCH "0-Git-" ${COMMITHASH})
INCLUDE(CPack) INCLUDE(CPack)

9
src/wx/CMakeLists.txt
View File

@ -151,7 +151,7 @@ link_directories( ${CMAKE_BINARY_DIR} )
SET(VBAM_ICON ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns) SET(VBAM_ICON ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns)
ADD_EXECUTABLE ( ADD_EXECUTABLE (
wxvbam visualboyadvance-m
WIN32 WIN32
MACOSX_BUNDLE MACOSX_BUNDLE
${SRC_WX} ${SRC_WX}
@ -159,15 +159,16 @@ ADD_EXECUTABLE (
) )
TARGET_LINK_LIBRARIES ( TARGET_LINK_LIBRARIES (
wxvbam visualboyadvance-m
${VBAMCORE_LIBS} ${VBAMCORE_LIBS}
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${FFMPEG_LIBRARIES} ${FFMPEG_LIBRARIES}
${DIRECTX_LIBRARIES} ${DIRECTX_LIBRARIES}
${CAIRO_LIBRARIES} ${CAIRO_LIBRARIES}
) )
IF(NOT APPLE AND NOT UNIX)
INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/wxvbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin) INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
ENDIF(NOT APPLE AND NOT UNIX)
IF(NOT WIN32 AND NOT APPLE) IF(NOT WIN32 AND NOT APPLE)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications)
ENDIF(NOT WIN32 AND NOT APPLE) ENDIF(NOT WIN32 AND NOT APPLE)

2
src/wx/wxvbam.desktop
View File

@ -4,7 +4,7 @@ Type=Application
Name=VBA-M Name=VBA-M
GenericName=Game Boy Advance Emulator GenericName=Game Boy Advance Emulator
Comment=Nintendo Game Boy Advance Emulator Comment=Nintendo Game Boy Advance Emulator
Exec=wxvbam %f Exec=visualboyadvance-m %f
Icon=vbam Icon=vbam
Categories=Game;Emulator; Categories=Game;Emulator;
Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance; Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance;