Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5619 in orxonox.OLD for branches


Ignore:
Timestamp:
Nov 16, 2005, 7:23:40 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: ShellCommand availiable again, in orxonox-mode, but unavailiable in subproject Network

Location:
branches/network/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/network/src/defs/debug.h

    r5476 r5619  
    106106#define PRINTF(x)        PRINT(x)
    107107#endif
     108#ifndef NO_SHELL
    108109#define PRINT_EXEC       ShellBuffer::addBufferLineStatic
     110#else /* NO_SHELL */
     111#define PRINT_EXEC       printf
     112#endif
    109113
    110114#ifndef PRINTF

  • branches/network/src/lib/lang/class_list.cc

    r5580 r5619  
    2727
    2828using namespace std;
    29 /*
     29
     30#ifndef NO_SHELL_COMMAND
    3031SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
    3132    ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
    32     ->defaultValues(2, NULL, 1);*/
     33    ->defaultValues(2, NULL, 1);
     34#endif
    3335
    3436/**

  • branches/network/src/lib/shell/shell_command.h

    r5391 r5619  
    3535 * $ ClassName [ObjectName] commandNameInShell [parameters]
    3636 */
     37#ifndef NO_SHELL_COMMAND
    3738#define SHELL_COMMAND(command, class, function) \
    3839        ShellCommandBase* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
    … …  
    5253#define SHELL_COMMAND_STATIC(command, class, function) \
    5354                         ShellCommandBase* shell_command_##class##_##command = ShellCommandStatic<class>::registerCommand(#command, #class, function)
    54 
     55#else /* NO_SHELL_COMMAND */
     56#define SHELL_COMMAND(NO, NO2, NO3)
     57#define SHELL_COMMAND_STATIC(NO1, NO2, NO3)
     58#endif /* NO_SHELL_COMMAND */
    5559
    5660//! an enumerator for the definition of the Type.

  • branches/network/src/subprojects/network/Makefile.am

    r5580 r5619  
    55
    66
    7 network_CPPFLAGS =
     7network_CPPFLAGS = -DNO_SHELL -DNO_SHELL_COMMAND
    88
    99network_LDFLAGS = $(MWINDOWS)

  • branches/network/src/subprojects/network/Makefile.in

    r5580 r5619  
    185185target_vendor = @target_vendor@
    186186MAINSRCDIR = ../..
    187 network_CPPFLAGS =
     187network_CPPFLAGS = -DNO_SHELL -DNO_SHELL_COMMAND
    188188network_LDFLAGS = $(MWINDOWS)
    189189network_LDADD = $(MAINSRCDIR)/lib/network/libORXnet.a \
Note: See TracChangeset for help on using the changeset viewer.