Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3377 in orxonox.OLD


Ignore:
Timestamp:
Jan 10, 2005, 12:00:02 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: Compiling-performance-update: SubPrjects will only be build on demand, by either compiling them inside their folders, or by
./configure —enable-sub-projects

Location:
orxonox/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.in

    r3219 r3377  
    125125SHELL = @SHELL@
    126126STRIP = @STRIP@
     127SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     128SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    127129VERSION = @VERSION@
    128130ac_ct_CC = @ac_ct_CC@

  • orxonox/trunk/configure

    r3365 r3377  
    312312#endif"
    313313
    314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE LIBOBJS LTLIBOBJS'
     314ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    867867  --enable-debug          compiles in debug mode. Lots of debug info about the
    868868                          game.
     869  --enable-sub-projects   also builds the subProjects by default
    869870
    870871Optional Packages:
    … …  
    39033904
    39043905
     3906### SubProject-enable
     3907def_sdl_image=yes
     3908echo "$as_me:$LINENO: checking if the SubProjects should be built" >&5
     3909echo $ECHO_N "checking if the SubProjects should be built... $ECHO_C" >&6
     3910# Check whether --enable-sub-projects or --disable-sub-projects was given.
     3911if test "${enable_sub_projects+set}" = set; then
     3912  enableval="$enable_sub_projects"
     3913  def_sub_projects=yes
     3914fi;
     3915if test "$def_sub_projects" = yes; then
     3916  echo "yes"
     3917fi
     3918if test "$def_sub_projects" = no; then
     3919  echo "no"
     3920fi
     3921
     3922
     3923if test x$def_sub_projects = xyes; then
     3924  SUB_PROJECTS_TRUE=
     3925  SUB_PROJECTS_FALSE='#'
     3926else
     3927  SUB_PROJECTS_TRUE='#'
     3928  SUB_PROJECTS_FALSE=
     3929fi
     3930
     3931
    39053932## PROGRAMM CHECKING
    39063933# checking for Doxygen
    … …  
    75477574
    75487575
    7549                                                   ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile"
     7576                                                  ac_config_files="$ac_config_files Makefile src/Makefile src/importer/Makefile src/console/Makefile src/gui/Makefile"
     7577
    75507578
    75517579cat >confcache <<\_ACEOF
    … …  
    76587686Usually this means the macro was only invoked conditionally." >&5
    76597687echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
     7688Usually this means the macro was only invoked conditionally." >&2;}
     7689   { (exit 1); exit 1; }; }
     7690fi
     7691if test -z "${SUB_PROJECTS_TRUE}" && test -z "${SUB_PROJECTS_FALSE}"; then
     7692  { { echo "$as_me:$LINENO: error: conditional \"SUB_PROJECTS\" was never defined.
     7693Usually this means the macro was only invoked conditionally." >&5
     7694echo "$as_me: error: conditional \"SUB_PROJECTS\" was never defined.
    76607695Usually this means the macro was only invoked conditionally." >&2;}
    76617696   { (exit 1); exit 1; }; }
    … …  
    81208155  # Handling of arguments.
    81218156  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     8157  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     8158  "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
    81228159  "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
    81238160  "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
    8124   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    8125   "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
    81268161  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    81278162  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    … …  
    82688303s,@EGREP@,$EGREP,;t t
    82698304s,@DEBUG@,$DEBUG,;t t
     8305s,@SUB_PROJECTS_TRUE@,$SUB_PROJECTS_TRUE,;t t
     8306s,@SUB_PROJECTS_FALSE@,$SUB_PROJECTS_FALSE,;t t
    82708307s,@DOXYGEN@,$DOXYGEN,;t t
    82718308s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t

  • orxonox/trunk/configure.ac

    r3240 r3377  
    6969
    7070
     71### SubProject-enable
     72def_sdl_image=yes
     73AC_MSG_CHECKING([if the SubProjects should be built])
     74AC_ARG_ENABLE([sub-projects],
     75        AC_HELP_STRING( [--enable-sub-projects],
     76        [also builds the subProjects by default]), [def_sub_projects=yes])
     77if test "$def_sub_projects" = yes; then
     78  echo "yes"
     79fi
     80if test "$def_sub_projects" = no; then
     81  echo "no"
     82fi
     83AM_CONDITIONAL(SUB_PROJECTS, test x$def_sub_projects = xyes)
     84
    7185## PROGRAMM CHECKING
    7286# checking for Doxygen
    … …  
    364378
    365379AC_CONFIG_FILES([Makefile
     380                 src/Makefile
     381                 src/importer/Makefile
    366382                 src/console/Makefile
    367                  src/gui/Makefile
    368                  src/Makefile
    369                  src/importer/Makefile])
     383                 src/gui/Makefile])
     384
    370385AC_OUTPUT

  • orxonox/trunk/src/Makefile.am

    r3365 r3377  
    7777                 matrix.h \
    7878                 curve.h \
    79                  glmenu_imagescreen.h
     79                 glmenu_imagescreen.h \
     80                 debug.h
    8081
    8182
    … …  
    8990  GTK_PROGS =
    9091endif
     92if SUB_PROJECTS
     93  SUB_PROGS = importer \
     94              gui \
     95              $(GTK_PROGS)
     96else
     97  SUB_PROGS =
     98endif
    9199
    92100SUBDIRS = . \
    93           importer \
    94           gui \
    95           $(GTK_PROGS)
     101          $(SUB_PROGS)
    96102
    97103#  uncomment the following if orxonox requires the math library

  • orxonox/trunk/src/Makefile.in

    r3365 r3377  
    159159SHELL = @SHELL@
    160160STRIP = @STRIP@
     161SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     162SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    161163VERSION = @VERSION@
    162164ac_ct_CC = @ac_ct_CC@
    … …  
    274276                 matrix.h \
    275277                 curve.h \
    276                  glmenu_imagescreen.h
     278                 glmenu_imagescreen.h \
     279                 debug.h
    277280
    278281EXTRA_DIST = orxonox.conf
    … …  
    281284### GTK_RELATED
    282285@HAVE_GTK2_TRUE@GTK_PROGS = console
     286@SUB_PROJECTS_FALSE@SUB_PROGS =
     287@SUB_PROJECTS_TRUE@SUB_PROGS = importer \
     288@SUB_PROJECTS_TRUE@           gui \
     289@SUB_PROJECTS_TRUE@           $(GTK_PROGS)
     290
    283291SUBDIRS = . \
    284           importer \
    285           gui \
    286           $(GTK_PROGS)
     292          $(SUB_PROGS)
    287293
    288294all: all-recursive

  • orxonox/trunk/src/console/Makefile.in

    r3219 r3377  
    128128SHELL = @SHELL@
    129129STRIP = @STRIP@
     130SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     131SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    130132VERSION = @VERSION@
    131133ac_ct_CC = @ac_ct_CC@

  • orxonox/trunk/src/gui/Makefile.in

    r3219 r3377  
    135135SHELL = @SHELL@
    136136STRIP = @STRIP@
     137SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     138SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    137139VERSION = @VERSION@
    138140ac_ct_CC = @ac_ct_CC@

  • orxonox/trunk/src/importer/Makefile.in

    r3365 r3377  
    129129SHELL = @SHELL@
    130130STRIP = @STRIP@
     131SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     132SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    131133VERSION = @VERSION@
    132134ac_ct_CC = @ac_ct_CC@
Note: See TracChangeset for help on using the changeset viewer.