Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3549 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Mar 14, 2005, 9:58:45 PM (21 years ago)
Author:
bensch
Message:

orxonox/trunk: added folder subprojects.
now one can test all the features one likes in an already handled file in subrojects/testmain

Location:
orxonox/trunk
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/configure

    r3493 r3549  
    81828182## OUTPUT CONFIGURE ##
    81838183######################
    8184                                                                                 ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile"
     8184                                                                                                    ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile"
    81858185
    81868186
    … …  
    87848784  "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;;
    87858785  "src/lib/gui/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/gui/Makefile" ;;
     8786  "src/subprojects/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/Makefile" ;;
     8787  "src/subprojects/testmain/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/testmain/Makefile" ;;
    87868788  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    87878789  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

  • orxonox/trunk/configure.ac

    r3493 r3549  
    534534                 src/lib/gui/Makefile
    535535                 src/lib/gui/console/Makefile
    536                  src/lib/gui/gui/Makefile])
     536                 src/lib/gui/gui/Makefile
     537                 src/subprojects/Makefile
     538                 src/subprojects/testmain/Makefile])
    537539
    538540AC_OUTPUT

  • orxonox/trunk/src/Makefile.am

    r3522 r3549  
    114114
    115115if SUB_PROJECTS
    116   SUB_PROGS = lib
     116  SUB_PROGS = lib subprojects
    117117else
    118118  SUB_PROGS =

  • orxonox/trunk/src/Makefile.in

    r3528 r3549  
    107107ETAGS = etags
    108108CTAGS = ctags
    109 DIST_SUBDIRS = . lib
     109DIST_SUBDIRS = . lib subprojects
    110110DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    111111ACLOCAL = @ACLOCAL@
    … …  
    302302EXTRA_DIST = orxonox.conf
    303303@SUB_PROJECTS_FALSE@SUB_PROGS =
    304 @SUB_PROJECTS_TRUE@SUB_PROGS = lib
     304@SUB_PROJECTS_TRUE@SUB_PROGS = lib subprojects
    305305SUBDIRS = . \
    306306          $(SUB_PROGS)

  • orxonox/trunk/src/lib/graphics/importer/material.cc

    r3548 r3549  
    6868Material* Material::addMaterial(char* mtlName)
    6969{
    70   PRINTF(2)("adding Material %s.\n", mtlName);
     70  PRINTF(4)("adding Material %s.\n", mtlName);
    7171   Material* tmpMat = this;
    7272  while (tmpMat->nextMat != NULL)
Note: See TracChangeset for help on using the changeset viewer.