From: Rémi Verschelde Date: Sat, 28 Jan 2017 17:11:06 +0000 (+0100) Subject: Split distribution stuff per platform X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=9ab405b6543dfd6ea0eef8e5e80d76ffa9d4dd04;p=lugaru.git Split distribution stuff per platform --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0965b30..851df4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,13 +180,15 @@ set(LUGARU_H ) +set(LUGARU_OBJS "") if(WIN32) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Lugaru.res COMMAND ${CMAKE_RC_COMPILER} - -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + -o ${CMAKE_CURRENT_BINARY_DIR}/Lugaru.res -i${SRCDIR}/Lugaru.rc DEPENDS ${SRCDIR}/Lugaru.rc ) + set(LUGARU_OBJS "Lugaru.res") endif(WIN32) if(APPLE) @@ -235,12 +237,7 @@ set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIE ### Definitions -if(WIN32) - add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H} lugaru_resource.obj) -else(WIN32) - add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H}) -endif(WIN32) - +add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H} ${LUGARU_OBJS}) target_link_libraries(lugaru ${LUGARU_LIBS}) if(WIN32) @@ -307,10 +304,10 @@ if(LINUX) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${CMAKE_INSTALL_BINDIR}) # Trailing '/' is significant, it installs and _renames_ Data/ as the destination folder install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) - install(FILES ${CMAKE_SOURCE_DIR}/Dist/lugaru.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata) - install(FILES ${CMAKE_SOURCE_DIR}/Dist/lugaru.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) - install(FILES ${CMAKE_SOURCE_DIR}/Dist/lugaru.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps) - install(FILES ${CMAKE_SOURCE_DIR}/Dist/lugaru.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) + install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata) + install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) + install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps) + install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) else(SYSTEM_INSTALL) message("You are building Lugaru without having enabled the SYSTEM_INSTALL option. It will default to looking for the data in the 'Data' directory next to the binary.") install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/Dist/Linux/lugaru.6 b/Dist/Linux/lugaru.6 new file mode 100644 index 0000000..b771d24 --- /dev/null +++ b/Dist/Linux/lugaru.6 @@ -0,0 +1,75 @@ +.\" Process this file with: groff -man -Tlatin1 lugaru.6 +.\" Please report any issue with this man page at +.\" https://gitlab.com/osslugaru/lugaru/issues +.TH LUGARU 6 "December 2016" Linux +.SH NAME +Lugaru \- free and open source ninja rabbit fighting game +.SH DESCRIPTION +Lugaru (pronounced Loo-GAH-roo) is a cross-platform third-person action game. +The main character, Turner, is an anthropomorphic rebel bunny rabbit with +impressive combat skills. In his quest to find those responsible for +slaughtering his village, he uncovers a far-reaching conspiracy involving the +corrupt leaders of the rabbit republic and the starving wolves from a nearby +den. Turner takes it upon himself to fight against their plot and save his +fellow rabbits from slavery. +.SH SYNOPSIS +.B lugaru +.RI [ options ] +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +Print usage and exit. +.TP +\fB\-f\fR, \fB\-\-fullscreen\fR +Start the game in fullscreen mode. +.TP +\fB\-w\fR, \fB\-\-windowed\fR +Start the game in windowed mode (default). +.TP +\fB\-\-nomousegrab\fR +Disable mousegrab. +.TP +\fB\-\-mousegrab\fR +Enable mousegrab (default). +.TP +\fB\-\-nosound\fR +Disable sound. +.TP +\fB\-\-force\-alsa\fR +Force use of ALSA back\-end. +.TP +\fB\-\-force\-oss\fR +Force use of OSS back\-end. +.TP +\fB\-\-openal\-info\fR +Print info about OpenAL at launch. +.TP +\fB\-\-showresolutions\fR +List the resolutions found by SDL at launch. +.TP +\fB\-d\fR, \fB\-\-devtools\fR +Enable dev tools: console, level editor and debug info. +.SH FILES +XDG_CONFIG_HOME/lugaru/ or ~/.config/lugaru/ +.RS +User-specific configuration folder, contains the config.txt file. +.RE +XDG_DATA_HOME/lugaru/ or ~/.local/share/lugaru/ +.RS +User-specific data folder, contains saved user progress, screenshots and saved +maps. +.RE +/usr/share/doc/lugaru/ +.RS +Additional documentation files and licensing information. +.RE +.SH "SEE ALSO" +See the project website at \fIhttps://osslugaru.gitlab.io/\fR and the source +code repository at \fIhttps://gitlab.com/osslugaru/lugaru\fR for more details. +.SH BUGS +Lugaru is a free and open source game and welcomes any kind of contributions. +In particular, you can report issues or make suggestions on Lugaru's issue +tracker at \fIhttps://gitlab.com/osslugaru/lugaru/issues\fR. +.SH AUTHOR +Man page written by Rémi Verschelde on behalf of the +OSS Lugaru development team. diff --git a/Dist/Linux/lugaru.appdata.xml b/Dist/Linux/lugaru.appdata.xml new file mode 100644 index 0000000..a9c45e5 --- /dev/null +++ b/Dist/Linux/lugaru.appdata.xml @@ -0,0 +1,31 @@ + + + + lugaru.desktop + CC-BY-SA-4.0 + GPL-2.0+ and CC-BY-SA-3.0 + Lugaru HD + Third person ninja rabbit fighting game + +

+ Lugaru (pronounced Loo-GAH-roo) is a cross-platform third-person action game. + The main character, Turner, is an anthropomorphic rebel bunny rabbit with impressive combat skills. +

+ +

+ In his quest to find those responsible for slaughtering his village, + he uncovers a far-reaching conspiracy involving the corrupt leaders + of the rabbit republic and the starving wolves from a nearby den. + Turner takes it upon himself to fight against their plot and save + his fellow rabbits from slavery. +

+ + + + https://osslugaru.gitlab.io/images/lugaru-banner.png + + + https://osslugaru.gitlab.io/ + ngompa13_at_gmail.com + + diff --git a/Dist/Linux/lugaru.desktop b/Dist/Linux/lugaru.desktop new file mode 100644 index 0000000..ad224ec --- /dev/null +++ b/Dist/Linux/lugaru.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Lugaru HD +GenericName=Fighting game +Comment=Third person ninja rabbit fighting game +Exec=lugaru +Icon=lugaru +Terminal=false +Type=Application +Categories=Game;ActionGame; diff --git a/Dist/Linux/lugaru.png b/Dist/Linux/lugaru.png new file mode 100644 index 0000000..f990163 Binary files /dev/null and b/Dist/Linux/lugaru.png differ diff --git a/Dist/Windows/Lugaru.ico b/Dist/Windows/Lugaru.ico new file mode 100644 index 0000000..5a2895e Binary files /dev/null and b/Dist/Windows/Lugaru.ico differ diff --git a/Dist/lugaru.6 b/Dist/lugaru.6 deleted file mode 100644 index b771d24..0000000 --- a/Dist/lugaru.6 +++ /dev/null @@ -1,75 +0,0 @@ -.\" Process this file with: groff -man -Tlatin1 lugaru.6 -.\" Please report any issue with this man page at -.\" https://gitlab.com/osslugaru/lugaru/issues -.TH LUGARU 6 "December 2016" Linux -.SH NAME -Lugaru \- free and open source ninja rabbit fighting game -.SH DESCRIPTION -Lugaru (pronounced Loo-GAH-roo) is a cross-platform third-person action game. -The main character, Turner, is an anthropomorphic rebel bunny rabbit with -impressive combat skills. In his quest to find those responsible for -slaughtering his village, he uncovers a far-reaching conspiracy involving the -corrupt leaders of the rabbit republic and the starving wolves from a nearby -den. Turner takes it upon himself to fight against their plot and save his -fellow rabbits from slavery. -.SH SYNOPSIS -.B lugaru -.RI [ options ] -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -Print usage and exit. -.TP -\fB\-f\fR, \fB\-\-fullscreen\fR -Start the game in fullscreen mode. -.TP -\fB\-w\fR, \fB\-\-windowed\fR -Start the game in windowed mode (default). -.TP -\fB\-\-nomousegrab\fR -Disable mousegrab. -.TP -\fB\-\-mousegrab\fR -Enable mousegrab (default). -.TP -\fB\-\-nosound\fR -Disable sound. -.TP -\fB\-\-force\-alsa\fR -Force use of ALSA back\-end. -.TP -\fB\-\-force\-oss\fR -Force use of OSS back\-end. -.TP -\fB\-\-openal\-info\fR -Print info about OpenAL at launch. -.TP -\fB\-\-showresolutions\fR -List the resolutions found by SDL at launch. -.TP -\fB\-d\fR, \fB\-\-devtools\fR -Enable dev tools: console, level editor and debug info. -.SH FILES -XDG_CONFIG_HOME/lugaru/ or ~/.config/lugaru/ -.RS -User-specific configuration folder, contains the config.txt file. -.RE -XDG_DATA_HOME/lugaru/ or ~/.local/share/lugaru/ -.RS -User-specific data folder, contains saved user progress, screenshots and saved -maps. -.RE -/usr/share/doc/lugaru/ -.RS -Additional documentation files and licensing information. -.RE -.SH "SEE ALSO" -See the project website at \fIhttps://osslugaru.gitlab.io/\fR and the source -code repository at \fIhttps://gitlab.com/osslugaru/lugaru\fR for more details. -.SH BUGS -Lugaru is a free and open source game and welcomes any kind of contributions. -In particular, you can report issues or make suggestions on Lugaru's issue -tracker at \fIhttps://gitlab.com/osslugaru/lugaru/issues\fR. -.SH AUTHOR -Man page written by Rémi Verschelde on behalf of the -OSS Lugaru development team. diff --git a/Dist/lugaru.appdata.xml b/Dist/lugaru.appdata.xml deleted file mode 100644 index a9c45e5..0000000 --- a/Dist/lugaru.appdata.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - lugaru.desktop - CC-BY-SA-4.0 - GPL-2.0+ and CC-BY-SA-3.0 - Lugaru HD - Third person ninja rabbit fighting game - -

- Lugaru (pronounced Loo-GAH-roo) is a cross-platform third-person action game. - The main character, Turner, is an anthropomorphic rebel bunny rabbit with impressive combat skills. -

- -

- In his quest to find those responsible for slaughtering his village, - he uncovers a far-reaching conspiracy involving the corrupt leaders - of the rabbit republic and the starving wolves from a nearby den. - Turner takes it upon himself to fight against their plot and save - his fellow rabbits from slavery. -

- - - - https://osslugaru.gitlab.io/images/lugaru-banner.png - - - https://osslugaru.gitlab.io/ - ngompa13_at_gmail.com - - diff --git a/Dist/lugaru.desktop b/Dist/lugaru.desktop deleted file mode 100644 index ad224ec..0000000 --- a/Dist/lugaru.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Lugaru HD -GenericName=Fighting game -Comment=Third person ninja rabbit fighting game -Exec=lugaru -Icon=lugaru -Terminal=false -Type=Application -Categories=Game;ActionGame; diff --git a/Dist/lugaru.ico b/Dist/lugaru.ico deleted file mode 100644 index 5a2895e..0000000 Binary files a/Dist/lugaru.ico and /dev/null differ diff --git a/Dist/lugaru.png b/Dist/lugaru.png deleted file mode 100644 index f990163..0000000 Binary files a/Dist/lugaru.png and /dev/null differ diff --git a/Source/Lugaru.rc b/Source/Lugaru.rc index f0f8807..c436aab 100644 --- a/Source/Lugaru.rc +++ b/Source/Lugaru.rc @@ -18,6 +18,6 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -LUGARU_ICON ICON "../Dist/lugaru.ico" +LUGARU_ICON ICON "../Dist/Windows/Lugaru.ico" // TODO: Add version info