From 398dbc13478c62a747cf768a394592109b58a61f Mon Sep 17 00:00:00 2001 From: xHire Date: Sat, 18 Apr 2009 23:01:28 +0200 Subject: Global conversion from DOS to UNIX file format --- cmake/FindGettext.cmake | 166 +++++++++++++++++++++++------------------------ src/screen/settingKeys.h | 54 +++++++-------- 2 files changed, 110 insertions(+), 110 deletions(-) diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index 5672a79..571773a 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -1,83 +1,83 @@ -# - Find GNU gettext tools -# This module looks for the GNU gettext tools. This module defines the -# following values: -# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool. -# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool. -# GETTEXT_INCLUDES: just for including on windows, on POSIX it works just fine. -# GETTEXT_FOUND: True if gettext has been found. -# -# Additionally it provides the following macros: -# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN ) -# This will create a target "translations" which will convert the -# given input po files into the binary output mo file. If the -# ALL option is used, the translations will also be created when -# building the default target. - - -FIND_PATH(GETTEXT_INCLUDE_DIR libintl.h - PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/include - /usr/local/include - /usr/include - NO_DEFAULT_PATH -) - -FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge - PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ - /usr/local/bin - /usr/bin - NO_DEFAULT_PATH -) - -FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt - PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ - /usr/local/bin - /usr/bin - NO_DEFAULT_PATH -) - -MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile) - - SET(_gmoFiles) - GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE) - GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE) - - SET(_addToAll) - IF(${_firstPoFile} STREQUAL "ALL") - SET(_addToAll "ALL") - SET(_firstPoFile) - ENDIF(${_firstPoFile} STREQUAL "ALL") - - FOREACH (_currentPoFile ${ARGN}) - GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE) - GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH) - GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE) - SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo) - - ADD_CUSTOM_COMMAND( - OUTPUT ${_gmoFile} - COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile} - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile} - DEPENDS ${_absPotFile} ${_absFile} - ) - - INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) - SET(_gmoFiles ${_gmoFiles} ${_gmoFile}) - - ENDFOREACH (_currentPoFile ) - - ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) - -ENDMACRO(GETTEXT_CREATE_TRANSLATIONS ) - -IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) - SET(GETTEXT_FOUND TRUE) -ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) - SET(GETTEXT_FOUND FALSE) - IF (GetText_REQUIRED) - MESSAGE(FATAL_ERROR "GetText not found") - ENDIF (GetText_REQUIRED) -ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) - +# - Find GNU gettext tools +# This module looks for the GNU gettext tools. This module defines the +# following values: +# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool. +# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool. +# GETTEXT_INCLUDES: just for including on windows, on POSIX it works just fine. +# GETTEXT_FOUND: True if gettext has been found. +# +# Additionally it provides the following macros: +# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN ) +# This will create a target "translations" which will convert the +# given input po files into the binary output mo file. If the +# ALL option is used, the translations will also be created when +# building the default target. + + +FIND_PATH(GETTEXT_INCLUDE_DIR libintl.h + PATHS + ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/include + /usr/local/include + /usr/include + NO_DEFAULT_PATH +) + +FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge + PATHS + ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ + /usr/local/bin + /usr/bin + NO_DEFAULT_PATH +) + +FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt + PATHS + ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ + /usr/local/bin + /usr/bin + NO_DEFAULT_PATH +) + +MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile) + + SET(_gmoFiles) + GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE) + GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE) + + SET(_addToAll) + IF(${_firstPoFile} STREQUAL "ALL") + SET(_addToAll "ALL") + SET(_firstPoFile) + ENDIF(${_firstPoFile} STREQUAL "ALL") + + FOREACH (_currentPoFile ${ARGN}) + GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE) + GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH) + GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE) + SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo) + + ADD_CUSTOM_COMMAND( + OUTPUT ${_gmoFile} + COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile} + DEPENDS ${_absPotFile} ${_absFile} + ) + + INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) + SET(_gmoFiles ${_gmoFiles} ${_gmoFile}) + + ENDFOREACH (_currentPoFile ) + + ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) + +ENDMACRO(GETTEXT_CREATE_TRANSLATIONS ) + +IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) + SET(GETTEXT_FOUND TRUE) +ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) + SET(GETTEXT_FOUND FALSE) + IF (GetText_REQUIRED) + MESSAGE(FATAL_ERROR "GetText not found") + ENDIF (GetText_REQUIRED) +ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) + diff --git a/src/screen/settingKeys.h b/src/screen/settingKeys.h index e0a6793..13e57fd 100644 --- a/src/screen/settingKeys.h +++ b/src/screen/settingKeys.h @@ -1,27 +1,27 @@ - -#ifndef SCREEN_SETTING_KEYS -# define SCREEN_SETTING_KEYS -# define KEY_TUX_RIGHT_MOVE_UP 0 -# define KEY_TUX_RIGHT_MOVE_RIGHT 1 -# define KEY_TUX_RIGHT_MOVE_LEFT 2 -# define KEY_TUX_RIGHT_MOVE_DOWN 3 -# define KEY_TUX_RIGHT_SHOOT 4 -# define KEY_TUX_RIGHT_SWITCH_WEAPON 5 -# define KEY_TUX_LEFT_MOVE_UP 6 -# define KEY_TUX_LEFT_MOVE_RIGHT 7 -# define KEY_TUX_LEFT_MOVE_LEFT 8 -# define KEY_TUX_LEFT_MOVE_DOWN 9 -# define KEY_TUX_LEFT_SHOOT 10 -# define KEY_TUX_LEFT_SWITCH_WEAPON 11 -# define KEY_LENGTH 12 - -# include "main.h" - extern void setting_key_int(); - extern void setting_key_draw(); - extern void setting_key_event(); - extern void setting_key_quit(); - extern void key_table_init(); - extern int key_table_get_key(int n); - extern void key_table_quit(); - -#endif /* */ + +#ifndef SCREEN_SETTING_KEYS +# define SCREEN_SETTING_KEYS +# define KEY_TUX_RIGHT_MOVE_UP 0 +# define KEY_TUX_RIGHT_MOVE_RIGHT 1 +# define KEY_TUX_RIGHT_MOVE_LEFT 2 +# define KEY_TUX_RIGHT_MOVE_DOWN 3 +# define KEY_TUX_RIGHT_SHOOT 4 +# define KEY_TUX_RIGHT_SWITCH_WEAPON 5 +# define KEY_TUX_LEFT_MOVE_UP 6 +# define KEY_TUX_LEFT_MOVE_RIGHT 7 +# define KEY_TUX_LEFT_MOVE_LEFT 8 +# define KEY_TUX_LEFT_MOVE_DOWN 9 +# define KEY_TUX_LEFT_SHOOT 10 +# define KEY_TUX_LEFT_SWITCH_WEAPON 11 +# define KEY_LENGTH 12 + +# include "main.h" +extern void setting_key_int(); +extern void setting_key_draw(); +extern void setting_key_event(); +extern void setting_key_quit(); +extern void key_table_init(); +extern int key_table_get_key(int n); +extern void key_table_quit(); + +#endif /* */ -- cgit v1.2.3