Merge branch 'master' into jgrpp
# Conflicts: # CMakeLists.txt # src/3rdparty/md5/md5.h # src/3rdparty/squirrel/squirrel/squtils.h # src/animated_tile.cpp # src/console_func.h # src/core/CMakeLists.txt # src/core/container_func.hpp # src/core/smallstack_type.hpp # src/crashlog.cpp # src/crashlog.h # src/debug.h # src/economy.cpp # src/gamelog.cpp # src/industry_gui.cpp # src/lang/catalan.txt # src/misc_gui.cpp # src/network/network_content.h # src/newgrf.cpp # src/newgrf.h # src/newgrf_config.cpp # src/newgrf_config.h # src/newgrf_gui.cpp # src/os/unix/font_unix.cpp # src/os/windows/crashlog_win.cpp # src/rail_cmd.cpp # src/saveload/animated_tile_sl.cpp # src/script/api/script_tilelist.cpp # src/settings.cpp # src/settingsgen/settingsgen.cpp # src/sl/oldloader_sl.cpp # src/station.cpp # src/station_cmd.cpp # src/stdafx.h # src/strgen/strgen.cpp # src/strgen/strgen_base.cpp # src/table/settings/gui_settings.ini # src/train_gui.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_cmd.cpp # src/vehicle_gui_base.h # src/viewport_sprite_sorter.h
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
|
||||
#include "../stdafx.h"
|
||||
#include "../core/endian_func.hpp"
|
||||
#include "../core/mem_func.hpp"
|
||||
#include "../string_func.h"
|
||||
#include "../strings_type.h"
|
||||
#include "../misc/getoptdata.h"
|
||||
@@ -504,7 +505,6 @@ static inline char *replace_pathsep(char *s) { return s; }
|
||||
|
||||
/** Options of strgen. */
|
||||
static const OptionData _opts[] = {
|
||||
GETOPT_NOVAL( 'v', "--version"),
|
||||
GETOPT_GENERAL('C', '\0', "-export-commands", ODF_NO_VALUE),
|
||||
GETOPT_GENERAL('L', '\0', "-export-plurals", ODF_NO_VALUE),
|
||||
GETOPT_GENERAL('P', '\0', "-export-pragmas", ODF_NO_VALUE),
|
||||
@@ -530,10 +530,6 @@ int CDECL main(int argc, char *argv[])
|
||||
if (i == -1) break;
|
||||
|
||||
switch (i) {
|
||||
case 'v':
|
||||
puts("$Revision$");
|
||||
return 0;
|
||||
|
||||
case 'C':
|
||||
printf("args\tflags\tcommand\treplacement\n");
|
||||
for (const CmdStruct *cs = _cmd_structs; cs < endof(_cmd_structs); cs++) {
|
||||
@@ -576,8 +572,7 @@ int CDECL main(int argc, char *argv[])
|
||||
|
||||
case 'h':
|
||||
puts(
|
||||
"strgen - $Revision$\n"
|
||||
" -v | --version print version information and exit\n"
|
||||
"strgen\n"
|
||||
" -t | --todo replace any untranslated strings with '<TODO>'\n"
|
||||
" -w | --warning print a warning for any untranslated strings\n"
|
||||
" -h | -? | --help print this help message and exit\n"
|
||||
|
@@ -9,6 +9,8 @@
|
||||
|
||||
#include "../stdafx.h"
|
||||
#include "../core/endian_func.hpp"
|
||||
#include "../core/alloc_func.hpp"
|
||||
#include "../core/mem_func.hpp"
|
||||
#include "../string_func.h"
|
||||
#include "../table/control_codes.h"
|
||||
|
||||
|
Reference in New Issue
Block a user