- Timestamp:
- Nov 3, 2004, 12:29:03 AM (20 years ago)
- Location:
- orxonox/branches/buerli
- Files:
-
- 31 edited
- 9 copied
-
Makefile.in (modified) (22 diffs)
-
aclocal.m4 (modified) (11 diffs)
-
config.h.in (modified) (1 diff)
-
configure (modified) (37 diffs)
-
configure.ac (modified) (3 diffs)
-
console/Makefile.in (modified) (22 diffs)
-
gui/Makefile.am (modified) (1 diff)
-
gui/Makefile.in (modified) (23 diffs)
-
gui/orxonox_gui.cc (modified) (45 diffs)
-
gui/orxonox_gui.h (modified) (15 diffs)
-
gui/orxonox_gui_audio.cc (modified) (1 diff)
-
gui/orxonox_gui_banner.cc (modified) (2 diffs)
-
gui/orxonox_gui_exec.cc (modified) (10 diffs)
-
gui/orxonox_gui_exec.h (modified) (1 diff)
-
gui/orxonox_gui_flags.cc (modified) (1 diff)
-
gui/orxonox_gui_keys.cc (copied) (copied from orxonox/trunk/gui/orxonox_gui_keys.cc)
-
gui/orxonox_gui_keys.h (copied) (copied from orxonox/trunk/gui/orxonox_gui_keys.h)
-
gui/orxonox_gui_video.cc (modified) (1 diff)
-
src/Makefile.in (modified) (18 diffs)
-
src/camera.cc (modified) (4 diffs)
-
src/camera.h (modified) (3 diffs)
-
src/campaign.cc (copied) (copied from orxonox/trunk/src/campaign.cc)
-
src/campaign.h (copied) (copied from orxonox/trunk/src/campaign.h)
-
src/command_node.cc (modified) (3 diffs)
-
src/error.h (modified) (1 diff)
-
src/game_loader.cc (copied) (copied from orxonox/trunk/src/game_loader.cc)
-
src/game_loader.h (copied) (copied from orxonox/trunk/src/game_loader.h)
-
src/list.h (modified) (7 diffs)
-
src/orxonox.cc (modified) (10 diffs)
-
src/orxonox.conf (modified) (1 diff)
-
src/orxonox.h (modified) (4 diffs)
-
src/player.cc (modified) (1 diff)
-
src/stdincl.h (modified) (1 diff)
-
src/story_def.h (copied) (copied from orxonox/trunk/src/story_def.h)
-
src/story_entity.cc (copied) (copied from orxonox/trunk/src/story_entity.cc)
-
src/story_entity.h (copied) (copied from orxonox/trunk/src/story_entity.h)
-
src/track.cc (modified) (1 diff)
-
src/track.h (modified) (1 diff)
-
src/world.cc (modified) (4 diffs)
-
src/world.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/buerli/Makefile.in
r2685 r2707 1 # Makefile.in generated by automake 1. 7.9from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 4 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 20035 # Free Software Foundation, Inc.4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 14 14 15 15 @SET_MAKE@ 16 17 16 srcdir = @srcdir@ 18 17 top_srcdir = @top_srcdir@ … … 22 21 pkgincludedir = $(includedir)/@PACKAGE@ 23 22 top_builddir = . 24 25 23 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 26 24 INSTALL = @INSTALL@ … … 36 34 PRE_UNINSTALL = : 37 35 POST_UNINSTALL = : 36 subdir = . 37 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 38 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 39 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ 40 depcomp install-sh missing mkinstalldirs 41 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 42 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 43 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 44 $(ACLOCAL_M4) 45 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 46 configure.lineno configure.status.lineno 47 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 48 CONFIG_HEADER = config.h 49 CONFIG_CLEAN_FILES = 50 SOURCES = 51 DIST_SOURCES = 52 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ 53 html-recursive info-recursive install-data-recursive \ 54 install-exec-recursive install-info-recursive \ 55 install-recursive installcheck-recursive installdirs-recursive \ 56 pdf-recursive ps-recursive uninstall-info-recursive \ 57 uninstall-recursive 58 ETAGS = etags 59 CTAGS = ctags 60 DIST_SUBDIRS = $(SUBDIRS) 61 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 62 distdir = $(PACKAGE)-$(VERSION) 63 top_distdir = $(distdir) 64 am__remove_distdir = \ 65 { test ! -d $(distdir) \ 66 || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ 67 && rm -fr $(distdir); }; } 68 DIST_ARCHIVES = $(distdir).tar.gz 69 GZIP_ENV = --best 70 distuninstallcheck_listfiles = find . -type f -print 71 distcleancheck_listfiles = find . -type f -print 38 72 ACLOCAL = @ACLOCAL@ 39 73 AMDEP_FALSE = @AMDEP_FALSE@ … … 90 124 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 91 125 am__include = @am__include@ 126 am__leading_dot = @am__leading_dot@ 92 127 am__quote = @am__quote@ 93 128 bindir = @bindir@ … … 103 138 localstatedir = @localstatedir@ 104 139 mandir = @mandir@ 140 mkdir_p = @mkdir_p@ 105 141 oldincludedir = @oldincludedir@ 106 142 prefix = @prefix@ … … 111 147 target_alias = @target_alias@ 112 148 SUBDIRS = src console gui 113 subdir = .114 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4115 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs116 CONFIG_HEADER = config.h117 CONFIG_CLEAN_FILES =118 DIST_SOURCES =119 120 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \121 ps-recursive install-info-recursive uninstall-info-recursive \122 all-recursive install-data-recursive install-exec-recursive \123 installdirs-recursive install-recursive uninstall-recursive \124 check-recursive installcheck-recursive125 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \126 COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \127 config.h.in configure configure.ac depcomp install-sh missing \128 mkinstalldirs129 DIST_SUBDIRS = $(SUBDIRS)130 149 all: config.h 131 150 $(MAKE) $(AM_MAKEFLAGS) all-recursive 132 151 133 152 .SUFFIXES: 134 135 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 136 configure.lineno 137 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 153 am--refresh: 154 @: 155 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) 156 @for dep in $?; do \ 157 case '$(am__configure_deps)' in \ 158 *$$dep*) \ 159 echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ 160 cd $(srcdir) && $(AUTOMAKE) --gnu \ 161 && exit 0; \ 162 exit 1;; \ 163 esac; \ 164 done; \ 165 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ 138 166 cd $(top_srcdir) && \ 139 167 $(AUTOMAKE) --gnu Makefile 140 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 141 cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) 142 143 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 168 .PRECIOUS: Makefile 169 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 170 @case '$?' in \ 171 *config.status*) \ 172 echo ' $(SHELL) ./config.status'; \ 173 $(SHELL) ./config.status;; \ 174 *) \ 175 echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ 176 cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ 177 esac; 178 179 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 144 180 $(SHELL) ./config.status --recheck 145 $(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 181 182 $(top_srcdir)/configure: $(am__configure_deps) 146 183 cd $(srcdir) && $(AUTOCONF) 147 148 $(ACLOCAL_M4): configure.ac 184 $(ACLOCAL_M4): $(am__aclocal_m4_deps) 149 185 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) 150 186 … … 158 194 @rm -f stamp-h1 159 195 cd $(top_builddir) && $(SHELL) ./config.status config.h 160 161 $(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 196 $(srcdir)/config.h.in: $(am__configure_deps) 162 197 cd $(top_srcdir) && $(AUTOHEADER) 163 touch $(srcdir)/config.h.in 198 rm -f stamp-h1 199 touch $@ 164 200 165 201 distclean-hdr: … … 226 262 done 227 263 228 ETAGS = etags229 ETAGSFLAGS =230 231 CTAGS = ctags232 CTAGSFLAGS =233 234 tags: TAGS235 236 264 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 237 265 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ … … 242 270 END { for (i in files) print i; }'`; \ 243 271 mkid -fID $$unique 272 tags: TAGS 244 273 245 274 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ … … 247 276 tags=; \ 248 277 here=`pwd`; \ 249 if ( etags--etags-include --version) >/dev/null 2>&1; then \278 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ 250 279 include_option=--etags-include; \ 280 empty_fix=.; \ 251 281 else \ 252 282 include_option=--include; \ 283 empty_fix=; \ 253 284 fi; \ 254 285 list='$(SUBDIRS)'; for subdir in $$list; do \ 255 286 if test "$$subdir" = .; then :; else \ 256 test -f $$subdir/TAGS &&\287 test ! -f $$subdir/TAGS || \ 257 288 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 258 289 fi; \ … … 264 295 $(AWK) ' { files[$$0] = 1; } \ 265 296 END { for (i in files) print i; }'`; \ 266 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 267 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 268 $$tags $$unique 269 297 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 298 test -n "$$unique" || unique=$$empty_fix; \ 299 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 300 $$tags $$unique; \ 301 fi 270 302 ctags: CTAGS 271 303 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ … … 290 322 distclean-tags: 291 323 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 292 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)293 294 top_distdir = .295 distdir = $(PACKAGE)-$(VERSION)296 297 am__remove_distdir = \298 { test ! -d $(distdir) \299 || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \300 && rm -fr $(distdir); }; }301 302 GZIP_ENV = --best303 distuninstallcheck_listfiles = find . -type f -print304 distcleancheck_listfiles = find . -type f -print305 324 306 325 distdir: $(DISTFILES) … … 318 337 if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 319 338 dir="/$$dir"; \ 320 $(mk installdirs) "$(distdir)$$dir"; \339 $(mkdir_p) "$(distdir)$$dir"; \ 321 340 else \ 322 341 dir=''; \ … … 335 354 list='$(SUBDIRS)'; for subdir in $$list; do \ 336 355 if test "$$subdir" = .; then :; else \ 337 test -d $(distdir)/$$subdir\338 || mkdir $(distdir)/$$subdir\356 test -d "$(distdir)/$$subdir" \ 357 || mkdir "$(distdir)/$$subdir" \ 339 358 || exit 1; \ 340 359 (cd $$subdir && \ 341 360 $(MAKE) $(AM_MAKEFLAGS) \ 342 top_distdir=" $(top_distdir)" \343 distdir= ../$(distdir)/$$subdir\361 top_distdir="../$(top_distdir)" \ 362 distdir="../$(distdir)/$$subdir" \ 344 363 distdir) \ 345 364 || exit 1; \ … … 355 374 $(am__remove_distdir) 356 375 376 dist-bzip2: distdir 377 $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 378 $(am__remove_distdir) 379 380 dist-tarZ: distdir 381 $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z 382 $(am__remove_distdir) 383 384 dist-shar: distdir 385 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz 386 $(am__remove_distdir) 387 388 dist-zip: distdir 389 -rm -f $(distdir).zip 390 zip -rq $(distdir).zip $(distdir) 391 $(am__remove_distdir) 392 357 393 dist dist-all: distdir 358 394 $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz … … 363 399 # tarfile. 364 400 distcheck: dist 365 $(am__remove_distdir) 366 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - 401 case '$(DIST_ARCHIVES)' in \ 402 *.tar.gz*) \ 403 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ 404 *.tar.bz2*) \ 405 bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ 406 *.tar.Z*) \ 407 uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ 408 *.shar.gz*) \ 409 GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ 410 *.zip*) \ 411 unzip $(distdir).zip ;;\ 412 esac 367 413 chmod -R a-w $(distdir); chmod a+w $(distdir) 368 414 mkdir $(distdir)/_build … … 384 430 && chmod -R a-w "$$dc_install_base" \ 385 431 && ({ \ 386 (cd ../.. && $(mkinstalldirs)"$$dc_destdir") \432 (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ 387 433 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ 388 434 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ … … 391 437 } || { rm -rf "$$dc_destdir"; exit 1; }) \ 392 438 && rm -rf "$$dc_destdir" \ 393 && $(MAKE) $(AM_MAKEFLAGS) dist -gzip\394 && rm - f $(distdir).tar.gz\439 && $(MAKE) $(AM_MAKEFLAGS) dist \ 440 && rm -rf $(DIST_ARCHIVES) \ 395 441 && $(MAKE) $(AM_MAKEFLAGS) distcleancheck 396 442 $(am__remove_distdir) 397 @echo "$(distdir).tar.gz is ready for distribution" | \ 398 sed 'h;s/./=/g;p;x;p;x' 443 @(echo "$(distdir) archives ready for distribution: "; \ 444 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ 445 sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' 399 446 distuninstallcheck: 400 447 @cd $(distuninstallcheck_dir) \ … … 420 467 installdirs: installdirs-recursive 421 468 installdirs-am: 422 423 469 install: install-recursive 424 470 install-exec: install-exec-recursive … … 458 504 dvi-am: 459 505 506 html: html-recursive 507 460 508 info: info-recursive 461 509 … … 494 542 uninstall-info: uninstall-info-recursive 495 543 496 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ 497 clean-generic clean-recursive ctags ctags-recursive dist \ 498 dist-all dist-gzip distcheck distclean distclean-generic \ 499 distclean-hdr distclean-recursive distclean-tags distcleancheck \ 500 distdir distuninstallcheck dvi dvi-am dvi-recursive info \ 501 info-am info-recursive install install-am install-data \ 502 install-data-am install-data-recursive install-exec \ 503 install-exec-am install-exec-recursive install-info \ 504 install-info-am install-info-recursive install-man \ 505 install-recursive install-strip installcheck installcheck-am \ 506 installdirs installdirs-am installdirs-recursive \ 507 maintainer-clean maintainer-clean-generic \ 508 maintainer-clean-recursive mostlyclean mostlyclean-generic \ 509 mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ 510 ps-recursive tags tags-recursive uninstall uninstall-am \ 511 uninstall-info-am uninstall-info-recursive uninstall-recursive 544 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ 545 check-am clean clean-generic clean-recursive ctags \ 546 ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ 547 dist-tarZ dist-zip distcheck distclean distclean-generic \ 548 distclean-hdr distclean-recursive distclean-tags \ 549 distcleancheck distdir distuninstallcheck dvi dvi-am html \ 550 html-am info info-am install install-am install-data \ 551 install-data-am install-exec install-exec-am install-info \ 552 install-info-am install-man install-strip installcheck \ 553 installcheck-am installdirs installdirs-am maintainer-clean \ 554 maintainer-clean-generic maintainer-clean-recursive \ 555 mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ 556 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ 557 uninstall-info-am 512 558 513 559 # Tell versions [3.59,3.63) of GNU make to not export all variables. -
orxonox/branches/buerli/aclocal.m4
r2617 r2707 1 # generated automatically by aclocal 1. 7.1-*- Autoconf -*-2 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 1 # generated automatically by aclocal 1.8.5 -*- Autoconf -*- 2 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 4 4 # Free Software Foundation, Inc. 5 5 # This file is free software; the Free Software Foundation … … 12 12 # PARTICULAR PURPOSE. 13 13 14 # Do all the work for Automake. -*- Autoconf -*- 15 16 # This macro actually does too much some checks are only needed if 17 # your package does certain things. But this isn't really a big deal. 18 19 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 14 # -*- Autoconf -*- 15 # Copyright (C) 2002, 2003 Free Software Foundation, Inc. 16 # Generated from amversion.in; do not edit by hand. 17 18 # This program is free software; you can redistribute it and/or modify 19 # it under the terms of the GNU General Public License as published by 20 # the Free Software Foundation; either version 2, or (at your option) 21 # any later version. 22 23 # This program is distributed in the hope that it will be useful, 24 # but WITHOUT ANY WARRANTY; without even the implied warranty of 25 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 # GNU General Public License for more details. 27 28 # You should have received a copy of the GNU General Public License 29 # along with this program; if not, write to the Free Software 30 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 31 32 # AM_AUTOMAKE_VERSION(VERSION) 33 # ---------------------------- 34 # Automake X.Y traces this macro to ensure aclocal.m4 has been 35 # generated from the m4 files accompanying Automake X.Y. 36 AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) 37 38 # AM_SET_CURRENT_AUTOMAKE_VERSION 39 # ------------------------------- 40 # Call AM_AUTOMAKE_VERSION so it can be traced. 41 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. 42 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 43 [AM_AUTOMAKE_VERSION([1.8.5])]) 44 45 # AM_AUX_DIR_EXPAND 46 47 # Copyright (C) 2001, 2003 Free Software Foundation, Inc. 48 49 # This program is free software; you can redistribute it and/or modify 50 # it under the terms of the GNU General Public License as published by 51 # the Free Software Foundation; either version 2, or (at your option) 52 # any later version. 53 54 # This program is distributed in the hope that it will be useful, 55 # but WITHOUT ANY WARRANTY; without even the implied warranty of 56 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 57 # GNU General Public License for more details. 58 59 # You should have received a copy of the GNU General Public License 60 # along with this program; if not, write to the Free Software 61 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 62 # 02111-1307, USA. 63 64 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets 65 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to 66 # `$srcdir', `$srcdir/..', or `$srcdir/../..'. 67 # 68 # Of course, Automake must honor this variable whenever it calls a 69 # tool from the auxiliary directory. The problem is that $srcdir (and 70 # therefore $ac_aux_dir as well) can be either absolute or relative, 71 # depending on how configure is run. This is pretty annoying, since 72 # it makes $ac_aux_dir quite unusable in subdirectories: in the top 73 # source directory, any form will work fine, but in subdirectories a 74 # relative path needs to be adjusted first. 75 # 76 # $ac_aux_dir/missing 77 # fails when called from a subdirectory if $ac_aux_dir is relative 78 # $top_srcdir/$ac_aux_dir/missing 79 # fails if $ac_aux_dir is absolute, 80 # fails when called from a subdirectory in a VPATH build with 81 # a relative $ac_aux_dir 82 # 83 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir 84 # are both prefixed by $srcdir. In an in-source build this is usually 85 # harmless because $srcdir is `.', but things will broke when you 86 # start a VPATH build or use an absolute $srcdir. 87 # 88 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, 89 # iff we strip the leading $srcdir from $ac_aux_dir. That would be: 90 # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` 91 # and then we would define $MISSING as 92 # MISSING="\${SHELL} $am_aux_dir/missing" 93 # This will work as long as MISSING is not called from configure, because 94 # unfortunately $(top_srcdir) has no meaning in configure. 95 # However there are other variables, like CC, which are often used in 96 # configure, and could therefore not use this "fixed" $ac_aux_dir. 97 # 98 # Another solution, used here, is to always expand $ac_aux_dir to an 99 # absolute PATH. The drawback is that using absolute paths prevent a 100 # configured tree to be moved without reconfiguration. 101 102 AC_DEFUN([AM_AUX_DIR_EXPAND], 103 [dnl Rely on autoconf to set up CDPATH properly. 104 AC_PREREQ([2.50])dnl 105 # expand $ac_aux_dir to an absolute path 106 am_aux_dir=`cd $ac_aux_dir && pwd` 107 ]) 108 109 # AM_CONDITIONAL -*- Autoconf -*- 110 111 # Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. 112 113 # This program is free software; you can redistribute it and/or modify 114 # it under the terms of the GNU General Public License as published by 115 # the Free Software Foundation; either version 2, or (at your option) 116 # any later version. 117 118 # This program is distributed in the hope that it will be useful, 119 # but WITHOUT ANY WARRANTY; without even the implied warranty of 120 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 121 # GNU General Public License for more details. 122 123 # You should have received a copy of the GNU General Public License 124 # along with this program; if not, write to the Free Software 125 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 126 # 02111-1307, USA. 127 128 # serial 6 129 130 # AM_CONDITIONAL(NAME, SHELL-CONDITION) 131 # ------------------------------------- 132 # Define a conditional. 133 AC_DEFUN([AM_CONDITIONAL], 134 [AC_PREREQ(2.52)dnl 135 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], 136 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl 137 AC_SUBST([$1_TRUE]) 138 AC_SUBST([$1_FALSE]) 139 if $2; then 140 $1_TRUE= 141 $1_FALSE='#' 142 else 143 $1_TRUE='#' 144 $1_FALSE= 145 fi 146 AC_CONFIG_COMMANDS_PRE( 147 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then 148 AC_MSG_ERROR([conditional "$1" was never defined. 149 Usually this means the macro was only invoked conditionally.]) 150 fi])]) 151 152 # serial 7 -*- Autoconf -*- 153 154 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 20 155 # Free Software Foundation, Inc. 21 156 … … 35 170 # 02111-1307, USA. 36 171 37 # serial 838 172 39 173 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be … … 44 178 45 179 46 AC_PREREQ([2.54]) 47 48 # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow 49 # the ones we care about. 50 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl 180 181 # _AM_DEPENDENCIES(NAME) 182 # ---------------------- 183 # See how the compiler implements dependency checking. 184 # NAME is "CC", "CXX", "GCJ", or "OBJC". 185 # We try a few techniques and use that to set a single cache variable. 186 # 187 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was 188 # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular 189 # dependency, and given that the user is not expected to run this macro, 190 # just rely on AC_PROG_CC. 191 AC_DEFUN([_AM_DEPENDENCIES], 192 [AC_REQUIRE([AM_SET_DEPDIR])dnl 193 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl 194 AC_REQUIRE([AM_MAKE_INCLUDE])dnl 195 AC_REQUIRE([AM_DEP_TRACK])dnl 196 197 ifelse([$1], CC, [depcc="$CC" am_compiler_list=], 198 [$1], CXX, [depcc="$CXX" am_compiler_list=], 199 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], 200 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], 201 [depcc="$$1" am_compiler_list=]) 202 203 AC_CACHE_CHECK([dependency style of $depcc], 204 [am_cv_$1_dependencies_compiler_type], 205 [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then 206 # We make a subdir and do the tests there. Otherwise we can end up 207 # making bogus files that we don't know about and never remove. For 208 # instance it was reported that on HP-UX the gcc test will end up 209 # making a dummy file named `D' -- because `-MD' means `put the output 210 # in D'. 211 mkdir conftest.dir 212 # Copy depcomp to subdir because otherwise we won't find it if we're 213 # using a relative directory. 214 cp "$am_depcomp" conftest.dir 215 cd conftest.dir 216 # We will build objects and dependencies in a subdirectory because 217 # it helps to detect inapplicable dependency modes. For instance 218 # both Tru64's cc and ICC support -MD to output dependencies as a 219 # side effect of compilation, but ICC will put the dependencies in 220 # the current directory while Tru64 will put them in the object 221 # directory. 222 mkdir sub 223 224 am_cv_$1_dependencies_compiler_type=none 225 if test "$am_compiler_list" = ""; then 226 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` 227 fi 228 for depmode in $am_compiler_list; do 229 # Setup a source with many dependencies, because some compilers 230 # like to wrap large dependency lists on column 80 (with \), and 231 # we should not choose a depcomp mode which is confused by this. 232 # 233 # We need to recreate these files for each test, as the compiler may 234 # overwrite some of them when testing with obscure command lines. 235 # This happens at least with the AIX C compiler. 236 : > sub/conftest.c 237 for i in 1 2 3 4 5 6; do 238 echo '#include "conftst'$i'.h"' >> sub/conftest.c 239 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 240 # Solaris 8's {/usr,}/bin/sh. 241 touch sub/conftst$i.h 242 done 243 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf 244 245 case $depmode in 246 nosideeffect) 247 # after this tag, mechanisms are not by side-effect, so they'll 248 # only be used when explicitly requested 249 if test "x$enable_dependency_tracking" = xyes; then 250 continue 251 else 252 break 253 fi 254 ;; 255 none) break ;; 256 esac 257 # We check with `-c' and `-o' for the sake of the "dashmstdout" 258 # mode. It turns out that the SunPro C++ compiler does not properly 259 # handle `-M -o', and we need to detect this. 260 if depmode=$depmode \ 261 source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ 262 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ 263 $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ 264 >/dev/null 2>conftest.err && 265 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && 266 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && 267 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 268 # icc doesn't choke on unknown options, it will just issue warnings 269 # or remarks (even with -Werror). So we grep stderr for any message 270 # that says an option was ignored or not supported. 271 # When given -MP, icc 7.0 and 7.1 complain thusly: 272 # icc: Command line warning: ignoring option '-M'; no argument required 273 # The diagnosis changed in icc 8.0: 274 # icc: Command line remark: option '-MP' not supported 275 if (grep 'ignoring option' conftest.err || 276 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 277 am_cv_$1_dependencies_compiler_type=$depmode 278 break 279 fi 280 fi 281 done 282 283 cd .. 284 rm -rf conftest.dir 285 else 286 am_cv_$1_dependencies_compiler_type=none 287 fi 288 ]) 289 AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) 290 AM_CONDITIONAL([am__fastdep$1], [ 291 test "x$enable_dependency_tracking" != xno \ 292 && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) 293 ]) 294 295 296 # AM_SET_DEPDIR 297 # ------------- 298 # Choose a directory name for dependency files. 299 # This macro is AC_REQUIREd in _AM_DEPENDENCIES 300 AC_DEFUN([AM_SET_DEPDIR], 301 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl 302 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl 303 ]) 304 305 306 # AM_DEP_TRACK 307 # ------------ 308 AC_DEFUN([AM_DEP_TRACK], 309 [AC_ARG_ENABLE(dependency-tracking, 310 [ --disable-dependency-tracking speeds up one-time build 311 --enable-dependency-tracking do not reject slow dependency extractors]) 312 if test "x$enable_dependency_tracking" != xno; then 313 am_depcomp="$ac_aux_dir/depcomp" 314 AMDEPBACKSLASH='\' 315 fi 316 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) 317 AC_SUBST([AMDEPBACKSLASH]) 318 ]) 319 320 # Generate code to set up dependency tracking. -*- Autoconf -*- 321 322 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. 323 324 # This program is free software; you can redistribute it and/or modify 325 # it under the terms of the GNU General Public License as published by 326 # the Free Software Foundation; either version 2, or (at your option) 327 # any later version. 328 329 # This program is distributed in the hope that it will be useful, 330 # but WITHOUT ANY WARRANTY; without even the implied warranty of 331 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 332 # GNU General Public License for more details. 333 334 # You should have received a copy of the GNU General Public License 335 # along with this program; if not, write to the Free Software 336 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 337 # 02111-1307, USA. 338 339 #serial 2 340 341 # _AM_OUTPUT_DEPENDENCY_COMMANDS 342 # ------------------------------ 343 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], 344 [for mf in $CONFIG_FILES; do 345 # Strip MF so we end up with the name of the file. 346 mf=`echo "$mf" | sed -e 's/:.*$//'` 347 # Check whether this is an Automake generated Makefile or not. 348 # We used to match only the files named `Makefile.in', but 349 # some people rename them; so instead we look at the file content. 350 # Grep'ing the first line is not enough: some people post-process 351 # each Makefile.in and add a new line on top of each file to say so. 352 # So let's grep whole file. 353 if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then 354 dirpart=`AS_DIRNAME("$mf")` 355 else 356 continue 357 fi 358 grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue 359 # Extract the definition of DEP_FILES from the Makefile without 360 # running `make'. 361 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 362 test -z "$DEPDIR" && continue 363 # When using ansi2knr, U may be empty or an underscore; expand it 364 U=`sed -n 's/^U = //p' < "$mf"` 365 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" 366 # We invoke sed twice because it is the simplest approach to 367 # changing $(DEPDIR) to its actual value in the expansion. 368 for file in `sed -n ' 369 /^DEP_FILES = .*\\\\$/ { 370 s/^DEP_FILES = // 371 :loop 372 s/\\\\$// 373 p 374 n 375 /\\\\$/ b loop 376 p 377 } 378 /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ 379 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do 380 # Make sure the directory exists. 381 test -f "$dirpart/$file" && continue 382 fdir=`AS_DIRNAME(["$file"])` 383 AS_MKDIR_P([$dirpart/$fdir]) 384 # echo "creating $dirpart/$file" 385 echo '# dummy' > "$dirpart/$file" 386 done 387 done 388 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS 389 390 391 # AM_OUTPUT_DEPENDENCY_COMMANDS 392 # ----------------------------- 393 # This macro should only be invoked once -- use via AC_REQUIRE. 394 # 395 # This code is only required when automatic dependency tracking 396 # is enabled. FIXME. This creates each `.P' file that we will 397 # need in order to bootstrap the dependency handling code. 398 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], 399 [AC_CONFIG_COMMANDS([depfiles], 400 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], 401 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) 402 ]) 403 404 # Do all the work for Automake. -*- Autoconf -*- 405 406 # This macro actually does too much some checks are only needed if 407 # your package does certain things. But this isn't really a big deal. 408 409 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 410 # Free Software Foundation, Inc. 411 412 # This program is free software; you can redistribute it and/or modify 413 # it under the terms of the GNU General Public License as published by 414 # the Free Software Foundation; either version 2, or (at your option) 415 # any later version. 416 417 # This program is distributed in the hope that it will be useful, 418 # but WITHOUT ANY WARRANTY; without even the implied warranty of 419 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 420 # GNU General Public License for more details. 421 422 # You should have received a copy of the GNU General Public License 423 # along with this program; if not, write to the Free Software 424 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 425 # 02111-1307, USA. 426 427 # serial 11 51 428 52 429 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) … … 62 439 # release and drop the old call support. 63 440 AC_DEFUN([AM_INIT_AUTOMAKE], 64 [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl 65 AC_REQUIRE([AC_PROG_INSTALL])dnl 441 [AC_PREREQ([2.58])dnl 442 dnl Autoconf wants to disallow AM_ names. We explicitly allow 443 dnl the ones we care about. 444 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl 445 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl 446 AC_REQUIRE([AC_PROG_INSTALL])dnl 66 447 # test to see if srcdir already configured 67 448 if test "`cd $srcdir && pwd`" != "`pwd`" && … … 87 468 AC_SUBST([VERSION], [$2])], 88 469 [_AM_SET_OPTIONS([$1])dnl 89 AC_SUBST([PACKAGE], [ AC_PACKAGE_TARNAME])dnl90 AC_SUBST([VERSION], [ AC_PACKAGE_VERSION])])dnl470 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl 471 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl 91 472 92 473 _AM_IF_OPTION([no-define],, … … 105 486 AM_PROG_INSTALL_SH 106 487 AM_PROG_INSTALL_STRIP 488 AC_REQUIRE([AM_PROG_MKDIR_P])dnl 107 489 # We need awk for the "check" target. The system "awk" is bad on 108 490 # some platforms. 109 491 AC_REQUIRE([AC_PROG_AWK])dnl 110 492 AC_REQUIRE([AC_PROG_MAKE_SET])dnl 493 AC_REQUIRE([AM_SET_LEADING_DOT])dnl 111 494 112 495 _AM_IF_OPTION([no-dependencies],, … … 131 514 # our stamp files there. 132 515 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], 133 [_am_stamp_count=`expr ${_am_stamp_count-0} + 1` 516 [# Compute $1's index in $config_headers. 517 _am_stamp_count=1 518 for _am_header in $config_headers :; do 519 case $_am_header in 520 $1 | $1:* ) 521 break ;; 522 * ) 523 _am_stamp_count=`expr $_am_stamp_count + 1` ;; 524 esac 525 done 134 526 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) 135 527 136 # Copyright 2002 Free Software Foundation, Inc. 137 138 # This program is free software; you can redistribute it and/or modify 139 # it under the terms of the GNU General Public License as published by 140 # the Free Software Foundation; either version 2, or (at your option) 141 # any later version. 142 143 # This program is distributed in the hope that it will be useful, 144 # but WITHOUT ANY WARRANTY; without even the implied warranty of 145 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 146 # GNU General Public License for more details. 147 148 # You should have received a copy of the GNU General Public License 149 # along with this program; if not, write to the Free Software 150 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 151 152 # AM_AUTOMAKE_VERSION(VERSION) 153 # ---------------------------- 154 # Automake X.Y traces this macro to ensure aclocal.m4 has been 155 # generated from the m4 files accompanying Automake X.Y. 156 AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) 157 158 # AM_SET_CURRENT_AUTOMAKE_VERSION 159 # ------------------------------- 160 # Call AM_AUTOMAKE_VERSION so it can be traced. 161 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. 162 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 163 [AM_AUTOMAKE_VERSION([1.7.1])]) 528 # AM_PROG_INSTALL_SH 529 # ------------------ 530 # Define $install_sh. 531 532 # Copyright (C) 2001, 2003 Free Software Foundation, Inc. 533 534 # This program is free software; you can redistribute it and/or modify 535 # it under the terms of the GNU General Public License as published by 536 # the Free Software Foundation; either version 2, or (at your option) 537 # any later version. 538 539 # This program is distributed in the hope that it will be useful, 540 # but WITHOUT ANY WARRANTY; without even the implied warranty of 541 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 542 # GNU General Public License for more details. 543 544 # You should have received a copy of the GNU General Public License 545 # along with this program; if not, write to the Free Software 546 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 547 # 02111-1307, USA. 548 549 AC_DEFUN([AM_PROG_INSTALL_SH], 550 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl 551 install_sh=${install_sh-"$am_aux_dir/install-sh"} 552 AC_SUBST(install_sh)]) 553 554 # -*- Autoconf -*- 555 # Copyright (C) 2003 Free Software Foundation, Inc. 556 557 # This program is free software; you can redistribute it and/or modify 558 # it under the terms of the GNU General Public License as published by 559 # the Free Software Foundation; either version 2, or (at your option) 560 # any later version. 561 562 # This program is distributed in the hope that it will be useful, 563 # but WITHOUT ANY WARRANTY; without even the implied warranty of 564 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 565 # GNU General Public License for more details. 566 567 # You should have received a copy of the GNU General Public License 568 # along with this program; if not, write to the Free Software 569 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 570 # 02111-1307, USA. 571 572 # serial 1 573 574 # Check whether the underlying file-system supports filenames 575 # with a leading dot. For instance MS-DOS doesn't. 576 AC_DEFUN([AM_SET_LEADING_DOT], 577 [rm -rf .tst 2>/dev/null 578 mkdir .tst 2>/dev/null 579 if test -d .tst; then 580 am__leading_dot=. 581 else 582 am__leading_dot=_ 583 fi 584 rmdir .tst 2>/dev/null 585 AC_SUBST([am__leading_dot])]) 586 587 # Check to see how 'make' treats includes. -*- Autoconf -*- 588 589 # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. 590 591 # This program is free software; you can redistribute it and/or modify 592 # it under the terms of the GNU General Public License as published by 593 # the Free Software Foundation; either version 2, or (at your option) 594 # any later version. 595 596 # This program is distributed in the hope that it will be useful, 597 # but WITHOUT ANY WARRANTY; without even the implied warranty of 598 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 599 # GNU General Public License for more details. 600 601 # You should have received a copy of the GNU General Public License 602 # along with this program; if not, write to the Free Software 603 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 604 # 02111-1307, USA. 605 606 # serial 2 607 608 # AM_MAKE_INCLUDE() 609 # ----------------- 610 # Check to see how make treats includes. 611 AC_DEFUN([AM_MAKE_INCLUDE], 612 [am_make=${MAKE-make} 613 cat > confinc << 'END' 614 am__doit: 615 @echo done 616 .PHONY: am__doit 617 END 618 # If we don't find an include directive, just comment out the code. 619 AC_MSG_CHECKING([for style of include used by $am_make]) 620 am__include="#" 621 am__quote= 622 _am_result=none 623 # First try GNU make style include. 624 echo "include confinc" > confmf 625 # We grep out `Entering directory' and `Leaving directory' 626 # messages which can occur if `w' ends up in MAKEFLAGS. 627 # In particular we don't look at `^make:' because GNU make might 628 # be invoked under some other name (usually "gmake"), in which 629 # case it prints its new name instead of `make'. 630 if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then 631 am__include=include 632 am__quote= 633 _am_result=GNU 634 fi 635 # Now try BSD make style include. 636 if test "$am__include" = "#"; then 637 echo '.include "confinc"' > confmf 638 if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then 639 am__include=.include 640 am__quote="\"" 641 _am_result=BSD 642 fi 643 fi 644 AC_SUBST([am__include]) 645 AC_SUBST([am__quote]) 646 AC_MSG_RESULT([$_am_result]) 647 rm -f confinc confmf 648 ]) 649 650 # -*- Autoconf -*- 651 652 653 # Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. 654 655 # This program is free software; you can redistribute it and/or modify 656 # it under the terms of the GNU General Public License as published by 657 # the Free Software Foundation; either version 2, or (at your option) 658 # any later version. 659 660 # This program is distributed in the hope that it will be useful, 661 # but WITHOUT ANY WARRANTY; without even the implied warranty of 662 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 663 # GNU General Public License for more details. 664 665 # You should have received a copy of the GNU General Public License 666 # along with this program; if not, write to the Free Software 667 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 668 # 02111-1307, USA. 669 670 # serial 3 671 672 # AM_MISSING_PROG(NAME, PROGRAM) 673 # ------------------------------ 674 AC_DEFUN([AM_MISSING_PROG], 675 [AC_REQUIRE([AM_MISSING_HAS_RUN]) 676 $1=${$1-"${am_missing_run}$2"} 677 AC_SUBST($1)]) 678 679 680 # AM_MISSING_HAS_RUN 681 # ------------------ 682 # Define MISSING if not defined so far and test if it supports --run. 683 # If it does, set am_missing_run to use it, otherwise, to nothing. 684 AC_DEFUN([AM_MISSING_HAS_RUN], 685 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl 686 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" 687 # Use eval to expand $SHELL 688 if eval "$MISSING --run true"; then 689 am_missing_run="$MISSING --run " 690 else 691 am_missing_run= 692 AC_MSG_WARN([`missing' script is too old or missing]) 693 fi 694 ]) 695 696 # AM_PROG_MKDIR_P 697 # --------------- 698 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. 699 700 # Copyright (C) 2003, 2004 Free Software Foundation, Inc. 701 702 # This program is free software; you can redistribute it and/or modify 703 # it under the terms of the GNU General Public License as published by 704 # the Free Software Foundation; either version 2, or (at your option) 705 # any later version. 706 707 # This program is distributed in the hope that it will be useful, 708 # but WITHOUT ANY WARRANTY; without even the implied warranty of 709 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 710 # GNU General Public License for more details. 711 712 # You should have received a copy of the GNU General Public License 713 # along with this program; if not, write to the Free Software 714 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 715 # 02111-1307, USA. 716 717 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories 718 # created by `make install' are always world readable, even if the 719 # installer happens to have an overly restrictive umask (e.g. 077). 720 # This was a mistake. There are at least two reasons why we must not 721 # use `-m 0755': 722 # - it causes special bits like SGID to be ignored, 723 # - it may be too restrictive (some setups expect 775 directories). 724 # 725 # Do not use -m 0755 and let people choose whatever they expect by 726 # setting umask. 727 # 728 # We cannot accept any implementation of `mkdir' that recognizes `-p'. 729 # Some implementations (such as Solaris 8's) are not thread-safe: if a 730 # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' 731 # concurrently, both version can detect that a/ is missing, but only 732 # one can create it and the other will error out. Consequently we 733 # restrict ourselves to GNU make (using the --version option ensures 734 # this.) 735 AC_DEFUN([AM_PROG_MKDIR_P], 736 [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then 737 # Keeping the `.' argument allows $(mkdir_p) to be used without 738 # argument. Indeed, we sometimes output rules like 739 # $(mkdir_p) $(somedir) 740 # where $(somedir) is conditionally defined. 741 # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more 742 # expensive solution, as it forces Make to start a sub-shell.) 743 mkdir_p='mkdir -p -- .' 744 else 745 # On NextStep and OpenStep, the `mkdir' command does not 746 # recognize any option. It will interpret all options as 747 # directories to create, and then abort because `.' already 748 # exists. 749 for d in ./-p ./--version; 750 do 751 test -d $d && rmdir $d 752 done 753 # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. 754 if test -f "$ac_aux_dir/mkinstalldirs"; then 755 mkdir_p='$(mkinstalldirs)' 756 else 757 mkdir_p='$(install_sh) -d' 758 fi 759 fi 760 AC_SUBST([mkdir_p])]) 164 761 165 762 # Helper functions for option handling. -*- Autoconf -*- 166 763 167 # Copyright 2001, 2002Free Software Foundation, Inc.764 # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. 168 765 169 766 # This program is free software; you can redistribute it and/or modify … … 211 808 # 212 809 213 # Copyright 1996, 1997, 2000, 2001Free Software Foundation, Inc.810 # Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. 214 811 215 812 # This program is free software; you can redistribute it and/or modify … … 271 868 AC_MSG_RESULT(yes)]) 272 869 273 # -*- Autoconf -*-274 275 276 # Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.277 278 # This program is free software; you can redistribute it and/or modify279 # it under the terms of the GNU General Public License as published by280 # the Free Software Foundation; either version 2, or (at your option)281 # any later version.282 283 # This program is distributed in the hope that it will be useful,284 # but WITHOUT ANY WARRANTY; without even the implied warranty of285 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the286 # GNU General Public License for more details.287 288 # You should have received a copy of the GNU General Public License289 # along with this program; if not, write to the Free Software290 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA291 # 02111-1307, USA.292 293 # serial 3294 295 # AM_MISSING_PROG(NAME, PROGRAM)296 # ------------------------------297 AC_DEFUN([AM_MISSING_PROG],298 [AC_REQUIRE([AM_MISSING_HAS_RUN])299 $1=${$1-"${am_missing_run}$2"}300 AC_SUBST($1)])301 302 303 # AM_MISSING_HAS_RUN304 # ------------------305 # Define MISSING if not defined so far and test if it supports --run.306 # If it does, set am_missing_run to use it, otherwise, to nothing.307 AC_DEFUN([AM_MISSING_HAS_RUN],308 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl309 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"310 # Use eval to expand $SHELL311 if eval "$MISSING --run true"; then312 am_missing_run="$MISSING --run "313 else314 am_missing_run=315 AC_MSG_WARN([`missing' script is too old or missing])316 fi317 ])318 319 # AM_AUX_DIR_EXPAND320 321 # Copyright 2001 Free Software Foundation, Inc.322 323 # This program is free software; you can redistribute it and/or modify324 # it under the terms of the GNU General Public License as published by325 # the Free Software Foundation; either version 2, or (at your option)326 # any later version.327 328 # This program is distributed in the hope that it will be useful,329 # but WITHOUT ANY WARRANTY; without even the implied warranty of330 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the331 # GNU General Public License for more details.332 333 # You should have received a copy of the GNU General Public License334 # along with this program; if not, write to the Free Software335 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA336 # 02111-1307, USA.337 338 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets339 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to340 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.341 #342 # Of course, Automake must honor this variable whenever it calls a343 # tool from the auxiliary directory. The problem is that $srcdir (and344 # therefore $ac_aux_dir as well) can be either absolute or relative,345 # depending on how configure is run. This is pretty annoying, since346 # it makes $ac_aux_dir quite unusable in subdirectories: in the top347 # source directory, any form will work fine, but in subdirectories a348 # relative path needs to be adjusted first.349 #350 # $ac_aux_dir/missing351 # fails when called from a subdirectory if $ac_aux_dir is relative352 # $top_srcdir/$ac_aux_dir/missing353 # fails if $ac_aux_dir is absolute,354 # fails when called from a subdirectory in a VPATH build with355 # a relative $ac_aux_dir356 #357 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir358 # are both prefixed by $srcdir. In an in-source build this is usually359 # harmless because $srcdir is `.', but things will broke when you360 # start a VPATH build or use an absolute $srcdir.361 #362 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,363 # iff we strip the leading $srcdir from $ac_aux_dir. That would be:364 # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`365 # and then we would define $MISSING as366 # MISSING="\${SHELL} $am_aux_dir/missing"367 # This will work as long as MISSING is not called from configure, because368 # unfortunately $(top_srcdir) has no meaning in configure.369 # However there are other variables, like CC, which are often used in370 # configure, and could therefore not use this "fixed" $ac_aux_dir.371 #372 # Another solution, used here, is to always expand $ac_aux_dir to an373 # absolute PATH. The drawback is that using absolute paths prevent a374 # configured tree to be moved without reconfiguration.375 376 # Rely on autoconf to set up CDPATH properly.377 AC_PREREQ([2.50])378 379 AC_DEFUN([AM_AUX_DIR_EXPAND], [380 # expand $ac_aux_dir to an absolute path381 am_aux_dir=`cd $ac_aux_dir && pwd`382 ])383 384 # AM_PROG_INSTALL_SH385 # ------------------386 # Define $install_sh.387 388 # Copyright 2001 Free Software Foundation, Inc.389 390 # This program is free software; you can redistribute it and/or modify391 # it under the terms of the GNU General Public License as published by392 # the Free Software Foundation; either version 2, or (at your option)393 # any later version.394 395 # This program is distributed in the hope that it will be useful,396 # but WITHOUT ANY WARRANTY; without even the implied warranty of397 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the398 # GNU General Public License for more details.399 400 # You should have received a copy of the GNU General Public License401 # along with this program; if not, write to the Free Software402 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA403 # 02111-1307, USA.404 405 AC_DEFUN([AM_PROG_INSTALL_SH],406 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl407 install_sh=${install_sh-"$am_aux_dir/install-sh"}408 AC_SUBST(install_sh)])409 410 870 # AM_PROG_INSTALL_STRIP 411 871 412 # Copyright 2001Free Software Foundation, Inc.872 # Copyright (C) 2001, 2003 Free Software Foundation, Inc. 413 873 414 874 # This program is free software; you can redistribute it and/or modify … … 447 907 AC_SUBST([INSTALL_STRIP_PROGRAM])]) 448 908 449 # serial 4 -*- Autoconf -*-450 451 # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.452 453 # This program is free software; you can redistribute it and/or modify454 # it under the terms of the GNU General Public License as published by455 # the Free Software Foundation; either version 2, or (at your option)456 # any later version.457 458 # This program is distributed in the hope that it will be useful,459 # but WITHOUT ANY WARRANTY; without even the implied warranty of460 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the461 # GNU General Public License for more details.462 463 # You should have received a copy of the GNU General Public License464 # along with this program; if not, write to the Free Software465 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA466 # 02111-1307, USA.467 468 469 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be470 # written in clear, in which case automake, when reading aclocal.m4,471 # will think it sees a *use*, and therefore will trigger all it's472 # C support machinery. Also note that it means that autoscan, seeing473 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...474 475 476 477 # _AM_DEPENDENCIES(NAME)478 # ----------------------479 # See how the compiler implements dependency checking.480 # NAME is "CC", "CXX", "GCJ", or "OBJC".481 # We try a few techniques and use that to set a single cache variable.482 #483 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was484 # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular485 # dependency, and given that the user is not expected to run this macro,486 # just rely on AC_PROG_CC.487 AC_DEFUN([_AM_DEPENDENCIES],488 [AC_REQUIRE([AM_SET_DEPDIR])dnl489 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl490 AC_REQUIRE([AM_MAKE_INCLUDE])dnl491 AC_REQUIRE([AM_DEP_TRACK])dnl492 493 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],494 [$1], CXX, [depcc="$CXX" am_compiler_list=],495 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],496 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],497 [depcc="$$1" am_compiler_list=])498 499 AC_CACHE_CHECK([dependency style of $depcc],500 [am_cv_$1_dependencies_compiler_type],501 [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then502 # We make a subdir and do the tests there. Otherwise we can end up503 # making bogus files that we don't know about and never remove. For504 # instance it was reported that on HP-UX the gcc test will end up505 # making a dummy file named `D' -- because `-MD' means `put the output506 # in D'.507 mkdir conftest.dir508 # Copy depcomp to subdir because otherwise we won't find it if we're509 # using a relative directory.510 cp "$am_depcomp" conftest.dir511 cd conftest.dir512 513 am_cv_$1_dependencies_compiler_type=none514 if test "$am_compiler_list" = ""; then515 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`516 fi517 for depmode in $am_compiler_list; do518 # We need to recreate these files for each test, as the compiler may519 # overwrite some of them when testing with obscure command lines.520 # This happens at least with the AIX C compiler.521 echo '#include "conftest.h"' > conftest.c522 echo 'int i;' > conftest.h523 echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf524 525 case $depmode in526 nosideeffect)527 # after this tag, mechanisms are not by side-effect, so they'll528 # only be used when explicitly requested529 if test "x$enable_dependency_tracking" = xyes; then530 continue531 else532 break533 fi534 ;;535 none) break ;;536 esac537 # We check with `-c' and `-o' for the sake of the "dashmstdout"538 # mode. It turns out that the SunPro C++ compiler does not properly539 # handle `-M -o', and we need to detect this.540 if depmode=$depmode \541 source=conftest.c object=conftest.o \542 depfile=conftest.Po tmpdepfile=conftest.TPo \543 $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&544 grep conftest.h conftest.Po > /dev/null 2>&1 &&545 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then546 am_cv_$1_dependencies_compiler_type=$depmode547 break548 fi549 done550 551 cd ..552 rm -rf conftest.dir553 else554 am_cv_$1_dependencies_compiler_type=none555 fi556 ])557 AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])558 AM_CONDITIONAL([am__fastdep$1], [559 test "x$enable_dependency_tracking" != xno \560 && test "$am_cv_$1_dependencies_compiler_type" = gcc3])561 ])562 563 564 # AM_SET_DEPDIR565 # -------------566 # Choose a directory name for dependency files.567 # This macro is AC_REQUIREd in _AM_DEPENDENCIES568 AC_DEFUN([AM_SET_DEPDIR],569 [rm -f .deps 2>/dev/null570 mkdir .deps 2>/dev/null571 if test -d .deps; then572 DEPDIR=.deps573 else574 # MS-DOS does not allow filenames that begin with a dot.575 DEPDIR=_deps576 fi577 rmdir .deps 2>/dev/null578 AC_SUBST([DEPDIR])579 ])580 581 582 # AM_DEP_TRACK583 # ------------584 AC_DEFUN([AM_DEP_TRACK],585 [AC_ARG_ENABLE(dependency-tracking,586 [ --disable-dependency-tracking Speeds up one-time builds587 --enable-dependency-tracking Do not reject slow dependency extractors])588 if test "x$enable_dependency_tracking" != xno; then589 am_depcomp="$ac_aux_dir/depcomp"590 AMDEPBACKSLASH='\'591 fi592 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])593 AC_SUBST([AMDEPBACKSLASH])594 ])595 596 # Generate code to set up dependency tracking. -*- Autoconf -*-597 598 # Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.599 600 # This program is free software; you can redistribute it and/or modify601 # it under the terms of the GNU General Public License as published by602 # the Free Software Foundation; either version 2, or (at your option)603 # any later version.604 605 # This program is distributed in the hope that it will be useful,606 # but WITHOUT ANY WARRANTY; without even the implied warranty of607 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the608 # GNU General Public License for more details.609 610 # You should have received a copy of the GNU General Public License611 # along with this program; if not, write to the Free Software612 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA613 # 02111-1307, USA.614 615 #serial 2616 617 # _AM_OUTPUT_DEPENDENCY_COMMANDS618 # ------------------------------619 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],620 [for mf in $CONFIG_FILES; do621 # Strip MF so we end up with the name of the file.622 mf=`echo "$mf" | sed -e 's/:.*$//'`623 # Check whether this is an Automake generated Makefile or not.624 # We used to match only the files named `Makefile.in', but625 # some people rename them; so instead we look at the file content.626 # Grep'ing the first line is not enough: some people post-process627 # each Makefile.in and add a new line on top of each file to say so.628 # So let's grep whole file.629 if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then630 dirpart=`AS_DIRNAME("$mf")`631 else632 continue633 fi634 grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue635 # Extract the definition of DEP_FILES from the Makefile without636 # running `make'.637 DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`638 test -z "$DEPDIR" && continue639 # When using ansi2knr, U may be empty or an underscore; expand it640 U=`sed -n -e '/^U = / s///p' < "$mf"`641 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"642 # We invoke sed twice because it is the simplest approach to643 # changing $(DEPDIR) to its actual value in the expansion.644 for file in `sed -n -e '645 /^DEP_FILES = .*\\\\$/ {646 s/^DEP_FILES = //647 :loop648 s/\\\\$//649 p650 n651 /\\\\$/ b loop652 p653 }654 /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \655 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do656 # Make sure the directory exists.657 test -f "$dirpart/$file" && continue658 fdir=`AS_DIRNAME(["$file"])`659 AS_MKDIR_P([$dirpart/$fdir])660 # echo "creating $dirpart/$file"661 echo '# dummy' > "$dirpart/$file"662 done663 done664 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS665 666 667 # AM_OUTPUT_DEPENDENCY_COMMANDS668 # -----------------------------669 # This macro should only be invoked once -- use via AC_REQUIRE.670 #671 # This code is only required when automatic dependency tracking672 # is enabled. FIXME. This creates each `.P' file that we will673 # need in order to bootstrap the dependency handling code.674 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],675 [AC_CONFIG_COMMANDS([depfiles],676 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],677 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])678 ])679 680 # Check to see how 'make' treats includes. -*- Autoconf -*-681 682 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.683 684 # This program is free software; you can redistribute it and/or modify685 # it under the terms of the GNU General Public License as published by686 # the Free Software Foundation; either version 2, or (at your option)687 # any later version.688 689 # This program is distributed in the hope that it will be useful,690 # but WITHOUT ANY WARRANTY; without even the implied warranty of691 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the692 # GNU General Public License for more details.693 694 # You should have received a copy of the GNU General Public License695 # along with this program; if not, write to the Free Software696 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA697 # 02111-1307, USA.698 699 # serial 2700 701 # AM_MAKE_INCLUDE()702 # -----------------703 # Check to see how make treats includes.704 AC_DEFUN([AM_MAKE_INCLUDE],705 [am_make=${MAKE-make}706 cat > confinc << 'END'707 doit:708 @echo done709 END710 # If we don't find an include directive, just comment out the code.711 AC_MSG_CHECKING([for style of include used by $am_make])712 am__include="#"713 am__quote=714 _am_result=none715 # First try GNU make style include.716 echo "include confinc" > confmf717 # We grep out `Entering directory' and `Leaving directory'718 # messages which can occur if `w' ends up in MAKEFLAGS.719 # In particular we don't look at `^make:' because GNU make might720 # be invoked under some other name (usually "gmake"), in which721 # case it prints its new name instead of `make'.722 if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then723 am__include=include724 am__quote=725 _am_result=GNU726 fi727 # Now try BSD make style include.728 if test "$am__include" = "#"; then729 echo '.include "confinc"' > confmf730 if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then731 am__include=.include732 am__quote="\""733 _am_result=BSD734 fi735 fi736 AC_SUBST(am__include)737 AC_SUBST(am__quote)738 AC_MSG_RESULT($_am_result)739 rm -f confinc confmf740 ])741 742 # AM_CONDITIONAL -*- Autoconf -*-743 744 # Copyright 1997, 2000, 2001 Free Software Foundation, Inc.745 746 # This program is free software; you can redistribute it and/or modify747 # it under the terms of the GNU General Public License as published by748 # the Free Software Foundation; either version 2, or (at your option)749 # any later version.750 751 # This program is distributed in the hope that it will be useful,752 # but WITHOUT ANY WARRANTY; without even the implied warranty of753 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the754 # GNU General Public License for more details.755 756 # You should have received a copy of the GNU General Public License757 # along with this program; if not, write to the Free Software758 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA759 # 02111-1307, USA.760 761 # serial 5762 763 AC_PREREQ(2.52)764 765 # AM_CONDITIONAL(NAME, SHELL-CONDITION)766 # -------------------------------------767 # Define a conditional.768 AC_DEFUN([AM_CONDITIONAL],769 [ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],770 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl771 AC_SUBST([$1_TRUE])772 AC_SUBST([$1_FALSE])773 if $2; then774 $1_TRUE=775 $1_FALSE='#'776 else777 $1_TRUE='#'778 $1_FALSE=779 fi780 AC_CONFIG_COMMANDS_PRE(781 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then782 AC_MSG_ERROR([conditional "$1" was never defined.783 Usually this means the macro was only invoked conditionally.])784 fi])])785 -
orxonox/branches/buerli/config.h.in
r2190 r2707 3 3 /* Define to 1 if you have the `bzero' function. */ 4 4 #undef HAVE_BZERO 5 6 /* Define to 1 if you have the <GL/glut.h> header file. */7 #undef HAVE_GL_GLUT_H8 5 9 6 /* Define to 1 if you have the <GL/glu.h> header file. */ -
orxonox/branches/buerli/configure
r2190 r2707 312 312 #endif" 313 313 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 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 AWK SET_MAKE am__leading_dot MSBITFIELDS 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 EGREPLIBOBJS LTLIBOBJS'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 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 MSBITFIELDS LIBOBJS LTLIBOBJS' 315 315 ac_subst_files='' 316 316 … … 858 858 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 859 859 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 860 --disable-dependency-tracking Speeds up one-time builds861 --enable-dependency-tracking Do not reject slow dependency extractors860 --disable-dependency-tracking speeds up one-time build 861 --enable-dependency-tracking do not reject slow dependency extractors 862 862 863 863 Some influential environment variables: … … 1321 1321 1322 1322 1323 am__api_version="1. 7"1323 am__api_version="1.8" 1324 1324 ac_aux_dir= 1325 1325 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do … … 1484 1484 rm conftest.sed 1485 1485 1486 1487 1486 # expand $ac_aux_dir to an absolute path 1488 1487 am_aux_dir=`cd $ac_aux_dir && pwd` … … 1496 1495 { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 1497 1496 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} 1497 fi 1498 1499 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then 1500 # Keeping the `.' argument allows $(mkdir_p) to be used without 1501 # argument. Indeed, we sometimes output rules like 1502 # $(mkdir_p) $(somedir) 1503 # where $(somedir) is conditionally defined. 1504 # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more 1505 # expensive solution, as it forces Make to start a sub-shell.) 1506 mkdir_p='mkdir -p -- .' 1507 else 1508 # On NextStep and OpenStep, the `mkdir' command does not 1509 # recognize any option. It will interpret all options as 1510 # directories to create, and then abort because `.' already 1511 # exists. 1512 for d in ./-p ./--version; 1513 do 1514 test -d $d && rmdir $d 1515 done 1516 # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. 1517 if test -f "$ac_aux_dir/mkinstalldirs"; then 1518 mkdir_p='$(mkinstalldirs)' 1519 else 1520 mkdir_p='$(install_sh) -d' 1521 fi 1498 1522 fi 1499 1523 … … 1576 1600 rmdir .tst 2>/dev/null 1577 1601 1578 1602 # test to see if srcdir already configured 1579 1603 if test "`cd $srcdir && pwd`" != "`pwd`" && 1580 1604 test -f $srcdir/config.status; then … … 1723 1747 1724 1748 1749 1725 1750 ac_config_headers="$ac_config_headers config.h" 1726 1727 1728 echo "$as_me:$LINENO: checking for mingw" >&51729 echo $ECHO_N "checking for mingw... $ECHO_C" >&61730 case `uname` in1731 *MINGW*)1732 mingw="yes"1733 MSBITFIELDS="-mms-bitfields"1734 MWINDOWS="-mwindows"1735 ;;1736 *)1737 mingw="no"1738 ;;1739 esac1740 echo "$as_me:$LINENO: result: $mingw" >&51741 echo "${ECHO_T}$mingw" >&61742 1751 1743 1752 … … 2406 2415 for i in 1 2 3 4 5 6; do 2407 2416 echo '#include "conftst'$i'.h"' >> sub/conftest.c 2408 : > sub/conftst$i.h 2417 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 2418 # Solaris 8's {/usr,}/bin/sh. 2419 touch sub/conftst$i.h 2409 2420 done 2410 2421 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf … … 2434 2445 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 2435 2446 # icc doesn't choke on unknown options, it will just issue warnings 2436 # (even with -Werror). So we grep stderr for any message 2437 # that says an option was ignored. 2438 if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else 2447 # or remarks (even with -Werror). So we grep stderr for any message 2448 # that says an option was ignored or not supported. 2449 # When given -MP, icc 7.0 and 7.1 complain thusly: 2450 # icc: Command line warning: ignoring option '-M'; no argument required 2451 # The diagnosis changed in icc 8.0: 2452 # icc: Command line remark: option '-MP' not supported 2453 if (grep 'ignoring option' conftest.err || 2454 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 2439 2455 am_cv_CXX_dependencies_compiler_type=$depmode 2440 2456 break … … 3237 3253 for i in 1 2 3 4 5 6; do 3238 3254 echo '#include "conftst'$i'.h"' >> sub/conftest.c 3239 : > sub/conftst$i.h 3255 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 3256 # Solaris 8's {/usr,}/bin/sh. 3257 touch sub/conftst$i.h 3240 3258 done 3241 3259 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf … … 3265 3283 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 3266 3284 # icc doesn't choke on unknown options, it will just issue warnings 3267 # (even with -Werror). So we grep stderr for any message 3268 # that says an option was ignored. 3269 if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else 3285 # or remarks (even with -Werror). So we grep stderr for any message 3286 # that says an option was ignored or not supported. 3287 # When given -MP, icc 7.0 and 7.1 complain thusly: 3288 # icc: Command line warning: ignoring option '-M'; no argument required 3289 # The diagnosis changed in icc 8.0: 3290 # icc: Command line remark: option '-MP' not supported 3291 if (grep 'ignoring option' conftest.err || 3292 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 3270 3293 am_cv_CC_dependencies_compiler_type=$depmode 3271 3294 break … … 3299 3322 3300 3323 3301 # Checks for libraries. 3302 3303 # cheking for libGL 3324 3325 # checking gl header (has to be here because of a Linux error) 3304 3326 3305 3327 ac_ext=c … … 3946 3968 3947 3969 3948 # checking for Unix GL 3949 echo "$as_me:$LINENO: checking for main in -lGL" >&5 3950 echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 3951 if test "${ac_cv_lib_GL_main+set}" = set; then 3970 3971 3972 ### CHECKING FOR SYSTEM ### 3973 3974 echo "$as_me:$LINENO: checking for System" >&5 3975 echo $ECHO_N "checking for System... $ECHO_C" >&6 3976 case `uname` in 3977 ### WINDOWS ### 3978 *MINGW*) 3979 echo "mingw-WINDOWS detected" 3980 3981 mingw="yes" 3982 MSBITFIELDS="-mms-bitfields" 3983 MWINDOWS="-mwindows" 3984 3985 # checking gl header 3986 #done before loop 3987 3988 # checking for Windows openGl library 3989 echo "$as_me:$LINENO: checking for main in -lopengl32" >&5 3990 echo $ECHO_N "checking for main in -lopengl32... $ECHO_C" >&6 3991 if test "${ac_cv_lib_opengl32_main+set}" = set; then 3952 3992 echo $ECHO_N "(cached) $ECHO_C" >&6 3953 3993 else 3954 3994 ac_check_lib_save_LIBS=$LIBS 3955 LIBS="-l GL$LIBS"3995 LIBS="-lopengl32 $LIBS" 3956 3996 cat >conftest.$ac_ext <<_ACEOF 3957 3997 /* confdefs.h. */ … … 3992 4032 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3993 4033 (exit $ac_status); }; }; then 3994 ac_cv_lib_GL_main=yes3995 else3996 echo "$as_me: failed program was:" >&53997 sed 's/^/| /' conftest.$ac_ext >&53998 3999 ac_cv_lib_GL_main=no4000 fi4001 rm -f conftest.err conftest.$ac_objext \4002 conftest$ac_exeext conftest.$ac_ext4003 LIBS=$ac_check_lib_save_LIBS4004 fi4005 echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&54006 echo "${ECHO_T}$ac_cv_lib_GL_main" >&64007 if test $ac_cv_lib_GL_main = yes; then4008 FOUND_GL=yes4009 fi4010 4011 if test "$FOUND_GL" = "yes" ; then4012 LIBS="$LIBS -lGL"4013 # checking for Windows openGl library4014 else4015 echo "We did not find the Linux opengl Library. Checking for Windows Library"4016 echo "$as_me:$LINENO: checking for main in -lopengl32" >&54017 echo $ECHO_N "checking for main in -lopengl32... $ECHO_C" >&64018 if test "${ac_cv_lib_opengl32_main+set}" = set; then4019 echo $ECHO_N "(cached) $ECHO_C" >&64020 else4021 ac_check_lib_save_LIBS=$LIBS4022 LIBS="-lopengl32 $LIBS"4023 cat >conftest.$ac_ext <<_ACEOF4024 /* confdefs.h. */4025 _ACEOF4026 cat confdefs.h >>conftest.$ac_ext4027 cat >>conftest.$ac_ext <<_ACEOF4028 /* end confdefs.h. */4029 4030 4031 int4032 main ()4033 {4034 main ();4035 ;4036 return 0;4037 }4038 _ACEOF4039 rm -f conftest.$ac_objext conftest$ac_exeext4040 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&54041 (eval $ac_link) 2>conftest.er14042 ac_status=$?4043 grep -v '^ *+' conftest.er1 >conftest.err4044 rm -f conftest.er14045 cat conftest.err >&54046 echo "$as_me:$LINENO: \$? = $ac_status" >&54047 (exit $ac_status); } &&4048 { ac_try='test -z "$ac_c_werror_flag"4049 || test ! -s conftest.err'4050 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&54051 (eval $ac_try) 2>&54052 ac_status=$?4053 echo "$as_me:$LINENO: \$? = $ac_status" >&54054 (exit $ac_status); }; } &&4055 { ac_try='test -s conftest$ac_exeext'4056 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&54057 (eval $ac_try) 2>&54058 ac_status=$?4059 echo "$as_me:$LINENO: \$? = $ac_status" >&54060 (exit $ac_status); }; }; then4061 4034 ac_cv_lib_opengl32_main=yes 4062 4035 else … … 4080 4053 if test "$FOUND_opengl32" = "yes" ; then 4081 4054 LIBS="$LIBS -lopengl32" 4082 4083 4055 else 4084 4056 echo "------------------" … … 4088 4060 exit -1 4089 4061 fi 4090 fi 4091 4092 # cheking for libGLU 4062 4063 # cheking for GLU-header 4093 4064 4094 4065 for ac_header in GL/glu.h … … 4246 4217 4247 4218 4248 echo "$as_me:$LINENO: checking for gluProject in -lGLU" >&5 4249 echo $ECHO_N "checking for gluProject in -lGLU... $ECHO_C" >&6 4250 if test "${ac_cv_lib_GLU_gluProject+set}" = set; then 4251 echo $ECHO_N "(cached) $ECHO_C" >&6 4252 else 4253 ac_check_lib_save_LIBS=$LIBS 4254 LIBS="-lGLU $LIBS" 4255 cat >conftest.$ac_ext <<_ACEOF 4256 /* confdefs.h. */ 4257 _ACEOF 4258 cat confdefs.h >>conftest.$ac_ext 4259 cat >>conftest.$ac_ext <<_ACEOF 4260 /* end confdefs.h. */ 4261 4262 /* Override any gcc2 internal prototype to avoid an error. */ 4263 #ifdef __cplusplus 4264 extern "C" 4265 #endif 4266 /* We use char because int might match the return type of a gcc2 4267 builtin and then its argument prototype would still apply. */ 4268 char gluProject (); 4269 int 4270 main () 4271 { 4272 gluProject (); 4273 ; 4274 return 0; 4275 } 4276 _ACEOF 4277 rm -f conftest.$ac_objext conftest$ac_exeext 4278 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4279 (eval $ac_link) 2>conftest.er1 4280 ac_status=$? 4281 grep -v '^ *+' conftest.er1 >conftest.err 4282 rm -f conftest.er1 4283 cat conftest.err >&5 4284 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4285 (exit $ac_status); } && 4286 { ac_try='test -z "$ac_c_werror_flag" 4287 || test ! -s conftest.err' 4288 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4289 (eval $ac_try) 2>&5 4290 ac_status=$? 4291 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4292 (exit $ac_status); }; } && 4293 { ac_try='test -s conftest$ac_exeext' 4294 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4295 (eval $ac_try) 2>&5 4296 ac_status=$? 4297 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4298 (exit $ac_status); }; }; then 4299 ac_cv_lib_GLU_gluProject=yes 4300 else 4301 echo "$as_me: failed program was:" >&5 4302 sed 's/^/| /' conftest.$ac_ext >&5 4303 4304 ac_cv_lib_GLU_gluProject=no 4305 fi 4306 rm -f conftest.err conftest.$ac_objext \ 4307 conftest$ac_exeext conftest.$ac_ext 4308 LIBS=$ac_check_lib_save_LIBS 4309 fi 4310 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluProject" >&5 4311 echo "${ECHO_T}$ac_cv_lib_GLU_gluProject" >&6 4312 if test $ac_cv_lib_GLU_gluProject = yes; then 4313 FOUND_GLU=yes 4314 fi 4315 4316 if test "$FOUND_GLU" = "yes" ; then 4317 LIBS="$LIBS -lGLU" 4318 # checking for Windows GLU32 library 4319 else 4320 echo "We did not find the Linux GLU Library. Checking for Windows Library" 4219 # checking for libGLU 4321 4220 echo "$as_me:$LINENO: checking for main in -lglu32" >&5 4322 4221 echo $ECHO_N "checking for main in -lglu32... $ECHO_C" >&6 … … 4383 4282 if test "$FOUND_glu32" = "yes" ; then 4384 4283 LIBS="$LIBS -lGLU32" 4385 4386 else 4284 else 4387 4285 echo "------------------" 4388 4286 echo "GLU library not found." … … 4391 4289 exit -1 4392 4290 fi 4393 fi 4394 4395 # FIXME: Replace `main' with a function in `-lOSMesa': 4396 4397 echo "$as_me:$LINENO: checking for main in -lOSMesa" >&5 4398 echo $ECHO_N "checking for main in -lOSMesa... $ECHO_C" >&6 4399 if test "${ac_cv_lib_OSMesa_main+set}" = set; then 4291 4292 4293 # checking for mingw32 4294 echo "$as_me:$LINENO: checking for main in -lmingw32" >&5 4295 echo $ECHO_N "checking for main in -lmingw32... $ECHO_C" >&6 4296 if test "${ac_cv_lib_mingw32_main+set}" = set; then 4400 4297 echo $ECHO_N "(cached) $ECHO_C" >&6 4401 4298 else 4402 4299 ac_check_lib_save_LIBS=$LIBS 4403 LIBS="-l OSMesa$LIBS"4300 LIBS="-lmingw32 $LIBS" 4404 4301 cat >conftest.$ac_ext <<_ACEOF 4405 4302 /* confdefs.h. */ … … 4440 4337 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4441 4338 (exit $ac_status); }; }; then 4442 ac_cv_lib_ OSMesa_main=yes4339 ac_cv_lib_mingw32_main=yes 4443 4340 else 4444 4341 echo "$as_me: failed program was:" >&5 4445 4342 sed 's/^/| /' conftest.$ac_ext >&5 4446 4343 4447 ac_cv_lib_ OSMesa_main=no4344 ac_cv_lib_mingw32_main=no 4448 4345 fi 4449 4346 rm -f conftest.err conftest.$ac_objext \ … … 4451 4348 LIBS=$ac_check_lib_save_LIBS 4452 4349 fi 4453 echo "$as_me:$LINENO: result: $ac_cv_lib_OSMesa_main" >&5 4454 echo "${ECHO_T}$ac_cv_lib_OSMesa_main" >&6 4455 if test $ac_cv_lib_OSMesa_main = yes; then 4456 cat >>confdefs.h <<_ACEOF 4457 #define HAVE_LIBOSMESA 1 4458 _ACEOF 4459 4460 LIBS="-lOSMesa $LIBS" 4461 4462 fi 4463 4464 # FIXME: Replace `main' with a function in `-lX11': 4465 4466 echo "$as_me:$LINENO: checking for main in -lX11" >&5 4467 echo $ECHO_N "checking for main in -lX11... $ECHO_C" >&6 4468 if test "${ac_cv_lib_X11_main+set}" = set; then 4469 echo $ECHO_N "(cached) $ECHO_C" >&6 4470 else 4471 ac_check_lib_save_LIBS=$LIBS 4472 LIBS="-lX11 $LIBS" 4473 cat >conftest.$ac_ext <<_ACEOF 4474 /* confdefs.h. */ 4475 _ACEOF 4476 cat confdefs.h >>conftest.$ac_ext 4477 cat >>conftest.$ac_ext <<_ACEOF 4478 /* end confdefs.h. */ 4479 4480 4481 int 4482 main () 4483 { 4484 main (); 4485 ; 4486 return 0; 4487 } 4488 _ACEOF 4489 rm -f conftest.$ac_objext conftest$ac_exeext 4490 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4491 (eval $ac_link) 2>conftest.er1 4492 ac_status=$? 4493 grep -v '^ *+' conftest.er1 >conftest.err 4494 rm -f conftest.er1 4495 cat conftest.err >&5 4496 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4497 (exit $ac_status); } && 4498 { ac_try='test -z "$ac_c_werror_flag" 4499 || test ! -s conftest.err' 4500 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4501 (eval $ac_try) 2>&5 4502 ac_status=$? 4503 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4504 (exit $ac_status); }; } && 4505 { ac_try='test -s conftest$ac_exeext' 4506 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4507 (eval $ac_try) 2>&5 4508 ac_status=$? 4509 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4510 (exit $ac_status); }; }; then 4511 ac_cv_lib_X11_main=yes 4512 else 4513 echo "$as_me: failed program was:" >&5 4514 sed 's/^/| /' conftest.$ac_ext >&5 4515 4516 ac_cv_lib_X11_main=no 4517 fi 4518 rm -f conftest.err conftest.$ac_objext \ 4519 conftest$ac_exeext conftest.$ac_ext 4520 LIBS=$ac_check_lib_save_LIBS 4521 fi 4522 echo "$as_me:$LINENO: result: $ac_cv_lib_X11_main" >&5 4523 echo "${ECHO_T}$ac_cv_lib_X11_main" >&6 4524 if test $ac_cv_lib_X11_main = yes; then 4525 cat >>confdefs.h <<_ACEOF 4526 #define HAVE_LIBX11 1 4527 _ACEOF 4528 4529 LIBS="-lX11 $LIBS" 4530 4531 fi 4532 4533 # FIXME: Replace `main' with a function in `-lXt': 4534 4535 echo "$as_me:$LINENO: checking for main in -lXt" >&5 4536 echo $ECHO_N "checking for main in -lXt... $ECHO_C" >&6 4537 if test "${ac_cv_lib_Xt_main+set}" = set; then 4538 echo $ECHO_N "(cached) $ECHO_C" >&6 4539 else 4540 ac_check_lib_save_LIBS=$LIBS 4541 LIBS="-lXt $LIBS" 4542 cat >conftest.$ac_ext <<_ACEOF 4543 /* confdefs.h. */ 4544 _ACEOF 4545 cat confdefs.h >>conftest.$ac_ext 4546 cat >>conftest.$ac_ext <<_ACEOF 4547 /* end confdefs.h. */ 4548 4549 4550 int 4551 main () 4552 { 4553 main (); 4554 ; 4555 return 0; 4556 } 4557 _ACEOF 4558 rm -f conftest.$ac_objext conftest$ac_exeext 4559 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4560 (eval $ac_link) 2>conftest.er1 4561 ac_status=$? 4562 grep -v '^ *+' conftest.er1 >conftest.err 4563 rm -f conftest.er1 4564 cat conftest.err >&5 4565 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4566 (exit $ac_status); } && 4567 { ac_try='test -z "$ac_c_werror_flag" 4568 || test ! -s conftest.err' 4569 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4570 (eval $ac_try) 2>&5 4571 ac_status=$? 4572 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4573 (exit $ac_status); }; } && 4574 { ac_try='test -s conftest$ac_exeext' 4575 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4576 (eval $ac_try) 2>&5 4577 ac_status=$? 4578 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4579 (exit $ac_status); }; }; then 4580 ac_cv_lib_Xt_main=yes 4581 else 4582 echo "$as_me: failed program was:" >&5 4583 sed 's/^/| /' conftest.$ac_ext >&5 4584 4585 ac_cv_lib_Xt_main=no 4586 fi 4587 rm -f conftest.err conftest.$ac_objext \ 4588 conftest$ac_exeext conftest.$ac_ext 4589 LIBS=$ac_check_lib_save_LIBS 4590 fi 4591 echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_main" >&5 4592 echo "${ECHO_T}$ac_cv_lib_Xt_main" >&6 4593 if test $ac_cv_lib_Xt_main = yes; then 4594 cat >>confdefs.h <<_ACEOF 4595 #define HAVE_LIBXT 1 4596 _ACEOF 4597 4598 LIBS="-lXt $LIBS" 4599 4600 fi 4601 4602 4603 # cheking for libglut32 4604 4605 for ac_header in GL/glut.h 4350 echo "$as_me:$LINENO: result: $ac_cv_lib_mingw32_main" >&5 4351 echo "${ECHO_T}$ac_cv_lib_mingw32_main" >&6 4352 if test $ac_cv_lib_mingw32_main = yes; then 4353 FOUND_mingw32=yes 4354 fi 4355 4356 if test $FOUND_mingw32 = "yes"; then 4357 LIBS="$LIBS -lmingw32" 4358 fi 4359 # checking for SDL-headers 4360 4361 for ac_header in SDL/SDL.h 4606 4362 do 4607 4363 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 4749 4505 4750 4506 else 4751 { { echo "$as_me:$LINENO: error: cannot find glutheaders" >&54752 echo "$as_me: error: cannot find glutheaders" >&2;}4507 { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5 4508 echo "$as_me: error: cannot find SDL headers" >&2;} 4753 4509 { (exit 1); exit 1; }; } 4754 4510 fi … … 4756 4512 done 4757 4513 4758 echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 4759 echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 4760 if test "${ac_cv_lib_glut_glutInit+set}" = set; then 4514 4515 #checking for libSDL 4516 echo "$as_me:$LINENO: checking for main in -lsdlmain" >&5 4517 echo $ECHO_N "checking for main in -lsdlmain... $ECHO_C" >&6 4518 if test "${ac_cv_lib_sdlmain_main+set}" = set; then 4761 4519 echo $ECHO_N "(cached) $ECHO_C" >&6 4762 4520 else 4763 4521 ac_check_lib_save_LIBS=$LIBS 4764 LIBS="-lglut $LIBS" 4765 cat >conftest.$ac_ext <<_ACEOF 4766 /* confdefs.h. */ 4767 _ACEOF 4768 cat confdefs.h >>conftest.$ac_ext 4769 cat >>conftest.$ac_ext <<_ACEOF 4770 /* end confdefs.h. */ 4771 4772 /* Override any gcc2 internal prototype to avoid an error. */ 4773 #ifdef __cplusplus 4774 extern "C" 4775 #endif 4776 /* We use char because int might match the return type of a gcc2 4777 builtin and then its argument prototype would still apply. */ 4778 char glutInit (); 4779 int 4780 main () 4781 { 4782 glutInit (); 4783 ; 4784 return 0; 4785 } 4786 _ACEOF 4787 rm -f conftest.$ac_objext conftest$ac_exeext 4788 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4789 (eval $ac_link) 2>conftest.er1 4790 ac_status=$? 4791 grep -v '^ *+' conftest.er1 >conftest.err 4792 rm -f conftest.er1 4793 cat conftest.err >&5 4794 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4795 (exit $ac_status); } && 4796 { ac_try='test -z "$ac_c_werror_flag" 4797 || test ! -s conftest.err' 4798 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4799 (eval $ac_try) 2>&5 4800 ac_status=$? 4801 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4802 (exit $ac_status); }; } && 4803 { ac_try='test -s conftest$ac_exeext' 4804 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4805 (eval $ac_try) 2>&5 4806 ac_status=$? 4807 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4808 (exit $ac_status); }; }; then 4809 ac_cv_lib_glut_glutInit=yes 4810 else 4811 echo "$as_me: failed program was:" >&5 4812 sed 's/^/| /' conftest.$ac_ext >&5 4813 4814 ac_cv_lib_glut_glutInit=no 4815 fi 4816 rm -f conftest.err conftest.$ac_objext \ 4817 conftest$ac_exeext conftest.$ac_ext 4818 LIBS=$ac_check_lib_save_LIBS 4819 fi 4820 echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutInit" >&5 4821 echo "${ECHO_T}$ac_cv_lib_glut_glutInit" >&6 4822 if test $ac_cv_lib_glut_glutInit = yes; then 4823 FOUND_glut=yes 4824 fi 4825 4826 if test "$FOUND_glut" = "yes" ; then 4827 LIBS="$LIBS -lglut" 4828 # checking for Windows glut32 library 4829 else 4830 echo "We did not find the Linux glut Library. Checking for Windows Library" 4831 echo "$as_me:$LINENO: checking for main in -lglut32" >&5 4832 echo $ECHO_N "checking for main in -lglut32... $ECHO_C" >&6 4833 if test "${ac_cv_lib_glut32_main+set}" = set; then 4834 echo $ECHO_N "(cached) $ECHO_C" >&6 4835 else 4836 ac_check_lib_save_LIBS=$LIBS 4837 LIBS="-lglut32 $LIBS" 4522 LIBS="-lsdlmain $LIBS" 4838 4523 cat >conftest.$ac_ext <<_ACEOF 4839 4524 /* confdefs.h. */ … … 4874 4559 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4875 4560 (exit $ac_status); }; }; then 4876 ac_cv_lib_ glut32_main=yes4561 ac_cv_lib_sdlmain_main=yes 4877 4562 else 4878 4563 echo "$as_me: failed program was:" >&5 4879 4564 sed 's/^/| /' conftest.$ac_ext >&5 4880 4565 4881 ac_cv_lib_ glut32_main=no4566 ac_cv_lib_sdlmain_main=no 4882 4567 fi 4883 4568 rm -f conftest.err conftest.$ac_objext \ … … 4885 4570 LIBS=$ac_check_lib_save_LIBS 4886 4571 fi 4887 echo "$as_me:$LINENO: result: $ac_cv_lib_ glut32_main" >&54888 echo "${ECHO_T}$ac_cv_lib_ glut32_main" >&64889 if test $ac_cv_lib_ glut32_main = yes; then4890 FOUND_ glut32=yes4891 fi 4892 4893 if test "$FOUND_ glut32" = "yes" ; then4894 LIBS="$LIBS -l glut32"4572 echo "$as_me:$LINENO: result: $ac_cv_lib_sdlmain_main" >&5 4573 echo "${ECHO_T}$ac_cv_lib_sdlmain_main" >&6 4574 if test $ac_cv_lib_sdlmain_main = yes; then 4575 FOUND_sdlmain=yes 4576 fi 4577 4578 if test "$FOUND_sdlmain" = "yes" ; then 4579 LIBS="$LIBS -lsdlmain" 4895 4580 else 4896 4581 echo "------------------" 4897 echo " glutlibrary not found."4898 echo "please install the glut library, which can be found at http://www.xmission.com/~nate/glut.html"4582 echo "SDL library not found." 4583 echo "please install the SDL library, which can be found at http://www.libsdl.org" 4899 4584 echo "------------------" 4900 exit -14585 exit 1 4901 4586 fi 4902 fi 4903 4904 ## mingw CHECK 4905 if test $mingw = yes ; then 4906 echo "$as_me:$LINENO: checking for main in -lmingw32" >&5 4907 echo $ECHO_N "checking for main in -lmingw32... $ECHO_C" >&6 4908 if test "${ac_cv_lib_mingw32_main+set}" = set; then 4587 echo "$as_me:$LINENO: checking for main in -lsdl" >&5 4588 echo $ECHO_N "checking for main in -lsdl... $ECHO_C" >&6 4589 if test "${ac_cv_lib_sdl_main+set}" = set; then 4909 4590 echo $ECHO_N "(cached) $ECHO_C" >&6 4910 4591 else 4911 4592 ac_check_lib_save_LIBS=$LIBS 4912 LIBS="-l mingw32$LIBS"4593 LIBS="-lsdl $LIBS" 4913 4594 cat >conftest.$ac_ext <<_ACEOF 4914 4595 /* confdefs.h. */ … … 4949 4630 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4950 4631 (exit $ac_status); }; }; then 4951 ac_cv_lib_ mingw32_main=yes4632 ac_cv_lib_sdl_main=yes 4952 4633 else 4953 4634 echo "$as_me: failed program was:" >&5 4954 4635 sed 's/^/| /' conftest.$ac_ext >&5 4955 4636 4956 ac_cv_lib_ mingw32_main=no4637 ac_cv_lib_sdl_main=no 4957 4638 fi 4958 4639 rm -f conftest.err conftest.$ac_objext \ … … 4960 4641 LIBS=$ac_check_lib_save_LIBS 4961 4642 fi 4962 echo "$as_me:$LINENO: result: $ac_cv_lib_mingw32_main" >&5 4963 echo "${ECHO_T}$ac_cv_lib_mingw32_main" >&6 4964 if test $ac_cv_lib_mingw32_main = yes; then 4965 FOUND_mingw32=yes 4966 fi 4967 4968 if test $FOUND_mingw32 = "yes"; then 4969 LIBS="$LIBS -lmingw32" 4970 fi 4971 fi 4972 4973 ## SDL CHECK 4974 4975 #checking for SDL libs 4976 4977 for ac_header in SDL/SDL.h 4643 echo "$as_me:$LINENO: result: $ac_cv_lib_sdl_main" >&5 4644 echo "${ECHO_T}$ac_cv_lib_sdl_main" >&6 4645 if test $ac_cv_lib_sdl_main = yes; then 4646 FOUND_sdl=yes 4647 fi 4648 4649 if test "$FOUND_sdl" = "yes" ; then 4650 LIBS="$LIBS -lsdl" 4651 else 4652 echo "------------------" 4653 echo "SDL library not found." 4654 echo "please install the SDL library, which can be found at http://www.libsdl.org" 4655 echo "------------------" 4656 exit -1 4657 fi 4658 4659 ;; 4660 4661 ### LINUX ### 4662 *Linux*) 4663 echo "Linux detected" 4664 4665 Linux="yes" 4666 4667 # checking gl header 4668 #has been done befor linux-check 4669 4670 # checking for Unix GL 4671 echo "$as_me:$LINENO: checking for main in -lGL" >&5 4672 echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 4673 if test "${ac_cv_lib_GL_main+set}" = set; then 4674 echo $ECHO_N "(cached) $ECHO_C" >&6 4675 else 4676 ac_check_lib_save_LIBS=$LIBS 4677 LIBS="-lGL $LIBS" 4678 cat >conftest.$ac_ext <<_ACEOF 4679 /* confdefs.h. */ 4680 _ACEOF 4681 cat confdefs.h >>conftest.$ac_ext 4682 cat >>conftest.$ac_ext <<_ACEOF 4683 /* end confdefs.h. */ 4684 4685 4686 int 4687 main () 4688 { 4689 main (); 4690 ; 4691 return 0; 4692 } 4693 _ACEOF 4694 rm -f conftest.$ac_objext conftest$ac_exeext 4695 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4696 (eval $ac_link) 2>conftest.er1 4697 ac_status=$? 4698 grep -v '^ *+' conftest.er1 >conftest.err 4699 rm -f conftest.er1 4700 cat conftest.err >&5 4701 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4702 (exit $ac_status); } && 4703 { ac_try='test -z "$ac_c_werror_flag" 4704 || test ! -s conftest.err' 4705 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4706 (eval $ac_try) 2>&5 4707 ac_status=$? 4708 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4709 (exit $ac_status); }; } && 4710 { ac_try='test -s conftest$ac_exeext' 4711 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4712 (eval $ac_try) 2>&5 4713 ac_status=$? 4714 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4715 (exit $ac_status); }; }; then 4716 ac_cv_lib_GL_main=yes 4717 else 4718 echo "$as_me: failed program was:" >&5 4719 sed 's/^/| /' conftest.$ac_ext >&5 4720 4721 ac_cv_lib_GL_main=no 4722 fi 4723 rm -f conftest.err conftest.$ac_objext \ 4724 conftest$ac_exeext conftest.$ac_ext 4725 LIBS=$ac_check_lib_save_LIBS 4726 fi 4727 echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 4728 echo "${ECHO_T}$ac_cv_lib_GL_main" >&6 4729 if test $ac_cv_lib_GL_main = yes; then 4730 FOUND_GL=yes 4731 fi 4732 4733 if test "$FOUND_GL" = "yes" ; then 4734 LIBS="$LIBS -lGL" 4735 else 4736 echo "------------------" 4737 echo "opengl not found." 4738 echo "please install the opengl package which can be found at http://www.opengl.org" 4739 echo "------------------" 4740 exit -1 4741 fi 4742 4743 # cheking for GLU-header 4744 4745 for ac_header in GL/glu.h 4978 4746 do 4979 4747 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 5121 4889 5122 4890 else 4891 { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5 4892 echo "$as_me: error: cannot find opengl headers" >&2;} 4893 { (exit 1); exit 1; }; } 4894 fi 4895 4896 done 4897 4898 4899 echo "$as_me:$LINENO: checking for gluProject in -lGLU" >&5 4900 echo $ECHO_N "checking for gluProject in -lGLU... $ECHO_C" >&6 4901 if test "${ac_cv_lib_GLU_gluProject+set}" = set; then 4902 echo $ECHO_N "(cached) $ECHO_C" >&6 4903 else 4904 ac_check_lib_save_LIBS=$LIBS 4905 LIBS="-lGLU $LIBS" 4906 cat >conftest.$ac_ext <<_ACEOF 4907 /* confdefs.h. */ 4908 _ACEOF 4909 cat confdefs.h >>conftest.$ac_ext 4910 cat >>conftest.$ac_ext <<_ACEOF 4911 /* end confdefs.h. */ 4912 4913 /* Override any gcc2 internal prototype to avoid an error. */ 4914 #ifdef __cplusplus 4915 extern "C" 4916 #endif 4917 /* We use char because int might match the return type of a gcc2 4918 builtin and then its argument prototype would still apply. */ 4919 char gluProject (); 4920 int 4921 main () 4922 { 4923 gluProject (); 4924 ; 4925 return 0; 4926 } 4927 _ACEOF 4928 rm -f conftest.$ac_objext conftest$ac_exeext 4929 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4930 (eval $ac_link) 2>conftest.er1 4931 ac_status=$? 4932 grep -v '^ *+' conftest.er1 >conftest.err 4933 rm -f conftest.er1 4934 cat conftest.err >&5 4935 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4936 (exit $ac_status); } && 4937 { ac_try='test -z "$ac_c_werror_flag" 4938 || test ! -s conftest.err' 4939 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4940 (eval $ac_try) 2>&5 4941 ac_status=$? 4942 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4943 (exit $ac_status); }; } && 4944 { ac_try='test -s conftest$ac_exeext' 4945 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4946 (eval $ac_try) 2>&5 4947 ac_status=$? 4948 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4949 (exit $ac_status); }; }; then 4950 ac_cv_lib_GLU_gluProject=yes 4951 else 4952 echo "$as_me: failed program was:" >&5 4953 sed 's/^/| /' conftest.$ac_ext >&5 4954 4955 ac_cv_lib_GLU_gluProject=no 4956 fi 4957 rm -f conftest.err conftest.$ac_objext \ 4958 conftest$ac_exeext conftest.$ac_ext 4959 LIBS=$ac_check_lib_save_LIBS 4960 fi 4961 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluProject" >&5 4962 echo "${ECHO_T}$ac_cv_lib_GLU_gluProject" >&6 4963 if test $ac_cv_lib_GLU_gluProject = yes; then 4964 FOUND_GLU=yes 4965 fi 4966 4967 if test "$FOUND_GLU" = "yes" ; then 4968 LIBS="$LIBS -lGLU" 4969 else 4970 echo "------------------" 4971 echo "GLU library not found." 4972 echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org" 4973 echo "------------------" 4974 exit -1 4975 fi 4976 4977 # checking for SDL-headers 4978 4979 for ac_header in SDL/SDL.h 4980 do 4981 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 4982 if eval "test \"\${$as_ac_Header+set}\" = set"; then 4983 echo "$as_me:$LINENO: checking for $ac_header" >&5 4984 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 4985 if eval "test \"\${$as_ac_Header+set}\" = set"; then 4986 echo $ECHO_N "(cached) $ECHO_C" >&6 4987 fi 4988 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 4989 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 4990 else 4991 # Is the header compilable? 4992 echo "$as_me:$LINENO: checking $ac_header usability" >&5 4993 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 4994 cat >conftest.$ac_ext <<_ACEOF 4995 /* confdefs.h. */ 4996 _ACEOF 4997 cat confdefs.h >>conftest.$ac_ext 4998 cat >>conftest.$ac_ext <<_ACEOF 4999 /* end confdefs.h. */ 5000 $ac_includes_default 5001 #include <$ac_header> 5002 _ACEOF 5003 rm -f conftest.$ac_objext 5004 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 5005 (eval $ac_compile) 2>conftest.er1 5006 ac_status=$? 5007 grep -v '^ *+' conftest.er1 >conftest.err 5008 rm -f conftest.er1 5009 cat conftest.err >&5 5010 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5011 (exit $ac_status); } && 5012 { ac_try='test -z "$ac_c_werror_flag" 5013 || test ! -s conftest.err' 5014 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5015 (eval $ac_try) 2>&5 5016 ac_status=$? 5017 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5018 (exit $ac_status); }; } && 5019 { ac_try='test -s conftest.$ac_objext' 5020 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5021 (eval $ac_try) 2>&5 5022 ac_status=$? 5023 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5024 (exit $ac_status); }; }; then 5025 ac_header_compiler=yes 5026 else 5027 echo "$as_me: failed program was:" >&5 5028 sed 's/^/| /' conftest.$ac_ext >&5 5029 5030 ac_header_compiler=no 5031 fi 5032 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 5033 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 5034 echo "${ECHO_T}$ac_header_compiler" >&6 5035 5036 # Is the header present? 5037 echo "$as_me:$LINENO: checking $ac_header presence" >&5 5038 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 5039 cat >conftest.$ac_ext <<_ACEOF 5040 /* confdefs.h. */ 5041 _ACEOF 5042 cat confdefs.h >>conftest.$ac_ext 5043 cat >>conftest.$ac_ext <<_ACEOF 5044 /* end confdefs.h. */ 5045 #include <$ac_header> 5046 _ACEOF 5047 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 5048 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 5049 ac_status=$? 5050 grep -v '^ *+' conftest.er1 >conftest.err 5051 rm -f conftest.er1 5052 cat conftest.err >&5 5053 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5054 (exit $ac_status); } >/dev/null; then 5055 if test -s conftest.err; then 5056 ac_cpp_err=$ac_c_preproc_warn_flag 5057 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 5058 else 5059 ac_cpp_err= 5060 fi 5061 else 5062 ac_cpp_err=yes 5063 fi 5064 if test -z "$ac_cpp_err"; then 5065 ac_header_preproc=yes 5066 else 5067 echo "$as_me: failed program was:" >&5 5068 sed 's/^/| /' conftest.$ac_ext >&5 5069 5070 ac_header_preproc=no 5071 fi 5072 rm -f conftest.err conftest.$ac_ext 5073 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 5074 echo "${ECHO_T}$ac_header_preproc" >&6 5075 5076 # So? What about this header? 5077 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 5078 yes:no: ) 5079 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 5080 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 5081 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 5082 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 5083 ac_header_preproc=yes 5084 ;; 5085 no:yes:* ) 5086 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 5087 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 5088 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 5089 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 5090 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 5091 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 5092 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 5093 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 5094 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 5095 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 5096 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 5097 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 5098 ( 5099 cat <<\_ASBOX 5100 ## ------------------------------------------- ## 5101 ## Report this to orxonox-dev@mail.datacore.ch ## 5102 ## ------------------------------------------- ## 5103 _ASBOX 5104 ) | 5105 sed "s/^/$as_me: WARNING: /" >&2 5106 ;; 5107 esac 5108 echo "$as_me:$LINENO: checking for $ac_header" >&5 5109 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 5110 if eval "test \"\${$as_ac_Header+set}\" = set"; then 5111 echo $ECHO_N "(cached) $ECHO_C" >&6 5112 else 5113 eval "$as_ac_Header=\$ac_header_preproc" 5114 fi 5115 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 5116 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 5117 5118 fi 5119 if test `eval echo '${'$as_ac_Header'}'` = yes; then 5120 cat >>confdefs.h <<_ACEOF 5121 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 5122 _ACEOF 5123 5124 else 5123 5125 { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5 5124 5126 echo "$as_me: error: cannot find SDL headers" >&2;} … … 5128 5130 done 5129 5131 5130 if test $mingw = no ; then 5131 5132 5133 echo "$as_me:$LINENO: checking for main in -lSDL" >&5 5132 5134 echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6 5133 5135 if test "${ac_cv_lib_SDL_main+set}" = set; then … … 5191 5193 fi 5192 5194 5193 if test "$FOUND_SDL" = "yes" ; then 5194 LIBS="$LIBS -lSDL" 5195 fi 5196 # checking for Windows sdl library 5197 else 5198 echo "$as_me:$LINENO: checking for main in -lsdlmain" >&5 5199 echo $ECHO_N "checking for main in -lsdlmain... $ECHO_C" >&6 5200 if test "${ac_cv_lib_sdlmain_main+set}" = set; then 5195 if test "$FOUND_SDL" = "yes" ; then 5196 LIBS="$LIBS -lSDL" 5197 else 5198 echo "------------------" 5199 echo "SDL library not found." 5200 echo "please install the SDL library, which can be found at http://www.libsdl.org" 5201 echo "------------------" 5202 exit -1 5203 fi 5204 5205 ;; 5206 *) 5207 mingw="no" 5208 ;; 5209 esac 5210 echo "$as_me:$LINENO: result: $mingw" >&5 5211 echo "${ECHO_T}$mingw" >&6 5212 5213 5214 #### Checking for LIBraries. 5215 5216 # FIXME: Replace `main' with a function in `-lOSMesa': 5217 5218 echo "$as_me:$LINENO: checking for main in -lOSMesa" >&5 5219 echo $ECHO_N "checking for main in -lOSMesa... $ECHO_C" >&6 5220 if test "${ac_cv_lib_OSMesa_main+set}" = set; then 5201 5221 echo $ECHO_N "(cached) $ECHO_C" >&6 5202 5222 else 5203 5223 ac_check_lib_save_LIBS=$LIBS 5204 LIBS="-l sdlmain$LIBS"5224 LIBS="-lOSMesa $LIBS" 5205 5225 cat >conftest.$ac_ext <<_ACEOF 5206 5226 /* confdefs.h. */ … … 5241 5261 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5242 5262 (exit $ac_status); }; }; then 5243 ac_cv_lib_ sdlmain_main=yes5263 ac_cv_lib_OSMesa_main=yes 5244 5264 else 5245 5265 echo "$as_me: failed program was:" >&5 5246 5266 sed 's/^/| /' conftest.$ac_ext >&5 5247 5267 5248 ac_cv_lib_ sdlmain_main=no5268 ac_cv_lib_OSMesa_main=no 5249 5269 fi 5250 5270 rm -f conftest.err conftest.$ac_objext \ … … 5252 5272 LIBS=$ac_check_lib_save_LIBS 5253 5273 fi 5254 echo "$as_me:$LINENO: result: $ac_cv_lib_sdlmain_main" >&5 5255 echo "${ECHO_T}$ac_cv_lib_sdlmain_main" >&6 5256 if test $ac_cv_lib_sdlmain_main = yes; then 5257 FOUND_sdlmain=yes 5258 fi 5259 5260 if test "$FOUND_sdlmain" = "yes" ; then 5261 LIBS="$LIBS -lsdlmain" 5262 fi 5263 echo "$as_me:$LINENO: checking for main in -lsdl" >&5 5264 echo $ECHO_N "checking for main in -lsdl... $ECHO_C" >&6 5265 if test "${ac_cv_lib_sdl_main+set}" = set; then 5274 echo "$as_me:$LINENO: result: $ac_cv_lib_OSMesa_main" >&5 5275 echo "${ECHO_T}$ac_cv_lib_OSMesa_main" >&6 5276 if test $ac_cv_lib_OSMesa_main = yes; then 5277 cat >>confdefs.h <<_ACEOF 5278 #define HAVE_LIBOSMESA 1 5279 _ACEOF 5280 5281 LIBS="-lOSMesa $LIBS" 5282 5283 fi 5284 5285 # FIXME: Replace `main' with a function in `-lX11': 5286 5287 echo "$as_me:$LINENO: checking for main in -lX11" >&5 5288 echo $ECHO_N "checking for main in -lX11... $ECHO_C" >&6 5289 if test "${ac_cv_lib_X11_main+set}" = set; then 5266 5290 echo $ECHO_N "(cached) $ECHO_C" >&6 5267 5291 else 5268 5292 ac_check_lib_save_LIBS=$LIBS 5269 LIBS="-l sdl$LIBS"5293 LIBS="-lX11 $LIBS" 5270 5294 cat >conftest.$ac_ext <<_ACEOF 5271 5295 /* confdefs.h. */ … … 5306 5330 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5307 5331 (exit $ac_status); }; }; then 5308 ac_cv_lib_ sdl_main=yes5332 ac_cv_lib_X11_main=yes 5309 5333 else 5310 5334 echo "$as_me: failed program was:" >&5 5311 5335 sed 's/^/| /' conftest.$ac_ext >&5 5312 5336 5313 ac_cv_lib_ sdl_main=no5337 ac_cv_lib_X11_main=no 5314 5338 fi 5315 5339 rm -f conftest.err conftest.$ac_objext \ … … 5317 5341 LIBS=$ac_check_lib_save_LIBS 5318 5342 fi 5319 echo "$as_me:$LINENO: result: $ac_cv_lib_sdl_main" >&5 5320 echo "${ECHO_T}$ac_cv_lib_sdl_main" >&6 5321 if test $ac_cv_lib_sdl_main = yes; then 5322 FOUND_sdl=yes 5323 fi 5324 5325 if test "$FOUND_sdl" = "yes" ; then 5326 LIBS="$LIBS -lsdl" 5327 fi 5328 fi 5343 echo "$as_me:$LINENO: result: $ac_cv_lib_X11_main" >&5 5344 echo "${ECHO_T}$ac_cv_lib_X11_main" >&6 5345 if test $ac_cv_lib_X11_main = yes; then 5346 cat >>confdefs.h <<_ACEOF 5347 #define HAVE_LIBX11 1 5348 _ACEOF 5349 5350 LIBS="-lX11 $LIBS" 5351 5352 fi 5353 5354 # FIXME: Replace `main' with a function in `-lXt': 5355 5356 echo "$as_me:$LINENO: checking for main in -lXt" >&5 5357 echo $ECHO_N "checking for main in -lXt... $ECHO_C" >&6 5358 if test "${ac_cv_lib_Xt_main+set}" = set; then 5359 echo $ECHO_N "(cached) $ECHO_C" >&6 5360 else 5361 ac_check_lib_save_LIBS=$LIBS 5362 LIBS="-lXt $LIBS" 5363 cat >conftest.$ac_ext <<_ACEOF 5364 /* confdefs.h. */ 5365 _ACEOF 5366 cat confdefs.h >>conftest.$ac_ext 5367 cat >>conftest.$ac_ext <<_ACEOF 5368 /* end confdefs.h. */ 5369 5370 5371 int 5372 main () 5373 { 5374 main (); 5375 ; 5376 return 0; 5377 } 5378 _ACEOF 5379 rm -f conftest.$ac_objext conftest$ac_exeext 5380 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5381 (eval $ac_link) 2>conftest.er1 5382 ac_status=$? 5383 grep -v '^ *+' conftest.er1 >conftest.err 5384 rm -f conftest.er1 5385 cat conftest.err >&5 5386 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5387 (exit $ac_status); } && 5388 { ac_try='test -z "$ac_c_werror_flag" 5389 || test ! -s conftest.err' 5390 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5391 (eval $ac_try) 2>&5 5392 ac_status=$? 5393 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5394 (exit $ac_status); }; } && 5395 { ac_try='test -s conftest$ac_exeext' 5396 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5397 (eval $ac_try) 2>&5 5398 ac_status=$? 5399 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5400 (exit $ac_status); }; }; then 5401 ac_cv_lib_Xt_main=yes 5402 else 5403 echo "$as_me: failed program was:" >&5 5404 sed 's/^/| /' conftest.$ac_ext >&5 5405 5406 ac_cv_lib_Xt_main=no 5407 fi 5408 rm -f conftest.err conftest.$ac_objext \ 5409 conftest$ac_exeext conftest.$ac_ext 5410 LIBS=$ac_check_lib_save_LIBS 5411 fi 5412 echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_main" >&5 5413 echo "${ECHO_T}$ac_cv_lib_Xt_main" >&6 5414 if test $ac_cv_lib_Xt_main = yes; then 5415 cat >>confdefs.h <<_ACEOF 5416 #define HAVE_LIBXT 1 5417 _ACEOF 5418 5419 LIBS="-lXt $LIBS" 5420 5421 fi 5422 5423 5329 5424 5330 5425 #checking for pthread libs … … 6951 7046 s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t 6952 7047 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t 7048 s,@mkdir_p@,$mkdir_p,;t t 6953 7049 s,@AWK@,$AWK,;t t 6954 7050 s,@SET_MAKE@,$SET_MAKE,;t t 6955 7051 s,@am__leading_dot@,$am__leading_dot,;t t 6956 s,@MSBITFIELDS@,$MSBITFIELDS,;t t6957 7052 s,@CXX@,$CXX,;t t 6958 7053 s,@CXXFLAGS@,$CXXFLAGS,;t t … … 6979 7074 s,@CPP@,$CPP,;t t 6980 7075 s,@EGREP@,$EGREP,;t t 7076 s,@MSBITFIELDS@,$MSBITFIELDS,;t t 6981 7077 s,@LIBOBJS@,$LIBOBJS,;t t 6982 7078 s,@LTLIBOBJS@,$LTLIBOBJS,;t t … … 7606 7702 # Extract the definition of DEP_FILES from the Makefile without 7607 7703 # running `make'. 7608 DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`7704 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 7609 7705 test -z "$DEPDIR" && continue 7610 7706 # When using ansi2knr, U may be empty or an underscore; expand it 7611 U=`sed -n -e '/^U = / s///p' < "$mf"`7707 U=`sed -n 's/^U = //p' < "$mf"` 7612 7708 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" 7613 7709 # We invoke sed twice because it is the simplest approach to 7614 7710 # changing $(DEPDIR) to its actual value in the expansion. 7615 for file in `sed -n -e'7711 for file in `sed -n ' 7616 7712 /^DEP_FILES = .*\\\\$/ { 7617 7713 s/^DEP_FILES = // -
orxonox/branches/buerli/configure.ac
r2617 r2707 5 5 AC_INIT(orxonox, 0.1-pre-alpha, orxonox-dev@mail.datacore.ch) 6 6 AM_INIT_AUTOMAKE 7 7 8 AC_CONFIG_SRCDIR([.]) 8 9 AC_CONFIG_HEADER([config.h]) 9 10 10 AC_MSG_CHECKING([for mingw]) 11 12 # Checks for programs. 13 AC_PROG_CXX 14 AC_PROG_CC 15 16 17 # checking gl header (has to be here because of a Linux error) 18 AC_CHECK_HEADERS(GL/gl.h ,, 19 [AC_MSG_ERROR([cannot find opengl headers]) ]) 20 21 22 23 ### CHECKING FOR SYSTEM ### 24 25 AC_MSG_CHECKING([for System]) 11 26 case `uname` in 27 ### WINDOWS ### 12 28 *MINGW*) 29 echo "mingw-WINDOWS detected" 30 13 31 mingw="yes" 14 32 MSBITFIELDS="-mms-bitfields" 15 33 MWINDOWS="-mwindows" 34 35 # checking gl header 36 #done before loop 37 38 # checking for Windows openGl library 39 AC_CHECK_LIB([opengl32], [main], FOUND_opengl32=yes, "gl/gl.h") 40 if test "$FOUND_opengl32" = "yes" ; then 41 LIBS="$LIBS -lopengl32" 42 else 43 echo "------------------" 44 echo "opengl not found." 45 echo "please install the opengl package which can be found at http://www.opengl.org" 46 echo "------------------" 47 exit -1 48 fi 49 50 # cheking for GLU-header 51 AC_CHECK_HEADERS(GL/glu.h ,, 52 [AC_MSG_ERROR([cannot find opengl headers]) ]) 53 54 # checking for libGLU 55 AC_CHECK_LIB([glu32], [main], FOUND_glu32=yes) 56 if test "$FOUND_glu32" = "yes" ; then 57 LIBS="$LIBS -lGLU32" 58 else 59 echo "------------------" 60 echo "GLU library not found." 61 echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org" 62 echo "------------------" 63 exit -1 64 fi 65 66 67 # checking for mingw32 68 AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes) 69 if test $FOUND_mingw32 = "yes"; then 70 LIBS="$LIBS -lmingw32" 71 fi 72 # checking for SDL-headers 73 AC_CHECK_HEADERS(SDL/SDL.h ,, 74 [AC_MSG_ERROR([cannot find SDL headers]) ]) 75 76 #checking for libSDL 77 AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes) 78 if test "$FOUND_sdlmain" = "yes" ; then 79 LIBS="$LIBS -lsdlmain" 80 else 81 echo "------------------" 82 echo "SDL library not found." 83 echo "please install the SDL library, which can be found at http://www.libsdl.org" 84 echo "------------------" 85 exit 1 86 fi 87 AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes) 88 if test "$FOUND_sdl" = "yes" ; then 89 LIBS="$LIBS -lsdl" 90 else 91 echo "------------------" 92 echo "SDL library not found." 93 echo "please install the SDL library, which can be found at http://www.libsdl.org" 94 echo "------------------" 95 exit -1 96 fi 97 98 ;; 99 100 ### LINUX ### 101 *Linux*) 102 echo "Linux detected" 103 104 Linux="yes" 105 106 # checking gl header 107 #has been done befor linux-check 108 109 # checking for Unix GL 110 AC_CHECK_LIB([GL], [main], FOUND_GL=yes) 111 if test "$FOUND_GL" = "yes" ; then 112 LIBS="$LIBS -lGL" 113 else 114 echo "------------------" 115 echo "opengl not found." 116 echo "please install the opengl package which can be found at http://www.opengl.org" 117 echo "------------------" 118 exit -1 119 fi 120 121 # cheking for GLU-header 122 AC_CHECK_HEADERS(GL/glu.h ,, 123 [AC_MSG_ERROR([cannot find opengl headers]) ]) 124 125 AC_CHECK_LIB([GLU], [gluProject], FOUND_GLU=yes) 126 if test "$FOUND_GLU" = "yes" ; then 127 LIBS="$LIBS -lGLU" 128 else 129 echo "------------------" 130 echo "GLU library not found." 131 echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org" 132 echo "------------------" 133 exit -1 134 fi 135 136 # checking for SDL-headers 137 AC_CHECK_HEADERS(SDL/SDL.h ,, 138 [AC_MSG_ERROR([cannot find SDL headers]) ]) 139 140 AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes) 141 if test "$FOUND_SDL" = "yes" ; then 142 LIBS="$LIBS -lSDL" 143 else 144 echo "------------------" 145 echo "SDL library not found." 146 echo "please install the SDL library, which can be found at http://www.libsdl.org" 147 echo "------------------" 148 exit -1 149 fi 150 16 151 ;; 17 152 *) … … 22 157 AC_SUBST(MSBITFIELDS) 23 158 24 25 # Checks for programs. 26 AC_PROG_CXX 27 AC_PROG_CC 28 29 # Checks for libraries. 30 31 # cheking for libGL 32 AC_CHECK_HEADERS(GL/gl.h ,, 33 [AC_MSG_ERROR([cannot find opengl headers]) ]) 34 35 # checking for Unix GL 36 AC_CHECK_LIB([GL], [main], FOUND_GL=yes) 37 if test "$FOUND_GL" = "yes" ; then 38 LIBS="$LIBS -lGL" 39 # checking for Windows openGl library 40 else 41 echo "We did not find the Linux opengl Library. Checking for Windows Library" 42 AC_CHECK_LIB([opengl32], [main], FOUND_opengl32=yes, "gl/gl.h") 43 if test "$FOUND_opengl32" = "yes" ; then 44 LIBS="$LIBS -lopengl32" 45 46 else 47 echo "------------------" 48 echo "opengl not found." 49 echo "please install the opengl package which can be found at http://www.opengl.org" 50 echo "------------------" 51 exit -1 52 fi 53 fi 54 55 # cheking for libGLU 56 AC_CHECK_HEADERS(GL/glu.h ,, 57 [AC_MSG_ERROR([cannot find opengl headers]) ]) 58 59 AC_CHECK_LIB([GLU], [gluProject], FOUND_GLU=yes) 60 if test "$FOUND_GLU" = "yes" ; then 61 LIBS="$LIBS -lGLU" 62 # checking for Windows GLU32 library 63 else 64 echo "We did not find the Linux GLU Library. Checking for Windows Library" 65 AC_CHECK_LIB([glu32], [main], FOUND_glu32=yes) 66 if test "$FOUND_glu32" = "yes" ; then 67 LIBS="$LIBS -lGLU32" 68 69 else 70 echo "------------------" 71 echo "GLU library not found." 72 echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org" 73 echo "------------------" 74 exit -1 75 fi 76 fi 159 #### Checking for LIBraries. 77 160 78 161 # FIXME: Replace `main' with a function in `-lOSMesa': … … 83 166 AC_CHECK_LIB([Xt], [main]) 84 167 85 # cheking for libglut3286 AC_CHECK_HEADERS(GL/glut.h ,,87 [AC_MSG_ERROR([cannot find glut headers]) ])88 AC_CHECK_LIB([glut], [glutInit], FOUND_glut=yes)89 if test "$FOUND_glut" = "yes" ; then90 LIBS="$LIBS -lglut"91 # checking for Windows glut32 library92 else93 echo "We did not find the Linux glut Library. Checking for Windows Library"94 AC_CHECK_LIB([glut32], [main], FOUND_glut32=yes)95 if test "$FOUND_glut32" = "yes" ; then96 LIBS="$LIBS -lglut32"97 else98 echo "------------------"99 echo "glut library not found."100 echo "please install the glut library, which can be found at http://www.xmission.com/~nate/glut.html"101 echo "------------------"102 exit -1103 fi104 fi105 106 ## mingw CHECK107 if test $mingw = yes ; then108 AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes)109 if test $FOUND_mingw32 = "yes"; then110 LIBS="$LIBS -lmingw32"111 fi112 fi113 114 ## SDL CHECK115 116 #checking for SDL libs117 AC_CHECK_HEADERS(SDL/SDL.h ,,118 [AC_MSG_ERROR([cannot find SDL headers]) ])119 if test $mingw = no ; then120 AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)121 if test "$FOUND_SDL" = "yes" ; then122 LIBS="$LIBS -lSDL"123 fi124 # checking for Windows sdl library125 else126 AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes)127 if test "$FOUND_sdlmain" = "yes" ; then128 LIBS="$LIBS -lsdlmain"129 fi130 AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes)131 if test "$FOUND_sdl" = "yes" ; then132 LIBS="$LIBS -lsdl"133 fi134 fi135 168 136 169 #checking for pthread libs -
orxonox/branches/buerli/console/Makefile.in
r2617 r2707 1 # Makefile.in generated by automake 1. 7.1from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 4 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 20025 # Free Software Foundation, Inc.4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 14 14 15 15 @SET_MAKE@ 16 17 18 SOURCES = $(console_SOURCES) 16 19 17 20 srcdir = @srcdir@ … … 22 25 pkgincludedir = $(includedir)/@PACKAGE@ 23 26 top_builddir = .. 24 25 27 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 26 28 INSTALL = @INSTALL@ … … 36 38 PRE_UNINSTALL = : 37 39 POST_UNINSTALL = : 40 bin_PROGRAMS = console$(EXEEXT) 41 subdir = console 42 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 43 $(srcdir)/Makefile.in 44 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 45 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 46 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 47 $(ACLOCAL_M4) 48 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 49 CONFIG_HEADER = $(top_builddir)/config.h 50 CONFIG_CLEAN_FILES = 51 am__installdirs = "$(DESTDIR)$(bindir)" 52 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 53 PROGRAMS = $(bin_PROGRAMS) 54 am_console_OBJECTS = orxonox_console.$(OBJEXT) \ 55 orxonox_console_entry.$(OBJEXT) orxonox_console_log.$(OBJEXT) 56 console_OBJECTS = $(am_console_OBJECTS) 57 console_LDADD = $(LDADD) 58 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 59 depcomp = $(SHELL) $(top_srcdir)/depcomp 60 am__depfiles_maybe = depfiles 61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_console.Po \ 62 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_console_entry.Po \ 63 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_console_log.Po 64 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 65 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 66 CXXLD = $(CXX) 67 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ 68 -o $@ 69 SOURCES = $(console_SOURCES) 70 DIST_SOURCES = $(console_SOURCES) 71 HEADERS = $(noinst_HEADERS) 72 ETAGS = etags 73 CTAGS = ctags 74 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 38 75 ACLOCAL = @ACLOCAL@ 39 76 AMDEP_FALSE = @AMDEP_FALSE@ … … 90 127 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 91 128 am__include = @am__include@ 129 am__leading_dot = @am__leading_dot@ 92 130 am__quote = @am__quote@ 93 131 bindir = @bindir@ … … 103 141 localstatedir = @localstatedir@ 104 142 mandir = @mandir@ 143 mkdir_p = @mkdir_p@ 105 144 oldincludedir = @oldincludedir@ 106 145 prefix = @prefix@ … … 111 150 target_alias = @target_alias@ 112 151 AM_CXXFLAGS = `pkg-config --cflags gtk+-2.0` $(MSBITFIELDS) 113 114 #AM_LDFLAGS=`pkg-config --libs gtk+-2.0`115 bin_PROGRAMS = console116 152 console_SOURCES = orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc 117 153 noinst_HEADERS = orxonox_console.h orxonox_console_entry.h orxonox_console_log.h 118 subdir = console119 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs120 CONFIG_HEADER = $(top_builddir)/config.h121 CONFIG_CLEAN_FILES =122 bin_PROGRAMS = console$(EXEEXT)123 PROGRAMS = $(bin_PROGRAMS)124 125 am_console_OBJECTS = orxonox_console.$(OBJEXT) \126 orxonox_console_entry.$(OBJEXT) orxonox_console_log.$(OBJEXT)127 console_OBJECTS = $(am_console_OBJECTS)128 console_LDADD = $(LDADD)129 console_DEPENDENCIES =130 console_LDFLAGS =131 132 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)133 depcomp = $(SHELL) $(top_srcdir)/depcomp134 am__depfiles_maybe = depfiles135 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_console.Po \136 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_console_entry.Po \137 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_console_log.Po138 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \139 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)140 CXXLD = $(CXX)141 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \142 -o $@143 DIST_SOURCES = $(console_SOURCES)144 HEADERS = $(noinst_HEADERS)145 146 DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in147 SOURCES = $(console_SOURCES)148 149 154 all: all-am 150 155 151 156 .SUFFIXES: 152 157 .SUFFIXES: .cc .o .obj 153 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 158 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) 159 @for dep in $?; do \ 160 case '$(am__configure_deps)' in \ 161 *$$dep*) \ 162 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ 163 && exit 0; \ 164 exit 1;; \ 165 esac; \ 166 done; \ 167 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu console/Makefile'; \ 154 168 cd $(top_srcdir) && \ 155 169 $(AUTOMAKE) --gnu console/Makefile 156 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 157 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) 158 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 170 .PRECIOUS: Makefile 171 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 172 @case '$?' in \ 173 *config.status*) \ 174 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ 175 *) \ 176 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ 177 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ 178 esac; 179 180 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 181 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 182 183 $(top_srcdir)/configure: $(am__configure_deps) 184 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 185 $(ACLOCAL_M4): $(am__aclocal_m4_deps) 186 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 159 187 install-binPROGRAMS: $(bin_PROGRAMS) 160 188 @$(NORMAL_INSTALL) 161 $(mkinstalldirs) $(DESTDIR)$(bindir)189 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 162 190 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 163 191 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 165 193 ; then \ 166 194 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 167 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \168 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \195 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 196 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 169 197 else :; fi; \ 170 198 done … … 174 202 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 175 203 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 176 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \177 rm -f $(DESTDIR)$(bindir)/$$f; \204 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 205 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 178 206 done 179 207 … … 185 213 186 214 mostlyclean-compile: 187 -rm -f *.$(OBJEXT) core *.core215 -rm -f *.$(OBJEXT) 188 216 189 217 distclean-compile: … … 194 222 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_console_log.Po@am__quote@ 195 223 196 distclean-depend:197 -rm -rf ./$(DEPDIR)198 199 224 .cc.o: 200 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ 201 @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ 202 @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ 203 @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ 204 @am__fastdepCXX_TRUE@ fi 225 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 226 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 205 227 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 206 228 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ 207 229 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 208 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<230 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< 209 231 210 232 .cc.obj: 211 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ 212 @am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \ 213 @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ 214 @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ 215 @am__fastdepCXX_TRUE@ fi 233 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ 234 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 216 235 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 217 236 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ 218 237 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 219 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ ` if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`238 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` 220 239 uninstall-info-am: 221 222 ETAGS = etags223 ETAGSFLAGS =224 225 CTAGS = ctags226 CTAGSFLAGS =227 228 tags: TAGS229 240 230 241 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) … … 236 247 END { for (i in files) print i; }'`; \ 237 248 mkid -fID $$unique 249 tags: TAGS 238 250 239 251 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 247 259 $(AWK) ' { files[$$0] = 1; } \ 248 260 END { for (i in files) print i; }'`; \ 249 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 250 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 251 $$tags $$unique 252 261 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 262 test -n "$$unique" || unique=$$empty_fix; \ 263 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 264 $$tags $$unique; \ 265 fi 253 266 ctags: CTAGS 254 267 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 273 286 distclean-tags: 274 287 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 275 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)276 277 top_distdir = ..278 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)279 288 280 289 distdir: $(DISTFILES) … … 290 299 if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 291 300 dir="/$$dir"; \ 292 $(mk installdirs) "$(distdir)$$dir"; \301 $(mkdir_p) "$(distdir)$$dir"; \ 293 302 else \ 294 303 dir=''; \ … … 308 317 check: check-am 309 318 all-am: Makefile $(PROGRAMS) $(HEADERS) 310 311 319 installdirs: 312 $(mkinstalldirs) $(DESTDIR)$(bindir) 313 320 for dir in "$(DESTDIR)$(bindir)"; do \ 321 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 322 done 314 323 install: install-am 315 324 install-exec: install-exec-am … … 323 332 install-strip: 324 333 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 325 INSTALL_STRIP_FLAG=-s \334 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 326 335 `test -z '$(STRIP)' || \ 327 336 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install … … 331 340 332 341 distclean-generic: 333 -rm -f Makefile$(CONFIG_CLEAN_FILES)342 -rm -f $(CONFIG_CLEAN_FILES) 334 343 335 344 maintainer-clean-generic: … … 341 350 342 351 distclean: distclean-am 343 344 distclean-am: clean-am distclean-compile distclean-depend \ 345 distclean-generic distclean-tags 352 -rm -rf ./$(DEPDIR) 353 -rm -f Makefile 354 distclean-am: clean-am distclean-compile distclean-generic \ 355 distclean-tags 346 356 347 357 dvi: dvi-am … … 349 359 dvi-am: 350 360 361 html: html-am 362 351 363 info: info-am 352 364 … … 364 376 365 377 maintainer-clean: maintainer-clean-am 366 378 -rm -rf ./$(DEPDIR) 379 -rm -f Makefile 367 380 maintainer-clean-am: distclean-am maintainer-clean-generic 368 381 … … 383 396 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ 384 397 clean-generic ctags distclean distclean-compile \ 385 distclean- depend distclean-generic distclean-tags distdir dvi\386 dvi-am info info-am install install-am install-binPROGRAMS \398 distclean-generic distclean-tags distdir dvi dvi-am html \ 399 html-am info info-am install install-am install-binPROGRAMS \ 387 400 install-data install-data-am install-exec install-exec-am \ 388 401 install-info install-info-am install-man install-strip \ -
orxonox/branches/buerli/gui/Makefile.am
r2589 r2707 3 3 4 4 bin_PROGRAMS=gui 5 gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc 5 gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc orxonox_gui_keys.cc 6 6 7 noinst_HEADERS=orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h 7 noinst_HEADERS=orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h orxonox_gui_keys.h 8 8 9 9 # uncomment the following if bencoder requires the math library -
orxonox/branches/buerli/gui/Makefile.in
r2617 r2707 1 # Makefile.in generated by automake 1. 7.1from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 4 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 20025 # Free Software Foundation, Inc.4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 14 14 15 15 @SET_MAKE@ 16 17 18 SOURCES = $(gui_SOURCES) 16 19 17 20 srcdir = @srcdir@ … … 22 25 pkgincludedir = $(includedir)/@PACKAGE@ 23 26 top_builddir = .. 24 25 27 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 26 28 INSTALL = @INSTALL@ … … 36 38 PRE_UNINSTALL = : 37 39 POST_UNINSTALL = : 40 bin_PROGRAMS = gui$(EXEEXT) 41 subdir = gui 42 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 43 $(srcdir)/Makefile.in 44 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 45 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 46 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 47 $(ACLOCAL_M4) 48 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 49 CONFIG_HEADER = $(top_builddir)/config.h 50 CONFIG_CLEAN_FILES = 51 am__installdirs = "$(DESTDIR)$(bindir)" 52 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 53 PROGRAMS = $(bin_PROGRAMS) 54 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \ 55 orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \ 56 orxonox_gui_flags.$(OBJEXT) orxonox_gui_banner.$(OBJEXT) \ 57 orxonox_gui_keys.$(OBJEXT) 58 gui_OBJECTS = $(am_gui_OBJECTS) 59 gui_LDADD = $(LDADD) 60 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 61 depcomp = $(SHELL) $(top_srcdir)/depcomp 62 am__depfiles_maybe = depfiles 63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \ 64 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_audio.Po \ 65 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_banner.Po \ 66 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_exec.Po \ 67 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_flags.Po \ 68 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_keys.Po \ 69 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_video.Po 70 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 71 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 72 CXXLD = $(CXX) 73 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ 74 -o $@ 75 SOURCES = $(gui_SOURCES) 76 DIST_SOURCES = $(gui_SOURCES) 77 HEADERS = $(noinst_HEADERS) 78 ETAGS = etags 79 CTAGS = ctags 80 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 38 81 ACLOCAL = @ACLOCAL@ 39 82 AMDEP_FALSE = @AMDEP_FALSE@ … … 90 133 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 91 134 am__include = @am__include@ 135 am__leading_dot = @am__leading_dot@ 92 136 am__quote = @am__quote@ 93 137 bindir = @bindir@ … … 103 147 localstatedir = @localstatedir@ 104 148 mandir = @mandir@ 149 mkdir_p = @mkdir_p@ 105 150 oldincludedir = @oldincludedir@ 106 151 prefix = @prefix@ … … 111 156 target_alias = @target_alias@ 112 157 AM_CXXFLAGS = `pkg-config --cflags gtk+-2.0` $(MSBITFIELDS) 113 114 #AM_LDFLAGS=`pkg-config --libs gtk+-2.0` 115 bin_PROGRAMS = gui 116 gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc 117 118 noinst_HEADERS = orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h 158 gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc orxonox_gui_keys.cc 159 noinst_HEADERS = orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h orxonox_gui_keys.h 119 160 120 161 # uncomment the following if bencoder requires the math library … … 127 168 #TESTS=chk 128 169 EXTRA_DIST = rc banner.xpm 129 subdir = gui130 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs131 CONFIG_HEADER = $(top_builddir)/config.h132 CONFIG_CLEAN_FILES =133 bin_PROGRAMS = gui$(EXEEXT)134 PROGRAMS = $(bin_PROGRAMS)135 136 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \137 orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \138 orxonox_gui_flags.$(OBJEXT) orxonox_gui_banner.$(OBJEXT)139 gui_OBJECTS = $(am_gui_OBJECTS)140 gui_LDADD = $(LDADD)141 gui_DEPENDENCIES =142 gui_LDFLAGS =143 144 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)145 depcomp = $(SHELL) $(top_srcdir)/depcomp146 am__depfiles_maybe = depfiles147 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \148 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_audio.Po \149 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_banner.Po \150 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_exec.Po \151 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_flags.Po \152 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox_gui_video.Po153 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \154 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)155 CXXLD = $(CXX)156 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \157 -o $@158 DIST_SOURCES = $(gui_SOURCES)159 HEADERS = $(noinst_HEADERS)160 161 DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in162 SOURCES = $(gui_SOURCES)163 164 170 all: all-am 165 171 166 172 .SUFFIXES: 167 173 .SUFFIXES: .cc .o .obj 168 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 174 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) 175 @for dep in $?; do \ 176 case '$(am__configure_deps)' in \ 177 *$$dep*) \ 178 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ 179 && exit 0; \ 180 exit 1;; \ 181 esac; \ 182 done; \ 183 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gui/Makefile'; \ 169 184 cd $(top_srcdir) && \ 170 185 $(AUTOMAKE) --gnu gui/Makefile 171 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 172 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) 173 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 186 .PRECIOUS: Makefile 187 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 188 @case '$?' in \ 189 *config.status*) \ 190 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ 191 *) \ 192 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ 193 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ 194 esac; 195 196 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 197 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 198 199 $(top_srcdir)/configure: $(am__configure_deps) 200 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 201 $(ACLOCAL_M4): $(am__aclocal_m4_deps) 202 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 174 203 install-binPROGRAMS: $(bin_PROGRAMS) 175 204 @$(NORMAL_INSTALL) 176 $(mkinstalldirs) $(DESTDIR)$(bindir)205 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 177 206 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 178 207 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 180 209 ; then \ 181 210 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 182 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \183 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \211 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 212 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 184 213 else :; fi; \ 185 214 done … … 189 218 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 190 219 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 191 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \192 rm -f $(DESTDIR)$(bindir)/$$f; \220 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 221 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 193 222 done 194 223 … … 200 229 201 230 mostlyclean-compile: 202 -rm -f *.$(OBJEXT) core *.core231 -rm -f *.$(OBJEXT) 203 232 204 233 distclean-compile: … … 210 239 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@ 211 240 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_flags.Po@am__quote@ 241 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@ 212 242 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@ 213 243 214 distclean-depend:215 -rm -rf ./$(DEPDIR)216 217 244 .cc.o: 218 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ 219 @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ 220 @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ 221 @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ 222 @am__fastdepCXX_TRUE@ fi 245 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 246 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 223 247 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 224 248 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ 225 249 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 226 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<250 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< 227 251 228 252 .cc.obj: 229 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ 230 @am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \ 231 @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ 232 @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ 233 @am__fastdepCXX_TRUE@ fi 253 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ 254 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 234 255 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 235 256 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ 236 257 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 237 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ ` if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`258 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` 238 259 uninstall-info-am: 239 240 ETAGS = etags241 ETAGSFLAGS =242 243 CTAGS = ctags244 CTAGSFLAGS =245 246 tags: TAGS247 260 248 261 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) … … 254 267 END { for (i in files) print i; }'`; \ 255 268 mkid -fID $$unique 269 tags: TAGS 256 270 257 271 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 265 279 $(AWK) ' { files[$$0] = 1; } \ 266 280 END { for (i in files) print i; }'`; \ 267 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 268 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 269 $$tags $$unique 270 281 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 282 test -n "$$unique" || unique=$$empty_fix; \ 283 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 284 $$tags $$unique; \ 285 fi 271 286 ctags: CTAGS 272 287 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 291 306 distclean-tags: 292 307 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 293 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)294 295 top_distdir = ..296 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)297 308 298 309 distdir: $(DISTFILES) … … 308 319 if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 309 320 dir="/$$dir"; \ 310 $(mk installdirs) "$(distdir)$$dir"; \321 $(mkdir_p) "$(distdir)$$dir"; \ 311 322 else \ 312 323 dir=''; \ … … 326 337 check: check-am 327 338 all-am: Makefile $(PROGRAMS) $(HEADERS) 328 329 339 installdirs: 330 $(mkinstalldirs) $(DESTDIR)$(bindir) 331 340 for dir in "$(DESTDIR)$(bindir)"; do \ 341 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 342 done 332 343 install: install-am 333 344 install-exec: install-exec-am … … 341 352 install-strip: 342 353 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 343 INSTALL_STRIP_FLAG=-s \354 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 344 355 `test -z '$(STRIP)' || \ 345 356 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install … … 349 360 350 361 distclean-generic: 351 -rm -f Makefile$(CONFIG_CLEAN_FILES)362 -rm -f $(CONFIG_CLEAN_FILES) 352 363 353 364 maintainer-clean-generic: … … 359 370 360 371 distclean: distclean-am 361 362 distclean-am: clean-am distclean-compile distclean-depend \ 363 distclean-generic distclean-tags 372 -rm -rf ./$(DEPDIR) 373 -rm -f Makefile 374 distclean-am: clean-am distclean-compile distclean-generic \ 375 distclean-tags 364 376 365 377 dvi: dvi-am … … 367 379 dvi-am: 368 380 381 html: html-am 382 369 383 info: info-am 370 384 … … 382 396 383 397 maintainer-clean: maintainer-clean-am 384 398 -rm -rf ./$(DEPDIR) 399 -rm -f Makefile 385 400 maintainer-clean-am: distclean-am maintainer-clean-generic 386 401 … … 401 416 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ 402 417 clean-generic ctags distclean distclean-compile \ 403 distclean- depend distclean-generic distclean-tags distdir dvi\404 dvi-am info info-am install install-am install-binPROGRAMS \418 distclean-generic distclean-tags distdir dvi dvi-am html \ 419 html-am info info-am install install-am install-binPROGRAMS \ 405 420 install-data install-data-am install-exec install-exec-am \ 406 421 install-info install-info-am install-man install-strip \ -
orxonox/branches/buerli/gui/orxonox_gui.cc
r2595 r2707 32 32 #include "orxonox_gui_flags.h" 33 33 #include "orxonox_gui_banner.h" 34 #include "orxonox_gui_keys.h" 34 35 35 36 Window* orxonoxGUI; … … 39 40 OrxonoxGuiFlags* flags; 40 41 OrxonoxGuiBanner* banner; 42 OrxonoxGuiKeys* keys; 41 43 42 44 int main( int argc, char *argv[] ) … … 49 51 50 52 /** 51 *Initializes the Gui53 \brief Initializes the Gui 52 54 */ 53 55 OrxonoxGui::OrxonoxGui (int argc, char *argv[]) … … 56 58 gtk_rc_parse( "rc" ); 57 59 58 orxonoxGUI = new Window( "Graphical Orxonox Launcher");60 orxonoxGUI = new Window( "Grafical OrxOnoX loader, "PACKAGE_VERSION ); 59 61 orxonoxGUI->connectSignal ("destroy", orxonoxGUI->orxonox_gui_quit); 60 62 orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit); … … 75 77 76 78 optionBox->fill (avBox); 77 79 80 keys = new OrxonoxGuiKeys (); 81 optionBox->fill (keys->getWidget ()); 82 78 83 exec = new OrxonoxGuiExec (orxonoxGUI); 79 84 optionBox->fill (exec->getWidget ()); … … 99 104 100 105 /* WIDGET */ 101 /** 102 * Initializes a widget. 103 * Nothing to do here. 104 */ 106 107 /** 108 \brief deletes any given Widget 109 This is still pretty crappy. 110 */ 111 Widget::~Widget() 112 { 113 // cout << "hiding: " <<this->label <<"\n"; 114 this->hide(); 115 // cout << "check if Packer: "<<this->label <<"\n"; 116 if (this->is_option < 0) 117 { 118 // cout << "get Down "<<this->label <<"\n"; 119 static_cast<Packer*>(this)->down->~Widget(); 120 } 121 // cout << "next != NULL?: " <<this->label <<"\n"; 122 if (this->next != NULL) 123 this->next->~Widget(); 124 cout << "delete Widget: " <<this->label <<"\n"; 125 // delete widget; 126 } 127 128 /** 129 \brief Initializes a widget. 130 Initializes the next Pointer and the other Widget-specific Defaults. 131 */ 105 132 void Widget::init() 106 133 { 134 next = NULL; 135 label = ""; 107 136 return; 108 137 } 109 138 110 /** 111 * Connect any signal to any given Sub-widget 112 */ 139 /** 140 \brief makes the widget visible. 141 */ 142 void Widget::show() 143 { 144 gtk_widget_show (this->widget); 145 } 146 147 /** 148 \brief hides the widget. 149 */ 150 void Widget::hide() 151 { 152 gtk_widget_hide (this->widget); 153 } 154 155 /** 156 \brief Sets the resolution of a specific widget to the given size. 157 \param width the width of the widget to set. 158 \param height the height of the widget to set. 159 */ 160 void Widget::setSize(int width, int height) 161 { 162 gtk_widget_set_usize (this->widget, width, height); 163 } 164 165 /** 166 \brief Connect any signal to any given Sub-widget 167 */ 113 168 void Widget::connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *)) 114 169 { … … 117 172 118 173 /** 119 *Connect a signal with additionally passing the whole Object120 174 \brief Connect a signal with additionally passing the whole Object 175 */ 121 176 void Widget::connectSignal (char* event, gint (*signal)( GtkWidget*, Widget *)) 122 177 { … … 125 180 126 181 /** 127 *Connect a signal with additionally passing a whole external Object128 182 \brief Connect a signal with additionally passing a whole external Object 183 */ 129 184 void Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *)) 130 185 { … … 132 187 } 133 188 134 135 /** 136 * Function to Shows a specific widget. 137 */ 138 void Widget::show() 139 { 140 gtk_widget_show (this->widget); 141 } 142 143 /** 144 * Moves through all the Widgets downwards from this and executes the function on them. 145 \param function must be of type void and takes a Widget* as an Input. 146 147 */ 189 /** 190 \brief Moves through all the Widgets downwards from this and executes the function on them. 191 \param function must be of type void and takes a Widget* as an Input. 192 */ 148 193 void Widget::walkThrough (void (*function)(Widget*)) 149 194 { 150 195 function(this); 151 switch (this->is_option)196 if (this->is_option < 0) 152 197 { 153 case -1: 154 static_cast<Container*>(this)->down->walkThrough (function); 155 break; 156 case -2: 157 static_cast<Box*>(this)->down->walkThrough (function); 158 break; 198 static_cast<Packer*>(this)->down->walkThrough (function); 159 199 } 160 200 … … 163 203 } 164 204 165 166 /** 167 * This is for listing the option of "widget" 168 \param widget specifies the widget that should be listed 205 /** 206 \brief This is for listing the option of "widget" 207 \param widget specifies the widget that should be listed 169 208 */ 170 209 void Widget::listOptions (Widget* widget) 171 210 { 172 211 if (widget->is_option >= 1) 173 cout << static_cast<Option*>(widget)-> option_name<<" is : " << static_cast<Option*>(widget)->value <<endl;174 } 175 176 /** 177 *This is for setting the option of "widget"178 \param widget specifies the widget that should be set.212 cout << static_cast<Option*>(widget)->label <<" is : " << static_cast<Option*>(widget)->value <<endl; 213 } 214 215 /** 216 \brief This is for setting the option of "widget" 217 \param widget specifies the widget that should be set. 179 218 */ 180 219 void Widget::setOptions (Widget* widget) … … 184 223 } 185 224 186 /* CONTAINERS*/ 187 188 /** 189 * Initializes a Container. 190 * nothing to do here 191 */ 225 //void deleteWidget(Widget* lastWidget) 226 227 228 /* PACKERS */ 229 230 /** 231 \brief Initializes a Packer. 232 Sets the down-pinter to NULL and other PackerSpecific-values to their defaults. 233 */ 234 void Packer::init (void) 235 { 236 down = NULL; 237 this->setGroupName (""); 238 239 240 static_cast<Widget*>(this)->init(); 241 return; 242 } 243 244 /** 245 \brief Sets the group name under which all the lower widgets of this will be saved. 246 \param name The name of the group. 247 */ 248 void Packer::setGroupName (char* name) 249 { 250 groupName = name; 251 } 252 253 /** 254 \brief Retrieves the group name under which all the lower widgets of this will be saved. 255 \returns name The name of the group. 256 */ 257 char* Packer::getGroupName (void) 258 { 259 return groupName; 260 } 261 262 /* CONTAINERS */ 263 264 /** 265 \brief Initializes a Container. 266 sets the Container-Specific defaults. 267 */ 192 268 void Container::init (void) 193 269 { 270 is_option = -1; 271 272 static_cast<Packer*>(this)->init(); 273 194 274 return; 195 275 } 196 276 197 277 /** 198 *Fills a Container with lowerWidget.199 *It does this by filling up the down pointer only if down points to NULL.200 \param lowerWidget the Widget that should be filled into the Container.278 \briefFills a Container with lowerWidget. 279 It does this by filling up the down pointer only if down points to NULL. 280 \param lowerWidget the Widget that should be filled into the Container. 201 281 */ 202 282 void Container::fill (Widget *lowerWidget) … … 215 295 /* WINDOW */ 216 296 217 218 *Creating a new Window without a Name219 297 /** 298 \brief Creating a new Window without a Name 299 */ 220 300 Window::Window (void) 221 301 { … … 224 304 225 305 /** 226 *Creating a Window with a name227 \param windowName the name the window should get.228 306 \brief Creating a Window with a name 307 \param windowName the name the window should get. 308 */ 229 309 Window::Window (char* windowName) 230 310 { … … 234 314 235 315 /** 236 * Destoying a Window (very BAD implemented). 237 * For now it just hides the window. 238 */ 239 Window::~Window () 240 { 241 gtk_widget_hide (widget); 242 } 243 244 /** 245 *initializes a new Window 246 */ 316 \brief initializes a new Window 317 */ 247 318 void Window::init() 248 319 { 249 is_option = -1; 250 next = NULL; 251 down = NULL; 320 isOpen = true; 321 322 static_cast<Container*>(this)->init(); 323 252 324 widget = gtk_window_new (GTK_WINDOW_TOPLEVEL); 253 325 gtk_window_set_policy (GTK_WINDOW(widget), TRUE, TRUE, TRUE); … … 259 331 260 332 /** 261 *Shows all Widgets that are included within this->widget.262 333 \brief Shows all Widgets that are included within this->widget. 334 */ 263 335 void Window::showall () 264 336 { 337 isOpen = true; 265 338 gtk_widget_show_all (widget); 266 339 } 267 340 268 341 /** 269 *Set The Window-title to title270 \param title title the Window should get.342 \brief Set The Window-title to title 343 \param title title the Window should get. 271 344 */ 272 345 void Window::setTitle (char* title) 273 346 { 347 label=title; 274 348 gtk_window_set_title (GTK_WINDOW (widget), title); 275 349 } … … 295 369 296 370 /** 297 *Creates a new Frame without a name298 371 \brief Creates a new Frame without a name 372 */ 299 373 Frame::Frame (void) 300 374 { … … 303 377 304 378 /** 305 *Creates a new Frame with name title306 379 \brief Creates a new Frame with name title 380 */ 307 381 Frame::Frame (char* title) 308 382 { … … 311 385 } 312 386 313 /** 314 * Destroys given Frame (not implemented yet) 315 */ 316 Frame::~Frame () 317 { 318 } 319 320 /** 321 * Initializes a new Frame with default settings 322 */ 387 /** 388 \brief Initializes a new Frame with default settings 389 */ 323 390 void Frame::init() 324 391 { 325 is_option = -1; 326 next = NULL; 327 down = NULL; 392 static_cast<Container*>(this)->init(); 393 328 394 widget = gtk_frame_new (""); 329 395 gtk_container_set_border_width (GTK_CONTAINER (widget), 3); … … 331 397 332 398 /** 333 *Sets the Frames name to title334 \param title The title the Frame should get.335 399 \brief Sets the Frames name to title 400 \param title The title the Frame should get. 401 */ 336 402 void Frame::setTitle (char* title) 337 403 { 404 label = title; 338 405 gtk_frame_set_label (GTK_FRAME (widget), title); 339 406 } … … 342 409 343 410 /** 344 *Creates a new EventBox with default settings.345 411 \brief Creates a new EventBox with default settings. 412 */ 346 413 EventBox::EventBox () 347 414 { … … 349 416 } 350 417 /** 351 *Creates a new EventBox with name title352 \param title title the Eventbox should get (only data-structure-internal)418 \brief Creates a new EventBox with name title 419 \param title title the Eventbox should get (only data-structure-internal) 353 420 */ 354 421 EventBox::EventBox (char* title) … … 360 427 361 428 /** 362 *Initializes a new EventBox363 429 \brief Initializes a new EventBox 430 */ 364 431 void EventBox::init(void) 365 432 { 366 433 is_option = -1; 367 next = NULL; 368 down = NULL; 434 435 static_cast<Container*>(this)->init(); 436 369 437 widget = gtk_event_box_new (); 370 438 gtk_container_set_border_width (GTK_CONTAINER (widget), 3); … … 373 441 374 442 /** 375 *Sets the Title of the EventBox (not implemented)376 \param title Name the EventBox should get (only datastructure-internal).443 \brief Sets the Title of the EventBox (not implemented) 444 \param title Name the EventBox should get (only datastructure-internal). 377 445 */ 378 446 void EventBox::setTitle (char* title) 379 447 { 380 381 } 382 383 /** 384 * Destructs an EventBox (not Implemented) 385 */ 386 EventBox::~EventBox () 387 { 388 } 389 448 label = title; 449 } 390 450 391 451 /* BOX */ 392 452 393 453 /** 394 *Creates a new horizontal Box395 454 \brief Creates a new horizontal Box 455 */ 396 456 Box::Box (void) 397 457 { … … 400 460 401 461 /** 402 *Creates a new Box of type boxtype403 \param boxtype if 'v' the Box will be vertically, if 'h' the Box will be horizontally404 462 \brief Creates a new Box of type boxtype 463 \param boxtype if 'v' the Box will be vertically, if 'h' the Box will be horizontally 464 */ 405 465 Box::Box (char boxtype) 406 466 { … … 409 469 410 470 /** 411 * Destroys given Box (not implemented yet) 412 */ 413 Box::~Box () 414 { 415 } 416 417 /** 418 * Initializes a new Box with type boxtype 419 \param boxtype see Box(char boxtype) 471 \brief Initializes a new Box with type boxtype 472 \param boxtype see Box(char boxtype) 420 473 */ 421 474 void Box::init(char boxtype) 422 475 { 423 476 is_option = -2; 424 next = NULL; 425 down = NULL;477 478 static_cast<Packer*>(this)->init(); 426 479 if (boxtype == 'v') 427 480 { … … 435 488 436 489 /** 437 *Fills a box with a given Widget.438 *It does this by apending the first one to its down-pointer and all its following ones to the preceding next-pointer. The last one will receive a NULL pointer as Next439 \param lowerWidget the next Widget that should be appendet to this Box440 490 \brief Fills a box with a given Widget. 491 It does this by apending the first one to its down-pointer and all its following ones to the preceding next-pointer. The last one will receive a NULL pointer as Next 492 \param lowerWidget the next Widget that should be appendet to this Box 493 */ 441 494 void Box::fill (Widget *lowerWidget) 442 495 { 443 /**444 * Fill a Box with its lowerwidgets445 */446 496 gtk_box_pack_start (GTK_BOX (this->widget), lowerWidget->widget, TRUE, TRUE, 0); 447 497 if (this->down == NULL) … … 462 512 463 513 /** 464 *Creates a new Image465 \param imagename the location of the Image on the Hard Disc514 \brief Creates a new Image 515 \param imagename the location of the Image on the Hard Disc 466 516 */ 467 517 Image::Image (char* imagename) … … 469 519 this->init(); 470 520 widget = gtk_image_new_from_file (imagename); 471 } 472 473 /** 474 * Initializes a new Image 475 */ 521 label = imagename; 522 } 523 524 /** 525 \brief Initializes a new Image 526 */ 476 527 void Image::init() 477 528 { 478 529 is_option = 0; 479 next = NULL; 530 531 static_cast<Widget*>(this)->init(); 480 532 } 481 533 … … 484 536 485 537 /** 486 * Initializes a new Option: nothing to do here 487 */ 538 \brief Initializes a new Option. 539 sets all Option-Specific-Values to their defaults. 540 */ 488 541 void Option::init() 489 542 { 543 value = 0; 544 flag_name = ""; 545 flag_name_short = ""; 546 default_value = 0; 547 548 static_cast<Widget*>(this)->init(); 549 490 550 return; 491 551 } 492 552 493 553 /** 494 *This sets The FlagName of an Option and defines its default Values495 !! Options will be saved if flagname is different from "" !!496 \param flagname the Name that will be displayed in the output497 \param defaultvalue the default Value for this Option (see definition of defaultvalue554 \brief This sets The FlagName of an Option and defines its default Values 555 !! Options will be saved if flagname is different from "" !! 556 \param flagname the Name that will be displayed in the output 557 \param defaultvalue the default Value for this Option (see definition of defaultvalue 498 558 */ 499 559 void Option::setFlagName (char* flagname, int defaultvalue) … … 501 561 flag_name = flagname; 502 562 default_value = defaultvalue; 503 cout << "Set Flagname of " << option_name<< " to " << flagname << endl;504 } 505 506 /** 507 *see Option::setFlagName (char* flagname, int defaultvalue)508 \param flagname the Name that will be displayed in the output509 \param defaultvalue the default Value for this Option (see definition of defaultvalue510 \param flagnameshort a short flagname to be displayed in the output563 cout << "Set Flagname of " << label << " to " << flagname << endl; 564 } 565 566 /** 567 \brief see Option::setFlagName (char* flagname, int defaultvalue) 568 \param flagname the Name that will be displayed in the output 569 \param defaultvalue the default Value for this Option (see definition of defaultvalue 570 \param flagnameshort a short flagname to be displayed in the output 511 571 */ 512 572 void Option::setFlagName (char* flagname, char* flagnameshort, int defaultvalue) … … 515 575 flag_name_short = flagnameshort; 516 576 default_value = defaultvalue; 517 cout << "Set Flagname of " << option_name<< " to " << flagname << endl;577 cout << "Set Flagname of " << label << " to " << flagname << endl; 518 578 } 519 579 … … 522 582 523 583 /** 524 *Creates a new Button with a buttonname525 \param buttonname sets the Name of the Button584 \brief Creates a new Button with a buttonname 585 \param buttonname sets the Name of the Button 526 586 */ 527 587 Button::Button(char* buttonname) … … 532 592 533 593 /** 534 *Initializes a new Button535 594 \brief Initializes a new Button 595 */ 536 596 void Button::init(void) 537 597 { 538 598 is_option = 0; 539 value = 0; 540 next = NULL; 541 option_name =""; 542 flag_name = ""; 543 flag_name_short = ""; 544 default_value = 0; 599 600 static_cast<Option*>(this)->init(); 601 545 602 widget = gtk_button_new_with_label (""); 546 603 } 547 604 548 605 /** 549 *Sets a new name to the Button550 \param title The name the Button should get606 \brief Sets a new name to the Button 607 \param title The name the Button should get 551 608 */ 552 609 void Button::setTitle (char *title) 553 610 { 554 option_name= title;611 label = title; 555 612 gtk_button_set_label (GTK_BUTTON(widget), title); 556 613 } 557 614 558 615 /** 559 *redraws the Button560 *not implemented yet561 616 \brief redraws the Button 617 not implemented yet 618 */ 562 619 void Button::redraw () 563 620 { … … 567 624 568 625 /** 569 *Creates a new CheckButton with an ame570 \param buttonname The name the CheckButton should display.571 626 \brief Creates a new CheckButton with an ame 627 \param buttonname The name the CheckButton should display. 628 */ 572 629 CheckButton::CheckButton (char* buttonname) 573 630 { … … 578 635 } 579 636 580 /** 581 * Destructs a CheckButton (not Implemented yet). 582 */ 583 CheckButton::~CheckButton() 584 { 585 } 586 587 /** 588 * Initiali a new CheckButton with default settings 589 */ 637 /** 638 \brief Initialize a new CheckButton with default settings 639 */ 590 640 void CheckButton::init(void) 591 641 { 592 642 is_option = 1; 593 value = 0; 594 next = NULL; 595 option_name = ""; 596 flag_name = ""; 597 flag_name_short = ""; 598 default_value = 0; 643 644 static_cast<Option*>(this)->init(); 645 599 646 widget = gtk_check_button_new_with_label (""); 600 647 } 601 648 602 649 /** 603 *Sets a new Title to a CheckButton604 \param title The new Name the CheckButton should display.650 \brief Sets a new Title to a CheckButton 651 \param title The new Name the CheckButton should display. 605 652 */ 606 653 void CheckButton::setTitle(char* title) 607 654 { 608 option_name= title;655 label = title; 609 656 gtk_button_set_label(GTK_BUTTON(widget), title); 610 657 } … … 612 659 613 660 /** 614 *Signal OptionChange writes the Value from the CheckButton to its Object-Database.615 \param widget The widget(CheckButton) that has a changed Value616 \param checkbutton the CheckButton-Object that should receive the change.617 661 \brief Signal OptionChange writes the Value from the CheckButton to its Object-Database. 662 \param widget The widget(CheckButton) that has a changed Value 663 \param checkbutton the CheckButton-Object that should receive the change. 664 */ 618 665 gint CheckButton::OptionChange (GtkWidget *widget, Widget* checkbutton) 619 666 { 620 667 static_cast<CheckButton*>(checkbutton)->value = (int)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ((CheckButton*)checkbutton->widget)); 621 668 flags->setTextFromFlags(orxonoxGUI); 622 cout << static_cast<CheckButton*>(checkbutton)-> option_name<< " set to: " << static_cast<CheckButton*>(checkbutton)->value << endl;623 } 624 625 /** 626 *Redraws the CheckButton (if option has changed).627 *Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change628 669 cout << static_cast<CheckButton*>(checkbutton)->label << " set to: " << static_cast<CheckButton*>(checkbutton)->value << endl; 670 } 671 672 /** 673 \brief Redraws the CheckButton (if option has changed). 674 Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change 675 */ 629 676 void CheckButton::redraw () 630 677 { … … 635 682 636 683 /** 637 *Creates a new Slider638 \param slidername The data-structure-name of the slider.639 \param start The minimal Value of the slider.640 \param end The maximal Value of the slider.684 \brief Creates a new Slider 685 \param slidername The data-structure-name of the slider. 686 \param start The minimal Value of the slider. 687 \param end The maximal Value of the slider. 641 688 */ 642 689 Slider::Slider (char* slidername, int start, int end) … … 649 696 650 697 /** 651 * Destructs a Slider (not implemented yet) 652 */ 653 Slider::~Slider() 654 { 655 } 656 657 /** 658 * Initializes a Slider with start and end Values 659 * params: see Slider::Slider (char* slidername, int start, int end) 660 */ 698 \brief Initializes a Slider with start and end Values 699 params: see Slider::Slider (char* slidername, int start, int end) 700 */ 661 701 void Slider::init(int start, int end) 662 702 { 663 703 is_option = 2; 664 value = 0; 665 next = NULL; 666 option_name = ""; 667 flag_name = ""; 668 flag_name_short = ""; 669 default_value = 0; 704 705 static_cast<Option*>(this)->init(); 706 670 707 widget = gtk_hscale_new_with_range (start, end, 5); 671 708 } 672 709 673 710 /** 674 *Sets a new Title to the Slider675 \param title The new Name of the slider711 \brief Sets a new Title to the Slider 712 \param title The new Name of the slider 676 713 */ 677 714 void Slider::setTitle(char* title) 678 715 { 679 option_name= title;680 } 681 682 /** 683 *Setting a new value to the Slider.684 *Maybe you also require a Slider::redraw() for this to display685 716 label = title; 717 } 718 719 /** 720 \brief Setting a new value to the Slider. 721 Maybe you also require a Slider::redraw() for this to display 722 */ 686 723 void Slider::setValue(int value) 687 724 { … … 690 727 691 728 /** 692 *Signal OptionChange writes the Value from the Slider to its Object-Database.693 \param widget The widget(Slider) that has a changed Value694 \param slider the Slider-Object that should receive the change.695 729 \brief Signal OptionChange writes the Value from the Slider to its Object-Database. 730 \param widget The widget(Slider) that has a changed Value 731 \param slider the Slider-Object that should receive the change. 732 */ 696 733 gint Slider::OptionChange (GtkWidget *widget, Widget* slider) 697 734 { 698 735 static_cast<Slider*>(slider)->value = (int)gtk_range_get_value (GTK_RANGE ((Slider*)slider->widget)); 699 736 flags->setTextFromFlags(orxonoxGUI); 700 cout << static_cast<Slider*>(slider)-> option_name<< " set to: "<< static_cast<Slider*>(slider)->value << endl;701 } 702 703 /** 704 *Redraws the widget705 *Example: see void CheckButton::redraw ()706 737 cout << static_cast<Slider*>(slider)->label << " set to: "<< static_cast<Slider*>(slider)->value << endl; 738 } 739 740 /** 741 \brief Redraws the widget 742 Example: see void CheckButton::redraw () 743 */ 707 744 void Slider::redraw () 708 745 { … … 713 750 714 751 /** 715 *Creates a Menu-Item-list out of multiple input.716 *!! Consider, that the last input argument has to be "lastItem" for this to work!!717 \param menuname The Database-Name of this Menu718 \param ... items to be added to this Menu. !! Consider, that the last input argument has to be "lastItem" for this to work!!719 752 \brief Creates a Menu-Item-list out of multiple input. 753 !! Consider, that the last input argument has to be "lastItem" for this to work!! 754 \param menuname The Database-Name of this Menu 755 \param ... items to be added to this Menu. !! Consider, that the last input argument has to be "lastItem" for this to work!! 756 */ 720 757 Menu::Menu (char* menuname, ...) 721 758 { … … 737 774 738 775 /** 739 *Initializes a new Menu with no items740 776 \brief Initializes a new Menu with no items 777 */ 741 778 void Menu::init(void) 742 779 { 743 780 is_option = 2; 744 value = 0; 745 next = NULL; 746 flag_name = ""; 747 flag_name_short = ""; 748 default_value = 0; 781 782 static_cast<Option*>(this)->init(); 783 749 784 widget = gtk_option_menu_new (); 750 785 menu = gtk_menu_new (); … … 758 793 void Menu::setTitle(char* title) 759 794 { 760 option_name= title;761 } 762 763 /** 764 *appends a new Item to the Menu-List.765 \param itemName the itemName to be appendet.795 label = title; 796 } 797 798 /** 799 \brief appends a new Item to the Menu-List. 800 \param itemName the itemName to be appendet. 766 801 */ 767 802 void Menu::addItem (char* itemName) … … 772 807 773 808 /** 774 * Signal OptionChange writes the Value from the Menu to its Object-Database. 775 \param widget The widget(Menu) that has a changed Value 776 \param menu the Menu-Object that should receive the change. 777 */gint Menu::OptionChange (GtkWidget *widget, Widget* menu) 809 \brief Signal OptionChange writes the Value from the Menu to its Object-Database. 810 \param widget The widget(Menu) that has a changed Value 811 \param menu the Menu-Object that should receive the change. 812 */ 813 gint Menu::OptionChange (GtkWidget *widget, Widget* menu) 778 814 { 779 815 static_cast<Menu*>(menu)->value = (int)gtk_option_menu_get_history (GTK_OPTION_MENU (menu->widget)); 780 816 flags->setTextFromFlags(orxonoxGUI); 781 cout << static_cast<Menu*>(menu)-> option_name<< " changed to : " << static_cast<Menu*>(menu)->value << endl;782 } 783 784 /** 785 *Redraws the widget786 *Example: see void CheckButton::redraw ()817 cout << static_cast<Menu*>(menu)->label << " changed to : " << static_cast<Menu*>(menu)->value << endl; 818 } 819 820 /** 821 \brief Redraws the widget 822 Example: see void CheckButton::redraw () 787 823 */ 788 824 void Menu::redraw () … … 792 828 793 829 /** 794 *Creates a new default Label with no Text.795 *You migth consider adding Label::setTitle with this.796 830 \brief Creates a new default Label with no Text. 831 You migth consider adding Label::setTitle with this. 832 */ 797 833 Label:: Label () 798 834 { … … 801 837 802 838 /** 803 *Creates a new Label with a Text.804 \param text The text to be displayed.839 \brief Creates a new Label with a Text. 840 \param text The text to be displayed. 805 841 */ 806 842 Label:: Label (char* text) 807 843 { 844 this->init(); 845 this->setText(text); 846 } 847 848 /** 849 \brief initializes a new Label 850 */ 851 void Label::init(void) 852 { 808 853 is_option = 0; 809 next = NULL; 810 widget = gtk_label_new (text); 854 855 static_cast<Widget*>(this)->init(); 856 857 widget = gtk_label_new (""); 811 858 gtk_label_set_line_wrap (GTK_LABEL(widget), TRUE); 812 859 } 813 860 814 /** 815 * Destructs a Label 816 */ 817 Label::~Label () 818 {} 819 820 /** 821 * initializes a new Label 822 */ 823 void Label::init(void) 824 { 825 is_option = 0; 826 next = NULL; 827 widget = gtk_label_new (""); 828 gtk_widget_set_usize (widget, 260, 60); 829 gtk_label_set_line_wrap (GTK_LABEL(widget), TRUE); 830 } 831 832 /** 833 * Sets a new Text to a Label. 834 \param text The text to be inserted into the Label. 835 */ 861 /** 862 \brief Sets a new Text to a Label. 863 \param text The text to be inserted into the Label. 864 */ 836 865 void Label::setText (char * text) 837 866 { 867 label = text; 838 868 gtk_label_set_text (GTK_LABEL (this->widget), text); 839 869 } 840 870 841 871 /** 842 *get the Text of a Label843 \return The Text the Label holds.872 \brief get the Text of a Label 873 \return The Text the Label holds. 844 874 */ 845 875 char* Label::getText () -
orxonox/branches/buerli/gui/orxonox_gui.h
r2595 r2707 7 7 #define _ORXONOX_GUI_H 8 8 9 #if HAVE_CONFIG_H 10 #include <config.h> 11 #endif 12 9 13 #include <stdlib.h> 10 #include <string.h>11 14 #include <gtk/gtkmain.h> 12 15 #include <gtk/gtkwindow.h> … … 34 37 35 38 //! This is the topmost object that can be displayed all others are derived from it. 36 37 39 class Widget 38 40 { 39 41 private: 40 42 public: 43 ~Widget (); 44 41 45 Widget* next; //!< next always points to the next Widget in the list. Every Widget has a next one, or has NULL as next 42 46 GtkWidget* widget; //!< widget is the gtk_widget that the specific Object Contains. 43 v irtual void init(void);47 void init(void); 44 48 int is_option; //!< with this Paramenter one can set the IsOption type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option 45 enum option { containerType = -2, boxType = -1, nothingType = 0, boolType = 1, intType = 2}; //!< defines is_option states 49 /** 50 \briefdefines is_option states 51 */ 52 enum option { containerType = -2, boxType = -1, nothingType = 0, boolType = 1, intType = 2}; 53 char* label; //!< The name of the Widget. Some do display it, Options need it to save; 46 54 void connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *)); 47 55 void connectSignal (char* event, gint (*signal)(GtkWidget*, Widget *)); 48 56 void connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *)); 49 57 void show (); 58 void hide (); 59 void setSize(int width, int height); 50 60 51 61 void walkThrough (void (*function)(Widget*)); … … 55 65 }; 56 66 67 //! This is a Packer Object, which has the ability to Pack other Widgets into itself. 68 class Packer : public Widget 69 { 70 public: 71 Widget* down; //!< this points to the Widget below this. 72 char* groupName; //!< For each Packer you can specify a Groupname under which the lowerWidgets will be saved. 73 74 void init(void); 75 void setGroupName (char* name); 76 char* getGroupName (void); 77 }; 57 78 58 79 //! This is a Container Class, it can contain one sub-Widget: down. … … 62 83 * The derived classes of Container can be displayed 63 84 */ 64 class Container : public Widget85 class Container : public Packer 65 86 { 66 87 private: 67 88 int borderwidth; 68 89 int policy; 69 char* label; 70 71 public: 72 void init(void); 73 Widget* down; //!< this points to the Widget below this. 90 91 public: 92 void init(void); 74 93 // void setBorderWidth (int borderwidth); 75 94 // virtual void setTitle (char* title) = 0; … … 84 103 class Window : public Container 85 104 { 105 private: 106 bool isOpen; 86 107 public: 87 108 Window (char* windowName); 88 109 Window (void); 89 ~Window ();90 110 void init (); 91 111 … … 105 125 Frame (char* frameName); 106 126 Frame (void); 107 ~Frame ();108 127 void init(void); 109 128 … … 120 139 EventBox (char* eventBoxName); 121 140 EventBox (void); 122 ~EventBox ();123 141 void init(void); 124 142 … … 132 150 * A Box is always filled left->right (horizontally) or up->down (vertically) 133 151 */ 134 class Box : public Widget152 class Box : public Packer 135 153 { 136 154 public: 137 155 Box (void); 138 156 Box (char boxtype); 139 ~Box (void);140 157 void init(char boxtype); 141 158 142 Widget* down; //!< the Lower Widget of a Box.143 159 void fill (Widget* lowerWidget); 144 160 … … 154 170 public: 155 171 Image (char* imgaename); 156 ~Image ();157 172 void init(void); 158 173 }; … … 169 184 170 185 int value; //!< every option has a value either true or false (0,1) or something else like 25 for 25% of the volume 171 char* option_name; //!< options have a name, that can be displayed around them172 186 char* flag_name; //!< options have a flag name that will be appendet if you start the Program from the GUI. 173 187 char* flag_name_short; //!< like flag_name but shorter … … 187 201 public: 188 202 Button (char* buttonname); 189 ~Button (void);190 203 void init(void); 191 204 … … 202 215 public: 203 216 CheckButton (char* buttonname); 204 ~CheckButton (void);205 217 static gint OptionChange (GtkWidget* widget, Widget* checkbutton); 206 218 … … 219 231 public: 220 232 Slider (char* slidername,int start, int end); 221 ~Slider ();222 233 void init(int start, int end); 223 234 … … 239 250 public: 240 251 Menu (char* menuname, ...); 241 ~Menu ();242 252 void init(void); 243 253 … … 255 265 Label (); 256 266 Label (char* text); 257 ~Label ();258 267 void init(void); 259 268 -
orxonox/branches/buerli/gui/orxonox_gui_audio.cc
r2595 r2707 33 33 audioFrame = new Frame ("Audio-Options:"); 34 34 audioBox = new Box ('v'); 35 audioFrame->setGroupName ("audio"); 35 36 36 37 enableSound = new CheckButton ("Disable Sound"); -
orxonox/branches/buerli/gui/orxonox_gui_banner.cc
r2595 r2707 63 63 logoEventBox = new EventBox(); 64 64 logoBox = new Box('v'); 65 logoLabel = new Label("OrxOnoX ");65 logoLabel = new Label("OrxOnoX, " PACKAGE_VERSION); 66 66 logoImage = new Image("banner.xpm"); 67 67 logoEventBox->fill(logoImage); … … 88 88 { 89 89 logoWindowIsOpen = 0; 90 logoWindow-> ~Window();90 logoWindow->hide(); 91 91 } 92 92 -
orxonox/branches/buerli/gui/orxonox_gui_exec.cc
r2595 r2707 38 38 execFrame = new Frame ("Execute-Tags:"); 39 39 execBox = new Box ('v'); 40 execFrame->setGroupName ("misc"); 40 41 41 42 start = new Button ("Start"); … … 109 110 CONFIG_FILE = fopen (configFile, "w"); 110 111 if (CONFIG_FILE) 111 writeFileText (widget );112 writeFileText (widget, 0); 112 113 fclose (CONFIG_FILE); 113 114 } … … 116 117 \brief Actually writes into the configuration file to the disk. 117 118 \param widget from which Widget on should be saved. 118 */ 119 void OrxonoxGuiExec::writeFileText (Widget* widget) 120 { 119 \param depth initially "0", and grows higher, while new Groups are bundeled. 120 */ 121 void OrxonoxGuiExec::writeFileText (Widget* widget, int depth) 122 { 123 int counter = 0; 124 while (counter < depth && ((widget->is_option>0 125 && (strcmp (static_cast<Option*>(widget)->flag_name, "") 126 || strcmp (static_cast<Option*>(widget)->flag_name_short, "")) ) 127 || (widget->is_option<0 128 && strcmp (static_cast<Packer*>(widget)->getGroupName(), "")))) 129 { 130 fprintf (CONFIG_FILE, " ", depth); 131 counter++; 132 } 133 134 // check if it is a Packer, and if it is, check if it has a name and if there is something in it. 135 if (widget->is_option <0) 136 { 137 if (strcmp (static_cast<Packer*>(widget)->getGroupName(), "")) 138 { 139 fprintf (CONFIG_FILE, "[%s]\n", static_cast<Packer*>(widget)->getGroupName()); 140 writeFileText (static_cast<Packer*>(widget)->down, depth+1); 141 fprintf(CONFIG_FILE, "\n"); 142 } 143 else 144 { 145 writeFileText (static_cast<Packer*>(widget)->down, depth); 146 } 147 } 148 121 149 if (widget->is_option >= 1) 122 150 if (strcmp (static_cast<Option*>(widget)->flag_name, "") || strcmp (static_cast<Option*>(widget)->flag_name_short, "")) … … 124 152 char Buffer[256]; 125 153 char* space2under; 126 sprintf (Buffer, "%s", static_cast<Option*>(widget)-> option_name);154 sprintf (Buffer, "%s", static_cast<Option*>(widget)->label); 127 155 if (strchr (Buffer, '_')) 128 cout << "Warning Optionname" << Buffer << " is not Valid for Saving, because it includes an underscore" << endl; 156 cout << "Warning Optionname" << Buffer << " is not Valid for Saving, because it includes an underscore" << endl; 129 157 while (space2under = strchr(Buffer, ' ')) 130 158 { … … 133 161 fprintf (CONFIG_FILE, "%s = %i\n", Buffer, static_cast<Option*>(widget)->value); 134 162 } 135 switch (widget->is_option) 136 { 137 case -1: 138 writeFileText (static_cast<Container*>(widget)->down); 139 break; 140 case -2: 141 writeFileText (static_cast<Box*>(widget)->down); 142 break; 143 } 144 163 145 164 if (widget->next != NULL) 146 writeFileText (widget->next );165 writeFileText (widget->next, depth); 147 166 } 148 167 … … 156 175 if (CONFIG_FILE) 157 176 { 177 Widget* groupWidget = widget; 158 178 char Buffer[256] = ""; 159 179 char Variable[256]= ""; … … 161 181 while (fscanf (CONFIG_FILE, "%s", Buffer) != EOF) 162 182 { 183 if (!strncmp (Buffer, "[", 1)) 184 { 185 if ((groupWidget = locateGroup (widget, Buffer, 1))==NULL) 186 { 187 cout << "!!There is no group called " << Buffer << " in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n"; 188 groupWidget = widget; 189 } 190 } 163 191 if (!strcmp (Buffer, "=")) 164 192 { … … 171 199 fscanf (CONFIG_FILE, "%s", Buffer); 172 200 Value = atoi(Buffer); 173 readFileText ( widget, Variable, Value);201 readFileText (groupWidget, Variable, Value, 0); 174 202 sprintf (Variable, ""); 175 203 } … … 179 207 } 180 208 } 181 182 209 /** 183 210 \brief Maps Confugurations to the Options. … … 185 212 \param variableName the name of the Variable that should be set up. 186 213 \param variableValue the Value of the Variable that should be set up 187 */ 188 void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, int variableValue) 214 \param depth the depth of the local Widget 215 */ 216 void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, int variableValue, int depth) 189 217 { 190 218 if (widget->is_option >= 1) 191 if (!strcmp (static_cast<Option*>(widget)-> option_name, variableName))219 if (!strcmp (static_cast<Option*>(widget)->label, variableName)) 192 220 static_cast<Option*>(widget)->value = variableValue; 193 221 194 switch (widget->is_option) 195 { 196 case -1: 197 readFileText (static_cast<Container*>(widget)->down, variableName, variableValue); 198 break; 199 case -2: 200 readFileText (static_cast<Box*>(widget)->down, variableName, variableValue); 201 break; 222 if (widget->is_option < 0) 223 { 224 readFileText (static_cast<Packer*>(widget)->down, variableName, variableValue, depth+1); 202 225 } 203 226 204 if (widget->next != NULL) 205 readFileText (widget->next, variableName, variableValue); 227 if (widget->next != NULL && depth !=0) 228 readFileText (widget->next, variableName, variableValue, depth); 229 } 230 231 /** 232 \brief locates a Group member 233 */ 234 Widget* OrxonoxGuiExec::locateGroup(Widget* widget, char* groupName, int depth) 235 { 236 Widget* tmp; 237 238 // removes the trailing and ending [ ]. 239 if (!strncmp (groupName, "[", 1)) 240 { 241 groupName = groupName+1; 242 groupName[strlen(groupName)-1] = '\0'; 243 } 244 245 if (widget->is_option < 0) 246 { 247 if (!strcmp(groupName, static_cast<Packer*>(widget)->getGroupName())) 248 { 249 return widget; 250 } 251 else 252 { 253 if ((tmp = locateGroup (static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL) 254 return tmp; 255 } 256 } 257 258 if (widget->next != NULL && depth != 0) 259 { 260 if ((tmp = locateGroup (widget->next, groupName, depth)) != NULL) 261 return tmp; 262 } 263 return NULL; 206 264 } 207 265 -
orxonox/branches/buerli/gui/orxonox_gui_exec.h
r2595 r2707 33 33 int shouldsave (); 34 34 void writeToFile (Widget* widget); 35 void writeFileText (Widget* widget );35 void writeFileText (Widget* widget, int depth); 36 36 void readFromFile (Widget* widget); 37 void readFileText (Widget* widget, char* variableName, int variableValue); 37 void readFileText (Widget* widget, char* variableName, int variableValue, int depth); 38 Widget* locateGroup(Widget* widget, char* groupName, int depth); 38 39 39 40 }; -
orxonox/branches/buerli/gui/orxonox_gui_flags.cc
r2595 r2707 39 39 40 40 flagsLabel = new Label (); 41 flagsLabel->setSize (260,60); 41 42 flagsBox->fill (flagsLabel); 42 43 shortFlags = new CheckButton ("shortFlags"); -
orxonox/branches/buerli/gui/orxonox_gui_video.cc
r2595 r2707 32 32 videoFrame = new Frame ("Video-Options:"); 33 33 videoBox = new Box ('v'); 34 videoFrame->setGroupName("video"); 34 35 35 36 fullscreen = new CheckButton ("Fullscreen-mode"); -
orxonox/branches/buerli/src/Makefile.in
r2685 r2707 1 # Makefile.in generated by automake 1. 7.9from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 4 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 20035 # Free Software Foundation, Inc.4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 14 14 15 15 @SET_MAKE@ 16 17 18 SOURCES = $(orxonox_SOURCES) 16 19 17 20 srcdir = @srcdir@ … … 22 25 pkgincludedir = $(includedir)/@PACKAGE@ 23 26 top_builddir = .. 24 25 27 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 26 28 INSTALL = @INSTALL@ … … 36 38 PRE_UNINSTALL = : 37 39 POST_UNINSTALL = : 40 bin_PROGRAMS = orxonox$(EXEEXT) 41 subdir = src 42 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 43 $(srcdir)/Makefile.in INSTALL 44 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 45 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 46 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 47 $(ACLOCAL_M4) 48 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 49 CONFIG_HEADER = $(top_builddir)/config.h 50 CONFIG_CLEAN_FILES = 51 am__installdirs = "$(DESTDIR)$(bindir)" 52 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 53 PROGRAMS = $(bin_PROGRAMS) 54 am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) \ 55 player.$(OBJEXT) data_tank.$(OBJEXT) world_entity.$(OBJEXT) \ 56 vector.$(OBJEXT) camera.$(OBJEXT) collision.$(OBJEXT) \ 57 command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \ 58 track.$(OBJEXT) base_entity.$(OBJEXT) IPhys.$(OBJEXT) 59 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 60 orxonox_LDADD = $(LDADD) 61 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 62 depcomp = $(SHELL) $(top_srcdir)/depcomp 63 am__depfiles_maybe = depfiles 64 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/IPhys.Po \ 65 @AMDEP_TRUE@ ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \ 66 @AMDEP_TRUE@ ./$(DEPDIR)/collision.Po \ 67 @AMDEP_TRUE@ ./$(DEPDIR)/command_node.Po \ 68 @AMDEP_TRUE@ ./$(DEPDIR)/data_tank.Po ./$(DEPDIR)/ini_parser.Po \ 69 @AMDEP_TRUE@ ./$(DEPDIR)/keynames.Po ./$(DEPDIR)/orxonox.Po \ 70 @AMDEP_TRUE@ ./$(DEPDIR)/player.Po ./$(DEPDIR)/track.Po \ 71 @AMDEP_TRUE@ ./$(DEPDIR)/vector.Po ./$(DEPDIR)/world.Po \ 72 @AMDEP_TRUE@ ./$(DEPDIR)/world_entity.Po 73 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 74 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 75 CXXLD = $(CXX) 76 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ 77 -o $@ 78 SOURCES = $(orxonox_SOURCES) 79 DIST_SOURCES = $(orxonox_SOURCES) 80 HEADERS = $(noinst_HEADERS) 81 ETAGS = etags 82 CTAGS = ctags 83 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 38 84 ACLOCAL = @ACLOCAL@ 39 85 AMDEP_FALSE = @AMDEP_FALSE@ … … 90 136 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 91 137 am__include = @am__include@ 138 am__leading_dot = @am__leading_dot@ 92 139 am__quote = @am__quote@ 93 140 bindir = @bindir@ … … 103 150 localstatedir = @localstatedir@ 104 151 mandir = @mandir@ 152 mkdir_p = @mkdir_p@ 105 153 oldincludedir = @oldincludedir@ 106 154 prefix = @prefix@ … … 112 160 AM_CXXFLAGS = "-I/usr/X11R6/include" 113 161 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS) 114 115 116 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"117 bin_PROGRAMS = orxonox118 162 orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc IPhys.cc 119 120 163 noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h IPhys.h 121 subdir = src122 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4123 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs124 CONFIG_HEADER = $(top_builddir)/config.h125 CONFIG_CLEAN_FILES =126 bin_PROGRAMS = orxonox$(EXEEXT)127 PROGRAMS = $(bin_PROGRAMS)128 129 am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) player.$(OBJEXT) \130 data_tank.$(OBJEXT) world_entity.$(OBJEXT) vector.$(OBJEXT) \131 camera.$(OBJEXT) collision.$(OBJEXT) command_node.$(OBJEXT) \132 ini_parser.$(OBJEXT) keynames.$(OBJEXT) track.$(OBJEXT) \133 base_entity.$(OBJEXT) IPhys.$(OBJEXT)134 orxonox_OBJECTS = $(am_orxonox_OBJECTS)135 orxonox_LDADD = $(LDADD)136 orxonox_DEPENDENCIES =137 orxonox_LDFLAGS =138 139 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)140 depcomp = $(SHELL) $(top_srcdir)/depcomp141 am__depfiles_maybe = depfiles142 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/IPhys.Po ./$(DEPDIR)/base_entity.Po \143 @AMDEP_TRUE@ ./$(DEPDIR)/camera.Po ./$(DEPDIR)/collision.Po \144 @AMDEP_TRUE@ ./$(DEPDIR)/command_node.Po \145 @AMDEP_TRUE@ ./$(DEPDIR)/data_tank.Po ./$(DEPDIR)/ini_parser.Po \146 @AMDEP_TRUE@ ./$(DEPDIR)/keynames.Po ./$(DEPDIR)/orxonox.Po \147 @AMDEP_TRUE@ ./$(DEPDIR)/player.Po ./$(DEPDIR)/track.Po \148 @AMDEP_TRUE@ ./$(DEPDIR)/vector.Po ./$(DEPDIR)/world.Po \149 @AMDEP_TRUE@ ./$(DEPDIR)/world_entity.Po150 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \151 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)152 CXXLD = $(CXX)153 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \154 -o $@155 DIST_SOURCES = $(orxonox_SOURCES)156 HEADERS = $(noinst_HEADERS)157 158 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in INSTALL \159 Makefile.am160 SOURCES = $(orxonox_SOURCES)161 162 164 all: all-am 163 165 164 166 .SUFFIXES: 165 167 .SUFFIXES: .cc .o .obj 166 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 168 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) 169 @for dep in $?; do \ 170 case '$(am__configure_deps)' in \ 171 *$$dep*) \ 172 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ 173 && exit 0; \ 174 exit 1;; \ 175 esac; \ 176 done; \ 177 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ 167 178 cd $(top_srcdir) && \ 168 179 $(AUTOMAKE) --gnu src/Makefile 169 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 170 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) 171 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 180 .PRECIOUS: Makefile 181 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 182 @case '$?' in \ 183 *config.status*) \ 184 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ 185 *) \ 186 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ 187 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ 188 esac; 189 190 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 191 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 192 193 $(top_srcdir)/configure: $(am__configure_deps) 194 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 195 $(ACLOCAL_M4): $(am__aclocal_m4_deps) 196 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 172 197 install-binPROGRAMS: $(bin_PROGRAMS) 173 198 @$(NORMAL_INSTALL) 174 $(mkinstalldirs) $(DESTDIR)$(bindir)199 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 175 200 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 176 201 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 178 203 ; then \ 179 204 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 180 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \181 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \205 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 206 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 182 207 else :; fi; \ 183 208 done … … 187 212 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 188 213 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 189 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \190 rm -f $(DESTDIR)$(bindir)/$$f; \214 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 215 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 191 216 done 192 217 … … 198 223 199 224 mostlyclean-compile: 200 -rm -f *.$(OBJEXT) core *.core225 -rm -f *.$(OBJEXT) 201 226 202 227 distclean-compile: … … 219 244 220 245 .cc.o: 221 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ 222 @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ 223 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ 224 @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ 225 @am__fastdepCXX_TRUE@ fi 246 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 247 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 226 248 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 227 249 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ 228 250 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 229 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<251 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< 230 252 231 253 .cc.obj: 232 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ 233 @am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ 234 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ 235 @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ 236 @am__fastdepCXX_TRUE@ fi 254 @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ 255 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 237 256 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 238 257 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ 239 258 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 240 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ ` if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`259 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` 241 260 uninstall-info-am: 242 243 ETAGS = etags244 ETAGSFLAGS =245 246 CTAGS = ctags247 CTAGSFLAGS =248 249 tags: TAGS250 261 251 262 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) … … 257 268 END { for (i in files) print i; }'`; \ 258 269 mkid -fID $$unique 270 tags: TAGS 259 271 260 272 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 268 280 $(AWK) ' { files[$$0] = 1; } \ 269 281 END { for (i in files) print i; }'`; \ 270 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 271 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 272 $$tags $$unique 273 282 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 283 test -n "$$unique" || unique=$$empty_fix; \ 284 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 285 $$tags $$unique; \ 286 fi 274 287 ctags: CTAGS 275 288 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 294 307 distclean-tags: 295 308 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 296 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)297 298 top_distdir = ..299 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)300 309 301 310 distdir: $(DISTFILES) … … 311 320 if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 312 321 dir="/$$dir"; \ 313 $(mk installdirs) "$(distdir)$$dir"; \322 $(mkdir_p) "$(distdir)$$dir"; \ 314 323 else \ 315 324 dir=''; \ … … 329 338 check: check-am 330 339 all-am: Makefile $(PROGRAMS) $(HEADERS) 331 332 340 installdirs: 333 $(mkinstalldirs) $(DESTDIR)$(bindir) 341 for dir in "$(DESTDIR)$(bindir)"; do \ 342 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 343 done 334 344 install: install-am 335 345 install-exec: install-exec-am … … 370 380 dvi-am: 371 381 382 html: html-am 383 372 384 info: info-am 373 385 … … 405 417 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ 406 418 clean-generic ctags distclean distclean-compile \ 407 distclean-generic distclean-tags distdir dvi dvi-am info\408 info-am install install-am install-binPROGRAMS install-data\409 install-data -am install-exec install-exec-am install-info\410 install-info -am install-man install-strip installcheck\411 installcheck -am installdirs maintainer-clean \419 distclean-generic distclean-tags distdir dvi dvi-am html \ 420 html-am info info-am install install-am install-binPROGRAMS \ 421 install-data install-data-am install-exec install-exec-am \ 422 install-info install-info-am install-man install-strip \ 423 installcheck installcheck-am installdirs maintainer-clean \ 412 424 maintainer-clean-generic mostlyclean mostlyclean-compile \ 413 425 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ -
orxonox/branches/buerli/src/camera.cc
r2551 r2707 27 27 This standard constructor sets all parameters to zero 28 28 */ 29 Camera::Camera () 30 { 29 Camera::Camera (World* world) 30 { 31 this->world = world; 31 32 bound = NULL; 32 33 /* give it some physical live */ … … 36 37 fs = new Vector(0.0, 0.0, 0.0); 37 38 cameraMode = NORMAL; 38 39 39 deltaTime = 3000.0; 40 40 cameraOffset = 1.0; … … 179 179 /* the camera is handled like an entity and rolls on the track */ 180 180 case NORMAL: 181 Orxonox *orx = Orxonox::getInstance();182 181 Location lookat; 183 if( bound != NULL )182 if( bound != NULL && world != NULL ) 184 183 { 185 184 bound->get_lookat (&lookat); 186 orx->get_world()->calc_camera_pos (&lookat, &desired_place);185 world->calc_camera_pos (&lookat, &desired_place); 187 186 } 188 187 else … … 293 292 } 294 293 } 294 295 296 void Camera::setWorld(World* world) 297 { 298 this->world = world; 299 } -
orxonox/branches/buerli/src/camera.h
r2551 r2707 10 10 11 11 class WorldEntity; 12 class World; 12 13 13 14 //! Camera 14 15 /** 15 16 17 18 19 16 This class controls the viewpoint from which the World is rendered. To use the 17 Camera it has to be bound to a WorldEntity which serves as the reference focus 18 point. The Camera itself calls the WorldEntity::get_lookat() and 19 World::calc_camera_pos() functions to calculate the position it currently should 20 be in. 20 21 */ 21 22 … … 27 28 Placement actual_place; //!< the Camera's current position 28 29 Placement desired_place; //!< where the Camera should be according to calculations 30 World* world; 29 31 30 32 /* physical system - not needed yet */ … … 49 51 Quaternion *res; 50 52 53 54 CAMERA_MODE cameraMode; //!< saves the camera mode: how the camera follows the entity 55 56 void update_desired_place (); 57 58 public: 59 Camera (World* world); 60 ~Camera (); 61 62 void time_slice (Uint32 deltaT); 63 void apply (); 64 void bind (WorldEntity* entity); 65 void jump (Placement* plc); 51 66 52 CAMERA_MODE cameraMode; //!< saves the camera mode: how the camera follows the entity 53 54 void update_desired_place (); 55 56 public: 57 Camera (); 58 ~Camera (); 59 60 void time_slice (Uint32 deltaT); 61 void apply (); 62 void bind (WorldEntity* entity); 63 void jump (Placement* plc); 67 void setWorld(World* world); 64 68 65 69 }; -
orxonox/branches/buerli/src/command_node.cc
r2551 r2707 19 19 #include "ini_parser.h" 20 20 #include "world_entity.h" 21 #include "game_loader.h" 21 22 22 23 #include <stdio.h> … … 27 28 28 29 /** 29 30 30 \brief constructs a CommandNode to handle remote input 31 \param ID: unique denumerator to identify the node in the network 31 32 */ 32 33 CommandNode::CommandNode (int ID) 33 34 { 34 35 36 37 38 } 39 40 /** 41 42 35 bound = new List<WorldEntity>(); 36 aliases = NULL; 37 netID = ID; 38 bLocalInput = false; 39 } 40 41 /** 42 \brief constructs a CommandNode to handle local input 43 \param filename: The path and name of the file to load the key bindings from 43 44 */ 44 45 CommandNode::CommandNode (char* filename = DEFAULT_KEYBIND_FILE) 45 46 { 46 47 48 49 50 51 } 52 53 /** 54 47 aliases = NULL; 48 bLocalInput = true; 49 netID = 0; 50 bound = new List<WorldEntity>(); 51 load_bindings (filename); 52 } 53 54 /** 55 \brief removes the CommandNode from memory 55 56 */ 56 57 CommandNode::~CommandNode () 57 58 { 58 59 60 } 61 62 /** 63 64 59 if( aliases != NULL) free (aliases); 60 if( bound != NULL) delete bound; 61 } 62 63 /** 64 \brief loads new key bindings from a file 65 \param filename: The path and name of the file to load the bindings from 65 66 */ 66 67 void CommandNode::load_bindings (char* filename) 67 68 { 68 FILE* stream; 69 70 printf("Loading key bindings from %s\n", filename); 71 72 if( filename == NULL) filename = DEFAULT_KEYBIND_FILE; 73 74 // remove old bindings if present 75 if( aliases != NULL) 69 FILE* stream; 70 71 printf("Loading key bindings from %s\n", filename); 72 73 if( filename == NULL) filename = DEFAULT_KEYBIND_FILE; 74 75 // remove old bindings if present 76 if( aliases != NULL) 77 { 78 free (aliases); 79 aliases = NULL; 80 } 81 82 // create parser 83 IniParser parser (filename); 84 if( parser.get_section ("Bindings") == -1) 85 { 86 printf("Could not find key bindings in %s\n", filename); 87 return; 88 } 89 // allocate empty lookup table 90 aliases = (KeyBindings*) calloc (1, sizeof (KeyBindings)); 91 92 char namebuf[256]; 93 char valuebuf[256]; 94 memset (namebuf, 0, 256); 95 memset (valuebuf, 0, 256); 96 int* index; 97 98 while( parser.next_var (namebuf, valuebuf) != -1) 99 { 100 index = name_to_index (namebuf); 101 switch( index[0]) 76 102 { 77 free (aliases); 78 aliases = NULL; 103 case 0: 104 printf("Key binding %d(%s) set to %s\n", index[1], SDLK_to_keyname( index[1]), valuebuf); 105 strcpy (aliases->keys[index[1]], valuebuf); 106 break; 107 case 1: 108 printf("Button binding %d(%s) set to %s\n", index[1], SDLB_to_buttonname( index[1]), valuebuf); 109 strcpy (aliases->buttons[index[1]], valuebuf); 110 break; 111 default: 112 break; 79 113 } 80 81 // create parser 82 IniParser parser (filename); 83 if( parser.get_section ("Bindings") == -1) 114 memset (namebuf, 0, 256); 115 memset (valuebuf, 0, 256); 116 } 117 } 118 119 /** 120 \brief binds a WorldEntity to the CommandNode 121 \param entity: Pointer to the entity to bind 122 */ 123 void CommandNode::bind (WorldEntity* entity) 124 { 125 bound->add (entity, LIST_ADD_NEXT, true); 126 } 127 128 /** 129 \brief removes an entity from the list of the CommandNode 130 \param entity: Pointer to the entity to relese 131 */ 132 void CommandNode::unbind (WorldEntity* entity) 133 { 134 bound->remove (entity, LIST_FIND_FW); 135 } 136 137 int* CommandNode::name_to_index (char* name) 138 { 139 coord[0] = -1; 140 coord[1] = -1; 141 int c; 142 if( (c = keyname_to_SDLK (name)) != -1) 143 { 144 coord[1] = c; 145 coord[0] = 0; 146 } 147 if( (c = buttonname_to_SDLB (name)) != -1) 148 { 149 coord[1] = c; 150 coord[0] = 1; 151 } 152 return coord; 153 } 154 155 /** 156 \brief tells the CommandNode to run through all pending events and relay them accordingly 157 */ 158 void CommandNode::process () 159 { 160 if( bLocalInput) process_local (); 161 else process_network (); 162 } 163 164 void CommandNode::process_local () 165 { 166 SDL_Event event; 167 Command cmd; 168 169 while( SDL_PollEvent (&event)) 170 { 171 memset (cmd.cmd, 0, CMD_LENGHT); 172 switch( event.type) 84 173 { 85 printf("Could not find key bindings in %s\n", filename); 86 return; 174 case SDL_KEYDOWN: 175 strcpy (cmd.cmd, aliases->keys[event.key.keysym.sym]); 176 cmd.bUp = false; 177 if( strlen (cmd.cmd) > 0) relay (&cmd); 178 break; 179 case SDL_KEYUP: 180 strcpy( cmd.cmd, aliases->keys[event.key.keysym.sym]); 181 cmd.bUp = true; 182 if( strlen (cmd.cmd) > 0) relay (&cmd); 183 break; 184 case SDL_MOUSEMOTION: 185 strcpy( cmd.cmd, "cursor"); 186 cmd.x = event.motion.x; 187 cmd.y = event.motion.y; 188 cmd.xrel = event.motion.xrel; 189 cmd.yrel = event.motion.yrel; 190 break; 191 case SDL_MOUSEBUTTONUP: 192 strcpy( cmd.cmd, aliases->buttons[event.button.button]); 193 cmd.bUp = true; 194 if( strlen (cmd.cmd) > 0) relay (&cmd); 195 break; 196 case SDL_MOUSEBUTTONDOWN: 197 strcpy( cmd.cmd, aliases->buttons[event.button.button]); 198 cmd.bUp = false; 199 if( strlen (cmd.cmd) > 0) relay (&cmd); 200 break; 201 case SDL_JOYAXISMOTION: 202 case SDL_JOYBALLMOTION: 203 case SDL_JOYHATMOTION: 204 case SDL_JOYBUTTONDOWN: 205 case SDL_JOYBUTTONUP: 206 break; 207 default: 208 Orxonox *orx = Orxonox::getInstance(); 209 orx->event_handler (&event); 210 211 break; 87 212 } 88 // allocate empty lookup table 89 aliases = (KeyBindings*) calloc (1, sizeof (KeyBindings)); 90 91 char namebuf[256]; 92 char valuebuf[256]; 93 memset (namebuf, 0, 256); 94 memset (valuebuf, 0, 256); 95 int* index; 96 97 while( parser.next_var (namebuf, valuebuf) != -1) 98 { 99 index = name_to_index (namebuf); 100 switch( index[0]) 101 { 102 case 0: 103 printf("Key binding %d(%s) set to %s\n", index[1], SDLK_to_keyname( index[1]), valuebuf); 104 strcpy (aliases->keys[index[1]], valuebuf); 105 break; 106 case 1: 107 printf("Button binding %d(%s) set to %s\n", index[1], SDLB_to_buttonname( index[1]), valuebuf); 108 strcpy (aliases->buttons[index[1]], valuebuf); 109 break; 110 default: 111 break; 112 } 113 memset (namebuf, 0, 256); 114 memset (valuebuf, 0, 256); 115 } 116 } 117 118 /** 119 \brief binds a WorldEntity to the CommandNode 120 \param entity: Pointer to the entity to bind 121 */ 122 void CommandNode::bind (WorldEntity* entity) 123 { 124 bound->add (entity, LIST_ADD_NEXT, true); 125 } 126 127 /** 128 \brief removes an entity from the list of the CommandNode 129 \param entity: Pointer to the entity to relese 130 */ 131 void CommandNode::unbind (WorldEntity* entity) 132 { 133 bound->remove (entity, LIST_FIND_FW); 134 } 135 136 int* CommandNode::name_to_index (char* name) 137 { 138 coord[0] = -1; 139 coord[1] = -1; 140 int c; 141 if( (c = keyname_to_SDLK (name)) != -1) 142 { 143 coord[1] = c; 144 coord[0] = 0; 145 } 146 if( (c = buttonname_to_SDLB (name)) != -1) 147 { 148 coord[1] = c; 149 coord[0] = 1; 150 } 151 return coord; 152 } 153 154 /** 155 \brief tells the CommandNode to run through all pending events and relay them accordingly 156 */ 157 void CommandNode::process () 158 { 159 if( bLocalInput) process_local (); 160 else process_network (); 161 } 162 163 void CommandNode::process_local () 164 { 165 SDL_Event event; 166 Command cmd; 167 168 while( SDL_PollEvent (&event)) 169 { 170 memset (cmd.cmd, 0, CMD_LENGHT); 171 switch( event.type) 172 { 173 case SDL_KEYDOWN: 174 strcpy (cmd.cmd, aliases->keys[event.key.keysym.sym]); 175 cmd.bUp = false; 176 if( strlen (cmd.cmd) > 0) relay (&cmd); 177 break; 178 case SDL_KEYUP: 179 strcpy( cmd.cmd, aliases->keys[event.key.keysym.sym]); 180 cmd.bUp = true; 181 if( strlen (cmd.cmd) > 0) relay (&cmd); 182 break; 183 case SDL_MOUSEMOTION: 184 strcpy( cmd.cmd, "cursor"); 185 cmd.x = event.motion.x; 186 cmd.y = event.motion.y; 187 cmd.xrel = event.motion.xrel; 188 cmd.yrel = event.motion.yrel; 189 break; 190 case SDL_MOUSEBUTTONUP: 191 strcpy( cmd.cmd, aliases->buttons[event.button.button]); 192 cmd.bUp = true; 193 if( strlen (cmd.cmd) > 0) relay (&cmd); 194 break; 195 case SDL_MOUSEBUTTONDOWN: 196 strcpy( cmd.cmd, aliases->buttons[event.button.button]); 197 cmd.bUp = false; 198 if( strlen (cmd.cmd) > 0) relay (&cmd); 199 break; 200 case SDL_JOYAXISMOTION: 201 case SDL_JOYBALLMOTION: 202 case SDL_JOYHATMOTION: 203 case SDL_JOYBUTTONDOWN: 204 case SDL_JOYBUTTONUP: 205 break; 206 default: 207 Orxonox *orx = Orxonox::getInstance(); 208 orx->event_handler (&event); 209 break; 210 } 211 } 213 } 212 214 } 213 215 … … 219 221 void CommandNode::relay (Command* cmd) 220 222 { 221 printf("CommandNode|relay()\n"); 222 List<WorldEntity>* plist = bound; 223 224 Orxonox *orx = Orxonox::getInstance(); 225 if( orx->system_command (cmd)) return; 226 227 if( bLocalInput) send_over_network (cmd); 228 229 while( (plist = plist->get_next()) != NULL) 230 { 231 plist->get_object()->command (cmd); 232 } 233 } 234 235 /** 236 \brief sets the network identifier of the CommandNode 237 \param ID: the new ID to use 223 //printf("CommandNode|relay()\n"); 224 List<WorldEntity>* plist = bound; 225 226 Orxonox *orx = Orxonox::getInstance(); 227 if( orx->system_command (cmd)) return; 228 GameLoader* gl = GameLoader::getInstance(); 229 if(gl->worldCommand(cmd)) return; 230 231 if( bLocalInput) send_over_network (cmd); 232 233 while( (plist = plist->get_next()) != NULL) 234 { 235 plist->get_object()->command (cmd); 236 } 237 } 238 239 /** 240 \brief sets the network identifier of the CommandNode 241 \param ID: the new ID to use 238 242 */ 239 243 void CommandNode::set_netID (int ID) 240 244 { 241 245 netID = ID; 242 246 } 243 247 -
orxonox/branches/buerli/src/error.h
r2551 r2707 22 22 */ 23 23 24 // this are the two undefined error nr. Don't use them ... 25 #define ERROR -1 26 #define NERROR 0 24 27 25 #define ERROR -1 26 #define NO_ERROR 0 28 /*! 29 \brief Error Definitions: 30 31 Error Classes: 32 0xx application framework codes 33 1xx graphics codes 34 2xx file/FS codes 35 3xx network codes 36 4xx general codes 37 38 Error Specifier 1: 39 x0x action finsished as desired 40 x1x initialisation error 41 x2x execution error 42 x3x uninitialisation error 43 44 Error Specifier 2: 45 xx0 no further informations 46 xx1 only a warning - feel free to ignore, the program will proceed 47 xx2 this could lead unexpected behaviour 48 xx3 this is a fatal error - you are invited to quit the program - panic! 49 */ 50 51 typedef struct 52 { 53 int code; 54 char* message; 55 char* location; 56 } Error; -
orxonox/branches/buerli/src/list.h
r2077 r2707 1 /* 2 orxonox - the future of 3D-vertical-scrollers 3 4 Copyright (C) 2004 orx 5 6 This program is free software; you can redistribute it and/or modify 7 it under the terms of the GNU General Public License as published by 8 the Free Software Foundation; either version 2, or (at your option) 9 any later version. 10 11 ### File Specific: 12 main-programmer: Christian Meyer 13 14 ADDONS/FIXES: 15 16 Patrick Boenzli : Implemented getSize() function 17 */ 18 19 1 20 /*! 2 21 \file list.h … … 21 40 List<T>* prev; 22 41 bool bReference; 42 int size; 23 43 24 44 public: … … 35 55 void set_prev (List<T>* ptr); 36 56 int remove (T* obj, FINDMODE mode); 57 int getSize(); 37 58 }; 38 59 … … 52 73 prev = p; 53 74 bReference = bRef; 75 if(obj != NULL) 76 ++size; 54 77 } 55 78 … … 127 150 break; 128 151 } 152 ++size; 129 153 return 0; 130 154 } … … 224 248 } 225 249 } 250 --size; 226 251 return 0; 227 252 } … … 262 287 263 288 289 /** 290 \brief Returns the current size of the List 291 \return Size of List 292 */ 293 template<class T> 294 int List<T>::getSize() 295 { 296 return this->size; 297 } 264 298 265 299 #endif -
orxonox/branches/buerli/src/orxonox.cc
r2551 r2707 29 29 #include "data_tank.h" 30 30 #include "command_node.h" 31 #include "game_loader.h" 31 32 #include <string.h> 32 33 … … 34 35 35 36 /** 36 37 \brief create a new Orxonox 37 38 */ 38 39 Orxonox::Orxonox () … … 42 43 43 44 /** 44 45 \brief remove Orxonox from memory 45 46 */ 46 47 Orxonox::~Orxonox () 47 48 { 48 49 50 51 52 49 Orxonox::singleton_ref = NULL; 50 if( world != NULL) delete world; 51 if( localinput != NULL) delete world; 52 if( localcamera != NULL) delete localcamera; 53 if( resources != NULL) delete resources; 53 54 } 54 55 … … 65 66 66 67 /** 67 68 69 70 71 68 \brief this finds the config file 69 70 Since the config file varies from user to user and since one may want to specify different config files 71 for certain occasions or platforms this function finds the right config file for every occasion and stores 72 it's path and name into configfilename 72 73 */ 73 74 void Orxonox::get_config_file (int argc, char** argv) 74 75 { 75 /* char* path;76 77 78 79 80 81 82 83 84 85 86 87 } 88 89 /** 90 76 /* char* path; 77 #ifdef __WIN32__ 78 path = getenv(""); 79 #else 80 path = getenv("HOME"); 81 #endif 82 83 if( path != NULL) strcpy (configfilename, path); 84 else strcpy (configfilename, "./"); 85 strcat (configfilename, "/.orxonox.conf");*/ 86 87 strcpy (configfilename, "orxonox.conf"); 88 } 89 90 /** 91 \brief initialize Orxonox with command line 91 92 */ 92 93 int Orxonox::init (int argc, char** argv) 93 94 { 94 95 96 97 98 99 95 // parse command line 96 // config file 97 98 get_config_file (argc, argv); 99 100 // initialize SDL 100 101 printf("> Initializing SDL\n"); 101 102 if( SDL_Init (SDL_INIT_EVERYTHING) == -1) 102 {103 printf ("Could not SDL_Init(): %s\n", SDL_GetError());104 return -1;105 }106 107 103 { 104 printf ("Could not SDL_Init(): %s\n", SDL_GetError()); 105 return -1; 106 } 107 108 // initialize everything 108 109 printf("> Initializing video\n"); 109 110 if( init_video () == -1) return -1; 110 111 printf("> Initializing sound\n"); 111 112 if( init_sound () == -1) return -1; 112 113 printf("> Initializing input\n"); 113 114 if( init_input () == -1) return -1; 114 115 printf("> Initializing networking\n"); 115 116 if( init_networking () == -1) return -1; 116 117 printf("> Initializing resources\n"); 117 118 printf("> Initializing world\n");119 if( init_world () == -1) return -1; 120 121 122 } 123 124 /** 125 118 if( init_resources () == -1) return -1; 119 //printf("> Initializing world\n"); 120 //if( init_world () == -1) return -1; PB: world will be initialized when started 121 122 return 0; 123 } 124 125 /** 126 \brief initializes SDL and OpenGL 126 127 */ 127 128 int Orxonox::init_video () … … 161 162 162 163 // create camera 163 localcamera = new Camera( );164 165 return 0; 166 } 167 168 /** 169 164 localcamera = new Camera(world); 165 166 return 0; 167 } 168 169 /** 170 \brief initializes the sound engine 170 171 */ 171 172 int Orxonox::init_sound () 172 173 { 173 174 175 } 176 177 /** 178 174 printf("Not yet implemented\n"); 175 return 0; 176 } 177 178 /** 179 \brief initializes input functions 179 180 */ 180 181 int Orxonox::init_input () 181 182 { 182 183 184 185 186 } 187 188 /** 189 183 // create localinput 184 localinput = new CommandNode( configfilename); 185 186 return 0; 187 } 188 189 /** 190 \brief initializes network system 190 191 */ 191 192 int Orxonox::init_networking () 192 193 { 193 194 195 } 196 197 /** 198 194 printf("Not yet implemented\n"); 195 return 0; 196 } 197 198 /** 199 \brief initializes and loads resource files 199 200 */ 200 201 int Orxonox::init_resources () 201 202 { 202 203 204 } 205 206 /** 207 203 printf("Not yet implemented\n"); 204 return 0; 205 } 206 207 /** 208 \brief initializes the world 208 209 */ 209 210 int Orxonox::init_world () 210 211 { 211 world = new World(); 212 213 // TO DO: replace this with a menu/intro 214 world->load_debug_level(); 215 216 return 0; 217 } 218 219 /** 220 \brief exits Orxonox 212 //world = new World(); 213 214 // TO DO: replace this with a menu/intro 215 //world->load_debug_level(); 216 217 return 0; 218 } 219 220 221 /** 222 \brief starts the orxonox game or menu 223 224 here is the central orxonox state manager. There are currently two states 225 - menu 226 - game-play 227 both states manage their states themselfs again. 228 */ 229 void Orxonox::start() 230 { 231 232 this->gameLoader = GameLoader::getInstance(); 233 this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0); 234 this->gameLoader->init(); 235 this->gameLoader->start(); 236 } 237 238 /** 239 \brief exits Orxonox 221 240 */ 222 241 void Orxonox::quitGame() 223 242 { 224 225 } 226 227 /** 228 243 bQuitOrxonox = true; 244 } 245 246 /** 247 \brief this runs all of Orxonox 229 248 */ 230 249 void Orxonox::mainLoop() … … 236 255 while( !bQuitOrxonox) 237 256 { 238 printf("<==");239 240 257 // Network 241 258 synchronize(); … … 248 265 // Draw 249 266 display(); 250 251 printf(">\n");252 267 } 253 268 printf("Orxonox|Exiting the main loop\n"); … … 255 270 256 271 /** 257 258 272 \brief handles sprecial events from localinput 273 \param event: an event not handled by the CommandNode 259 274 */ 260 275 void Orxonox::event_handler (SDL_Event* event) 261 276 { 262 263 } 264 265 /** 266 277 // Handle special events such as reshape, quit, focus changes 278 } 279 280 /** 281 \brief synchronize local data with remote data 267 282 */ 268 283 void Orxonox::synchronize () 269 284 { 270 271 272 } 273 274 /** 275 285 // Get remote input 286 // Update synchronizables 287 } 288 289 /** 290 \brief run all input processing 276 291 */ 277 292 void Orxonox::handle_input () 278 293 { 279 280 281 282 } 283 284 /** 285 294 // localinput 295 localinput->process(); 296 // remoteinput 297 } 298 299 /** 300 \brief advance the timeline 286 301 */ 287 302 void Orxonox::time_slice () … … 295 310 { 296 311 float fps = 1000/dt; 297 printf(" %f", fps);312 printf("fps = %f\n", fps); 298 313 } 299 314 … … 306 321 307 322 /** 308 323 \brief compute collision detection 309 324 */ 310 325 void Orxonox::collision () 311 326 { 312 313 } 314 315 /** 316 317 318 327 world->collide (); 328 } 329 330 /** 331 \brief handle keyboard commands that are not meant for WorldEntities 332 \param cmd: the command to handle 333 \return true if the command was handled by the system or false if it may be passed to the WorldEntities 319 334 */ 320 335 bool Orxonox::system_command (Command* cmd) 321 336 { 322 323 324 if( !cmd->bUp) bQuitOrxonox = true;325 326 327 328 } 329 330 /** 331 337 if( !strcmp( cmd->cmd, "quit")) 338 { 339 if( !cmd->bUp) this->gameLoader->stop(); 340 return true; 341 } 342 return false; 343 } 344 345 /** 346 \brief render the current frame 332 347 */ 333 348 void Orxonox::display () 334 349 { 335 336 337 338 339 340 341 342 343 344 } 345 346 /** 347 348 350 // clear buffer 351 glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); 352 // set camera 353 localcamera->apply (); 354 // draw world 355 world->draw (); 356 // draw HUD 357 // flip buffers 358 SDL_GL_SwapBuffers(); 359 } 360 361 /** 362 \brief retrieve a pointer to the local Camera 363 \return a pointer to localcamera 349 364 */ 350 365 Camera* Orxonox::get_camera () 351 366 { 352 353 } 354 355 /** 356 357 367 return localcamera; 368 } 369 370 /** 371 \brief retrieve a pointer to the local CommandNode 372 \return a pointer to localinput 358 373 */ 359 374 CommandNode* Orxonox::get_localinput () 360 375 { 361 362 } 363 364 /** 365 366 376 return localinput; 377 } 378 379 /** 380 \brief retrieve a pointer to the local World 381 \return a pointer to world 367 382 */ 368 383 World* Orxonox::get_world () 369 384 { 370 385 return world; 371 386 } 372 387 373 388 int main (int argc, char** argv) 374 389 { 375 390 printf(">>> Starting Orxonox <<<\n"); 376 391 Orxonox *orx = Orxonox::getInstance(); 377 392 378 393 if( (*orx).init(argc, argv) == -1) 379 { 380 printf("! Orxonox initialization failed\n"); 381 return -1; 382 } 383 384 (*orx).mainLoop(); 385 394 { 395 printf("! Orxonox initialization failed\n"); 396 return -1; 397 } 398 399 //(*orx).mainLoop(); 400 401 orx->start(); 402 386 403 //delete orx; 387 404 -
orxonox/branches/buerli/src/orxonox.conf
r2190 r2707 6 6 SPACE=fire 7 7 ESCAPE=quit 8 p=pause 8 9 q=quit 9 10 BUTTON_LEFT=fire 10 11 BUTTON_RIGHT=altfire 11 12 b=benscho 13 x=up_world 14 z=down_world 15 -
orxonox/branches/buerli/src/orxonox.h
r2190 r2707 16 16 class World; 17 17 class Camera; 18 class GameLoader; 18 19 19 20 //! Orxonox core singleton class … … 33 34 Camera* localcamera; 34 35 SDL_Surface* screen; 36 GameLoader* gameLoader; 35 37 36 38 bool bQuitOrxonox; 37 39 bool pause; 38 39 40 41 42 40 Uint32 lastframe; 41 42 void get_config_file (int argc, char** argv); 43 44 // main loop functions 43 45 void synchronize (); 44 46 void handle_input (); … … 57 59 public: 58 60 static Orxonox* getInstance (); 61 void start(); 59 62 void quitGame(); 60 63 … … 63 66 64 67 int init (int argc, char** argv); 65 66 67 68 69 68 69 CommandNode* get_localinput(); 70 Camera* get_camera(); 71 World* get_world(); 72 70 73 void mainLoop(); 71 74 }; -
orxonox/branches/buerli/src/player.cc
r2551 r2707 62 62 void Player::command (Command* cmd) 63 63 { 64 65 66 67 68 69 64 //printf("Player|recieved command [%s]\n", cmd->cmd); 65 if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp; 66 else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp; 67 else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp; 68 else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp; 69 else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp; 70 70 } 71 71 72 72 void Player::draw () 73 { 73 { 74 74 glMatrixMode(GL_MODELVIEW); 75 75 glLoadIdentity(); -
orxonox/branches/buerli/src/stdincl.h
r2551 r2707 15 15 #include "coordinates.h" 16 16 #include "list.h" 17 #include "error.h" 17 18 #include "message_structures.h" 18 19 #include "orxonox.h" -
orxonox/branches/buerli/src/track.cc
r2551 r2707 52 52 { 53 53 } 54 55 void Track::init() 56 { 57 58 } 59 54 60 55 61 /** -
orxonox/branches/buerli/src/track.h
r2551 r2707 27 27 28 28 public: 29 29 Track (); 30 30 Track (Uint32 number, Uint32 next, Vector* start, Vector* finish); 31 31 ~Track (); 32 33 virtual void post_enter (WorldEntity* entity); // handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght) 34 virtual void post_leave (WorldEntity* entity); 35 virtual void tick (float deltaT); 36 virtual void map_camera (Location* lookat, Placement* camplc); 37 virtual bool map_coords (Location* loc, Placement* plc); // this should return true if the entity left track boundaries 32 virtual void init(); 33 34 virtual void post_enter (WorldEntity* entity); // handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght) 35 virtual void post_leave (WorldEntity* entity); 36 virtual void tick (float deltaT); 37 virtual void map_camera (Location* lookat, Placement* camplc); 38 virtual bool map_coords (Location* loc, Placement* plc); // this should return true if the entity left track boundaries 38 39 }; 39 40 -
orxonox/branches/buerli/src/world.cc
r2551 r2707 31 31 This creates a new empty world! 32 32 */ 33 World::World () 34 { 35 entities = new List<WorldEntity>(); 33 World::World (char* name) 34 { 35 this->worldName = name; 36 this->debugWorldNr = -1; 37 this->entities = new List<WorldEntity>(); 38 } 39 40 World::World (int worldID) 41 { 42 this->debugWorldNr = worldID; 43 this->worldName = NULL; 44 this->entities = new List<WorldEntity>(); 36 45 } 37 46 … … 41 50 World::~World () 42 51 { 43 unload (); 44 delete entities; 45 } 52 Orxonox *orx = Orxonox::getInstance(); 53 orx->get_localinput()->unbind (this->localPlayer); 54 delete this->entities; 55 delete this->localCamera; 56 } 57 58 59 /** 60 \brief initialize the world before use. 61 */ 62 Error World::init() 63 { 64 this->bPause = false; 65 } 66 67 Error World::start() 68 { 69 this->mainLoop(); 70 } 71 72 Error World::stop() 73 { 74 this->bQuitCurrentGame = true; 75 this->localCamera->setWorld(NULL); 76 this->~World(); 77 } 78 79 Error World::pause() 80 { 81 this->isPaused = true; 82 } 83 84 Error World::resume() 85 { 86 this->isPaused = false; 87 } 88 89 void World::load() 90 { 91 if(this->debugWorldNr != -1) 92 { 93 switch(this->debugWorldNr) 94 { 95 case DEBUG_WORLD_0: 96 { 97 // create some path nodes 98 this->pathnodes = new Vector[6]; 99 this->pathnodes[0] = Vector(0, 0, 0); 100 this->pathnodes[1] = Vector(-100, 40, 0); 101 this->pathnodes[2] = Vector(-100, 140, 0); 102 this->pathnodes[3] = Vector(0, 180, 0); 103 this->pathnodes[4] = Vector(100, 140, 0); 104 this->pathnodes[5] = Vector(100, 40, 0); 105 106 // create the tracks 107 this->tracklen = 6; 108 this->track = new Track[6]; 109 for( int i = 0; i < this->tracklen; i++) 110 { 111 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]); 112 } 113 114 // create a player 115 //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>(); 116 WorldEntity* myPlayer = new Player(); 117 this->spawn(myPlayer); 118 this->localPlayer = myPlayer; 119 120 // bind input 121 Orxonox *orx = Orxonox::getInstance(); 122 orx->get_localinput()->bind (myPlayer); 123 124 // bind camera 125 this->localCamera = new Camera(this); 126 this->getCamera()->bind (myPlayer); 127 break; 128 } 129 case DEBUG_WORLD_1: 130 { 131 // create some path nodes 132 this->pathnodes = new Vector[6]; 133 this->pathnodes[0] = Vector(0, 0, 0); 134 this->pathnodes[1] = Vector(20, 10, 10); 135 this->pathnodes[2] = Vector(40, 0, 10); 136 this->pathnodes[3] = Vector(60, 10, 0); 137 this->pathnodes[4] = Vector(80, 20, 10); 138 this->pathnodes[5] = Vector(30, 50, 0); 139 140 // create the tracks 141 this->tracklen = 6; 142 this->track = new Track[6]; 143 for( int i = 0; i < this->tracklen; i++) 144 { 145 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]); 146 } 147 148 // create a player 149 //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>(); 150 WorldEntity* myPlayer = new Player(); 151 this->spawn(myPlayer); 152 this->localPlayer = myPlayer; 153 154 // bind input 155 Orxonox *orx = Orxonox::getInstance(); 156 orx->get_localinput()->bind (myPlayer); 157 158 // bind camera 159 this->localCamera = new Camera(this); 160 this->getCamera()->bind (myPlayer); 161 break; 162 } 163 default: 164 printf("World::load() - no world with ID %i found", this->debugWorldNr ); 165 } 166 } 167 else if(this->worldName != NULL) 168 { 169 170 } 171 } 172 46 173 47 174 /** … … 254 381 } 255 382 256 /** 257 \brief loads a simple level for testing purposes 258 */ 259 void World::load_debug_level() 260 { 261 // create some path nodes 262 pathnodes = new Vector[6]; 263 pathnodes[0] = Vector(0, 0, 0); 264 pathnodes[1] = Vector(-100, 40, 0); 265 pathnodes[2] = Vector(-100, 140, 0); 266 pathnodes[3] = Vector(0, 180, 0); 267 pathnodes[4] = Vector(100, 140, 0); 268 pathnodes[5] = Vector(100, 40, 0); 269 270 // create the tracks 271 tracklen = 6; 272 track = new Track[6]; 273 for( int i = 0; i < tracklen; i++) 274 { 275 track[i] = Track( i, (i+1)%tracklen, &pathnodes[i], &pathnodes[(i+1)%tracklen]); 276 } 277 278 // create a player 279 WorldEntity* myPlayer = (WorldEntity*) spawn<Player>(); 280 281 // bind input 282 Orxonox *orx = Orxonox::getInstance(); 283 orx->get_localinput()->bind (myPlayer); 284 285 // bind camera 286 orx->get_camera()->bind (myPlayer); 287 } 383 288 384 289 385 /** … … 295 391 track[loc->part].map_camera (loc, plc); 296 392 } 393 394 395 void World::setTrackLen(Uint32 len) 396 { 397 this->tracklen = len; 398 } 399 400 int World::getTrackLen() 401 { 402 return this->tracklen; 403 } 404 405 void World::debug() 406 { 407 List<WorldEntity> *l; 408 WorldEntity* entity; 409 410 printf("counting all entities\n"); 411 l = entities->get_next(); 412 while( l != NULL ) 413 { 414 entity = l->get_object(); 415 if( entity->bDraw ) printf("got an entity\n"); 416 l = l->get_next(); 417 } 418 } 419 420 421 void World::mainLoop() 422 { 423 this->lastFrame = SDL_GetTicks(); 424 this->bQuitOrxonox = false; 425 this->bQuitCurrentGame = false; 426 printf("World|Entering main loop\n"); 427 while(!this->bQuitOrxonox && !this->bQuitCurrentGame) /* pause pause pause ?!?!?*/ 428 { 429 //debug routine 430 //debug(); 431 // Network 432 synchronize(); 433 // Process input 434 handle_input(); 435 // Process time 436 time_slice(); 437 // Process collision 438 collision(); 439 // Draw 440 display(); 441 } 442 printf("World|Exiting the main loop\n"); 443 } 444 445 /** 446 \brief synchronize local data with remote data 447 */ 448 void World::synchronize () 449 { 450 // Get remote input 451 // Update synchronizables 452 } 453 454 /** 455 \brief run all input processing 456 */ 457 void World::handle_input () 458 { 459 // localinput 460 Orxonox::getInstance()->get_localinput()->process(); 461 // remoteinput 462 } 463 464 /** 465 \brief advance the timeline 466 */ 467 void World::time_slice () 468 { 469 Uint32 currentFrame = SDL_GetTicks(); 470 if(!this->bPause) 471 { 472 Uint32 dt = currentFrame - this->lastFrame; 473 /* 474 if(dt > 0) 475 { 476 float fps = 1000/dt; 477 printf("fps = %f\n", fps); 478 } 479 else 480 { 481 printf("fps = 1000\n"); 482 } 483 */ 484 this->time_slice (dt); 485 this->update (); 486 this->localCamera->time_slice (dt); 487 } 488 this->lastFrame = currentFrame; 489 } 490 491 /** 492 \brief compute collision detection 493 */ 494 void World::collision () 495 { 496 this->collide (); 497 } 498 499 /** 500 \brief handle keyboard commands that are not meant for WorldEntities 501 \param cmd: the command to handle 502 \return true if the command was handled by the system or false if it may be passed to the WorldEntities 503 */ 504 bool World::system_command (Command* cmd) 505 { 506 if( !strcmp( cmd->cmd, "quit")) 507 { 508 if( !cmd->bUp) this->bQuitOrxonox = true; 509 return true; 510 } 511 return false; 512 } 513 514 /** 515 \brief render the current frame 516 */ 517 void World::display () 518 { 519 // clear buffer 520 glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); 521 // set camera 522 this->localCamera->apply (); 523 // draw world 524 this->draw(); 525 // draw HUD 526 // flip buffers 527 SDL_GL_SwapBuffers(); 528 } 529 530 Camera* World::getCamera() 531 { 532 return this->localCamera; 533 } 534 535 536 void World::spawn(WorldEntity* entity) 537 { 538 Location zeroloc; 539 Location* loc = NULL; 540 WorldEntity* owner; 541 //T* entity = new T(); 542 entities->add (entity, LIST_ADD_NEXT); 543 //if( loc == NULL) 544 //{ 545 zeroloc.dist = 0; 546 zeroloc.part = 0; 547 zeroloc.pos = Vector(); 548 zeroloc.rot = Quaternion(); 549 loc = &zeroloc; 550 //} 551 entity->init (loc, owner); 552 if (entity->bFree) 553 { 554 this->track[loc->part].map_coords( loc, entity->get_placement()); 555 } 556 entity->post_spawn (); 557 //return entity; 558 } -
orxonox/branches/buerli/src/world.h
r2551 r2707 8 8 9 9 #include "stdincl.h" 10 #include "story_entity.h" 11 12 10 13 11 14 class Track; 12 15 class WorldEntity; 16 class Camera; 13 17 14 18 //! The game environment 15 class World {19 class World : public StoryEntity { 16 20 17 21 public: 18 World (); 22 World (char* name); 23 World (int worldID); 19 24 ~World (); 20 25 21 template<typename T> 22 T* spawn(Location* loc, WorldEntity* owner); // template to be able to spawn any derivation of WorldEntity 23 template<typename T> 24 T* spawn(Placement* plc, WorldEntity* owner); 26 template<typename T> 27 T* spawn(Location* loc, WorldEntity* owner); // template to be able to spawn any derivation of WorldEntity 28 template<typename T> 29 T* spawn(Placement* plc, WorldEntity* owner); 30 31 virtual Error init(); 32 virtual Error start(); 33 virtual Error stop(); 34 virtual Error pause(); 35 virtual Error resume(); 25 36 26 void time_slice (Uint32 deltaT); 27 void collide (); 28 void draw (); 29 void update (); // maps Locations to Placements 30 void calc_camera_pos (Location* loc, Placement* plc); 37 virtual void load(); 38 39 void time_slice (Uint32 deltaT); 40 void collide (); 41 void draw (); 42 void update (); // maps Locations to Placements 43 void calc_camera_pos (Location* loc, Placement* plc); 31 44 32 void unload (); 33 34 void load_debug_level (); 35 45 void unload (); 46 47 void setTrackLen(Uint32 tracklen); 48 int getTrackLen(); 49 bool system_command (Command* cmd); 50 Camera* getCamera(); 51 //private: 52 53 void spawn(WorldEntity* entity); 54 55 List<WorldEntity>* entities; 56 57 // base level data 58 Track* track; 59 Uint32 tracklen; // number of Tracks the World consist of 60 Vector* pathnodes; 61 Camera* localCamera; 62 36 63 private: 37 38 List<WorldEntity>* entities; 39 40 // base level data 41 Track* track; 42 Uint32 tracklen; // number of Tracks the World consist of 43 Vector* pathnodes; 64 Uint32 lastFrame; //!> last time of frame 65 bool bQuitOrxonox; //!> quit this application 66 bool bQuitCurrentGame; //!> quit only the current game and return to menu 67 bool bPause; 44 68 69 char* worldName; 70 int debugWorldNr; 71 72 WorldEntity* localPlayer; 73 74 void mainLoop(); 75 void synchronize(); 76 void handle_input(); 77 void time_slice(); 78 void collision(); 79 void display(); 80 void debug(); 45 81 }; 46 82 … … 58 94 template<typename T> T* World::spawn(Location* loc = NULL, WorldEntity* owner = NULL) 59 95 { 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 96 Location zeroloc; 97 T* entity = new T(); 98 entities->add ((WorldEntity*)entity, LIST_ADD_NEXT); 99 if( loc == NULL) 100 { 101 zeroloc.dist = 0; 102 zeroloc.part = 0; 103 zeroloc.pos = Vector(); 104 zeroloc.rot = Quaternion(); 105 loc = &zeroloc; 106 } 107 entity->init (loc, owner); 108 if (entity->bFree) 109 { 110 track[loc->part].map_coords( loc, entity->get_placement()); 111 } 112 entity->post_spawn (); 113 return entity; 78 114 } 79 115 … … 92 128 template<typename T> T* World::spawn(Placement* plc, WorldEntity* owner = NULL) 93 129 { 94 95 96 97 98 99 100 101 102 103 104 130 T* entity = new T(); 131 entities->add ((WorldEntity*)entity, LIST_ADD_NEXT); 132 entity->init (plc, owner); 133 if (!entity->bFree) 134 { 135 printf("Can't spawn unfree entity with placement\n"); 136 entities->remove( (WorldEntity*)entity, LIST_FIND_FW); 137 return NULL; 138 } 139 entity->post_spawn (); 140 return entity; 105 141 } 106 142
Note: See TracChangeset
for help on using the changeset viewer.
