Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2058 in orxonox.OLD for orxonox/branches/chris/console


Ignore:
Timestamp:
Jul 2, 2004, 11:36:56 AM (20 years ago)
Author:
chris
Message:

orxonox/branches/chris: Trunk remerged into my branch started on SDL reconfiguration

Location:
orxonox/branches/chris/console
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/chris/console/Makefile.am

    r1982 r2058  
    1 AM_CXXFLAGS=`pkg-config --cflags gtk+-2.0`
    2 AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
     1AM_CXXFLAGS=`pkg-config --cflags gtk+-2.0` $(MSBITFIELDS)
     2#AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
    33
    44bin_PROGRAMS=console
    5 console_SOURCES=orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc
     5console_SOURCES=orxonox_console.cc orxonox_console.h \
     6                orxonox_console_entry.cc orxonox_console_entry.h \
     7                orxonox_console_log.cc orxonox_console_log.h
    68
    79#  uncomment the following if bencoder requires the math library

  • orxonox/branches/chris/console/Makefile.in

    r1982 r2058  
    6969LTLIBOBJS = @LTLIBOBJS@
    7070MAKEINFO = @MAKEINFO@
     71MSBITFIELDS = @MSBITFIELDS@
    7172OBJEXT = @OBJEXT@
    7273PACKAGE = @PACKAGE@
    … …  
    110111sysconfdir = @sysconfdir@
    111112target_alias = @target_alias@
    112 AM_CXXFLAGS = `pkg-config --cflags gtk+-2.0`
    113 AM_LDFLAGS = `pkg-config --libs  gtk+-2.0`
    114 
     113AM_CXXFLAGS = `pkg-config --cflags gtk+-2.0` $(MSBITFIELDS)
     114
     115#AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
    115116bin_PROGRAMS = console
    116 console_SOURCES = orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc
     117console_SOURCES = orxonox_console.cc orxonox_console.h \
     118                orxonox_console_entry.cc orxonox_console_entry.h \
     119                orxonox_console_log.cc orxonox_console_log.h
     120
    117121subdir = console
    118122ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    141145CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    142146        -o $@
     147COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     148        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     149CCLD = $(CC)
     150LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    143151DIST_SOURCES = $(console_SOURCES)
    144152DIST_COMMON = $(srcdir)/Makefile.in Makefile.am

  • orxonox/branches/chris/console/orxonox_console_entry.cc

    r1907 r2058  
    2929
    3030
    31 OrxonoxConsoleEntry::OrxonoxConsoleEntry()
     31OrxonoxConsoleEntry::OrxonoxConsoleEntry(void)
    3232{}
    3333
Note: See TracChangeset for help on using the changeset viewer.