- Timestamp:
- Jun 4, 2005, 12:38:30 AM (19 years ago)
- Location:
- orxonox/trunk
- Files:
-
- 3 added
- 25 edited
- 1 copied
-
config.h.in (modified) (3 diffs)
-
configure (modified) (3 diffs)
-
configure.ac (modified) (2 diffs)
-
src/Makefile.am (modified) (4 diffs)
-
src/Makefile.in (modified) (9 diffs)
-
src/defs/alincl.h (copied) (copied from orxonox/branches/openAL/src/defs/alincl.h)
-
src/defs/include_paths.am (modified) (1 diff)
-
src/lib/Makefile.in (modified) (1 diff)
-
src/lib/event/Makefile.in (modified) (1 diff)
-
src/lib/graphics/Makefile.in (modified) (1 diff)
-
src/lib/graphics/importer/Makefile.in (modified) (1 diff)
-
src/lib/gui/Makefile.in (modified) (1 diff)
-
src/lib/particles/Makefile.in (modified) (1 diff)
-
src/lib/physics/Makefile.in (modified) (1 diff)
-
src/lib/sound (added)
-
src/lib/sound/sound_engine.cc (added)
-
src/lib/sound/sound_engine.h (added)
-
src/lib/tinyxml/Makefile.in (modified) (1 diff)
-
src/orxonox.cc (modified) (4 diffs)
-
src/story_entities/world.cc (modified) (4 diffs)
-
src/subprojects/Makefile.in (modified) (1 diff)
-
src/subprojects/gui/Makefile.in (modified) (3 diffs)
-
src/subprojects/importer/Makefile.in (modified) (1 diff)
-
src/subprojects/particles/Makefile.in (modified) (1 diff)
-
src/subprojects/testmain/Makefile.in (modified) (3 diffs)
-
src/util/resource_manager.cc (modified) (3 diffs)
-
src/world_entities/test_gun.cc (modified) (3 diffs)
-
src/world_entities/weapon.h (modified) (1 diff)
-
src/world_entities/world_entity.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/config.h.in
r4063 r4504 3 3 /* in which debug mode we are */ 4 4 #undef DEBUG 5 6 /* Define to 1 if you have the <AL/al.h> header file. */ 7 #undef HAVE_AL_AL_H 5 8 6 9 /* Define to 1 if you have the `bzero' function. */ … … 34 37 /* Define to 1 if you have the <memory.h> header file. */ 35 38 #undef HAVE_MEMORY_H 39 40 /* Define to 1 if you have the <ogg/ogg.h> header file. */ 41 #undef HAVE_OGG_OGG_H 36 42 37 43 /* Define to 1 if you have the <OpenGL/glu.h> header file. */ … … 77 83 #undef HAVE_UNISTD_H 78 84 85 /* Define to 1 if you have the <vorbis/vorbisfile.h> header file. */ 86 #undef HAVE_VORBIS_VORBISFILE_H 87 79 88 /* Define to 1 if the system has the type `_Bool'. */ 80 89 #undef HAVE__BOOL -
orxonox/trunk/configure
r4484 r4504 6255 6255 ################################### 6256 6256 6257 #-------- -#6258 # SDL_ttf#6259 #-------- -#6260 # checking for SDL_ttf-headers6261 6262 for ac_header in SDL_ttf.h6257 #--------# 6258 # openAL # 6259 #--------# 6260 # checking for openAL-headers 6261 6262 for ac_header in AL/al.h 6263 6263 do 6264 6264 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 6406 6406 6407 6407 else 6408 { { echo "$as_me:$LINENO: error: cannot find openAL header." >&5 6409 echo "$as_me: error: cannot find openAL header." >&2;} 6410 { (exit 1); exit 1; }; } 6411 fi 6412 6413 done 6414 6415 # checking for openAL-lib 6416 echo "$as_me:$LINENO: checking for main in -lopenal" >&5 6417 echo $ECHO_N "checking for main in -lopenal... $ECHO_C" >&6 6418 if test "${ac_cv_lib_openal_main+set}" = set; then 6419 echo $ECHO_N "(cached) $ECHO_C" >&6 6420 else 6421 ac_check_lib_save_LIBS=$LIBS 6422 LIBS="-lopenal $LIBS" 6423 cat >conftest.$ac_ext <<_ACEOF 6424 /* confdefs.h. */ 6425 _ACEOF 6426 cat confdefs.h >>conftest.$ac_ext 6427 cat >>conftest.$ac_ext <<_ACEOF 6428 /* end confdefs.h. */ 6429 6430 6431 int 6432 main () 6433 { 6434 main (); 6435 ; 6436 return 0; 6437 } 6438 _ACEOF 6439 rm -f conftest.$ac_objext conftest$ac_exeext 6440 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6441 (eval $ac_link) 2>conftest.er1 6442 ac_status=$? 6443 grep -v '^ *+' conftest.er1 >conftest.err 6444 rm -f conftest.er1 6445 cat conftest.err >&5 6446 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6447 (exit $ac_status); } && 6448 { ac_try='test -z "$ac_c_werror_flag" 6449 || test ! -s conftest.err' 6450 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6451 (eval $ac_try) 2>&5 6452 ac_status=$? 6453 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6454 (exit $ac_status); }; } && 6455 { ac_try='test -s conftest$ac_exeext' 6456 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6457 (eval $ac_try) 2>&5 6458 ac_status=$? 6459 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6460 (exit $ac_status); }; }; then 6461 ac_cv_lib_openal_main=yes 6462 else 6463 echo "$as_me: failed program was:" >&5 6464 sed 's/^/| /' conftest.$ac_ext >&5 6465 6466 ac_cv_lib_openal_main=no 6467 fi 6468 rm -f conftest.err conftest.$ac_objext \ 6469 conftest$ac_exeext conftest.$ac_ext 6470 LIBS=$ac_check_lib_save_LIBS 6471 fi 6472 echo "$as_me:$LINENO: result: $ac_cv_lib_openal_main" >&5 6473 echo "${ECHO_T}$ac_cv_lib_openal_main" >&6 6474 if test $ac_cv_lib_openal_main = yes; then 6475 FOUND_openal=yes 6476 fi 6477 6478 if test x$FOUND_openal = xyes ; then 6479 LIBS="$LIBS -lopenal" 6480 else 6481 echo "------------------" 6482 echo "openal library not found." 6483 echo "please install the openal library, which can be found at http://www.openal.org" 6484 echo "------------------" 6485 exit -1 6486 fi 6487 6488 #-----# 6489 # ogg # 6490 #-----# 6491 # checking for ogg-headers 6492 6493 for ac_header in ogg/ogg.h 6494 do 6495 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 6496 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6497 echo "$as_me:$LINENO: checking for $ac_header" >&5 6498 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6499 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6500 echo $ECHO_N "(cached) $ECHO_C" >&6 6501 fi 6502 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6503 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6504 else 6505 # Is the header compilable? 6506 echo "$as_me:$LINENO: checking $ac_header usability" >&5 6507 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 6508 cat >conftest.$ac_ext <<_ACEOF 6509 /* confdefs.h. */ 6510 _ACEOF 6511 cat confdefs.h >>conftest.$ac_ext 6512 cat >>conftest.$ac_ext <<_ACEOF 6513 /* end confdefs.h. */ 6514 $ac_includes_default 6515 #include <$ac_header> 6516 _ACEOF 6517 rm -f conftest.$ac_objext 6518 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6519 (eval $ac_compile) 2>conftest.er1 6520 ac_status=$? 6521 grep -v '^ *+' conftest.er1 >conftest.err 6522 rm -f conftest.er1 6523 cat conftest.err >&5 6524 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6525 (exit $ac_status); } && 6526 { ac_try='test -z "$ac_c_werror_flag" 6527 || test ! -s conftest.err' 6528 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6529 (eval $ac_try) 2>&5 6530 ac_status=$? 6531 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6532 (exit $ac_status); }; } && 6533 { ac_try='test -s conftest.$ac_objext' 6534 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6535 (eval $ac_try) 2>&5 6536 ac_status=$? 6537 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6538 (exit $ac_status); }; }; then 6539 ac_header_compiler=yes 6540 else 6541 echo "$as_me: failed program was:" >&5 6542 sed 's/^/| /' conftest.$ac_ext >&5 6543 6544 ac_header_compiler=no 6545 fi 6546 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6547 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 6548 echo "${ECHO_T}$ac_header_compiler" >&6 6549 6550 # Is the header present? 6551 echo "$as_me:$LINENO: checking $ac_header presence" >&5 6552 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 6553 cat >conftest.$ac_ext <<_ACEOF 6554 /* confdefs.h. */ 6555 _ACEOF 6556 cat confdefs.h >>conftest.$ac_ext 6557 cat >>conftest.$ac_ext <<_ACEOF 6558 /* end confdefs.h. */ 6559 #include <$ac_header> 6560 _ACEOF 6561 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 6562 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 6563 ac_status=$? 6564 grep -v '^ *+' conftest.er1 >conftest.err 6565 rm -f conftest.er1 6566 cat conftest.err >&5 6567 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6568 (exit $ac_status); } >/dev/null; then 6569 if test -s conftest.err; then 6570 ac_cpp_err=$ac_c_preproc_warn_flag 6571 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 6572 else 6573 ac_cpp_err= 6574 fi 6575 else 6576 ac_cpp_err=yes 6577 fi 6578 if test -z "$ac_cpp_err"; then 6579 ac_header_preproc=yes 6580 else 6581 echo "$as_me: failed program was:" >&5 6582 sed 's/^/| /' conftest.$ac_ext >&5 6583 6584 ac_header_preproc=no 6585 fi 6586 rm -f conftest.err conftest.$ac_ext 6587 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 6588 echo "${ECHO_T}$ac_header_preproc" >&6 6589 6590 # So? What about this header? 6591 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 6592 yes:no: ) 6593 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 6594 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 6595 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 6596 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 6597 ac_header_preproc=yes 6598 ;; 6599 no:yes:* ) 6600 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 6601 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 6602 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 6603 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 6604 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 6605 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 6606 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 6607 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 6608 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 6609 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 6610 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 6611 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 6612 ( 6613 cat <<\_ASBOX 6614 ## ---------------------------------------------- ## 6615 ## Report this to orxonox-dev at mail.datacore.ch ## 6616 ## ---------------------------------------------- ## 6617 _ASBOX 6618 ) | 6619 sed "s/^/$as_me: WARNING: /" >&2 6620 ;; 6621 esac 6622 echo "$as_me:$LINENO: checking for $ac_header" >&5 6623 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6624 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6625 echo $ECHO_N "(cached) $ECHO_C" >&6 6626 else 6627 eval "$as_ac_Header=\$ac_header_preproc" 6628 fi 6629 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6630 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6631 6632 fi 6633 if test `eval echo '${'$as_ac_Header'}'` = yes; then 6634 cat >>confdefs.h <<_ACEOF 6635 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 6636 _ACEOF 6637 6638 else 6639 { { echo "$as_me:$LINENO: error: cannot find ogg header." >&5 6640 echo "$as_me: error: cannot find ogg header." >&2;} 6641 { (exit 1); exit 1; }; } 6642 fi 6643 6644 done 6645 6646 # checking for ogg-lib 6647 echo "$as_me:$LINENO: checking for main in -logg" >&5 6648 echo $ECHO_N "checking for main in -logg... $ECHO_C" >&6 6649 if test "${ac_cv_lib_ogg_main+set}" = set; then 6650 echo $ECHO_N "(cached) $ECHO_C" >&6 6651 else 6652 ac_check_lib_save_LIBS=$LIBS 6653 LIBS="-logg $LIBS" 6654 cat >conftest.$ac_ext <<_ACEOF 6655 /* confdefs.h. */ 6656 _ACEOF 6657 cat confdefs.h >>conftest.$ac_ext 6658 cat >>conftest.$ac_ext <<_ACEOF 6659 /* end confdefs.h. */ 6660 6661 6662 int 6663 main () 6664 { 6665 main (); 6666 ; 6667 return 0; 6668 } 6669 _ACEOF 6670 rm -f conftest.$ac_objext conftest$ac_exeext 6671 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6672 (eval $ac_link) 2>conftest.er1 6673 ac_status=$? 6674 grep -v '^ *+' conftest.er1 >conftest.err 6675 rm -f conftest.er1 6676 cat conftest.err >&5 6677 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6678 (exit $ac_status); } && 6679 { ac_try='test -z "$ac_c_werror_flag" 6680 || test ! -s conftest.err' 6681 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6682 (eval $ac_try) 2>&5 6683 ac_status=$? 6684 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6685 (exit $ac_status); }; } && 6686 { ac_try='test -s conftest$ac_exeext' 6687 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6688 (eval $ac_try) 2>&5 6689 ac_status=$? 6690 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6691 (exit $ac_status); }; }; then 6692 ac_cv_lib_ogg_main=yes 6693 else 6694 echo "$as_me: failed program was:" >&5 6695 sed 's/^/| /' conftest.$ac_ext >&5 6696 6697 ac_cv_lib_ogg_main=no 6698 fi 6699 rm -f conftest.err conftest.$ac_objext \ 6700 conftest$ac_exeext conftest.$ac_ext 6701 LIBS=$ac_check_lib_save_LIBS 6702 fi 6703 echo "$as_me:$LINENO: result: $ac_cv_lib_ogg_main" >&5 6704 echo "${ECHO_T}$ac_cv_lib_ogg_main" >&6 6705 if test $ac_cv_lib_ogg_main = yes; then 6706 FOUND_ogg=yes 6707 fi 6708 6709 if test x$FOUND_ogg = xyes ; then 6710 LIBS="$LIBS -logg" 6711 else 6712 echo "------------------" 6713 echo "ogg library not found." 6714 echo "please install the ogg library, which can be found at http://www.xiph.org/ogg/vorbis/index.html" 6715 echo "------------------" 6716 exit -1 6717 fi 6718 6719 #--------# 6720 # vorbis # 6721 #--------# 6722 # checking for vorbis-lib 6723 echo "$as_me:$LINENO: checking for main in -lvorbis" >&5 6724 echo $ECHO_N "checking for main in -lvorbis... $ECHO_C" >&6 6725 if test "${ac_cv_lib_vorbis_main+set}" = set; then 6726 echo $ECHO_N "(cached) $ECHO_C" >&6 6727 else 6728 ac_check_lib_save_LIBS=$LIBS 6729 LIBS="-lvorbis $LIBS" 6730 cat >conftest.$ac_ext <<_ACEOF 6731 /* confdefs.h. */ 6732 _ACEOF 6733 cat confdefs.h >>conftest.$ac_ext 6734 cat >>conftest.$ac_ext <<_ACEOF 6735 /* end confdefs.h. */ 6736 6737 6738 int 6739 main () 6740 { 6741 main (); 6742 ; 6743 return 0; 6744 } 6745 _ACEOF 6746 rm -f conftest.$ac_objext conftest$ac_exeext 6747 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6748 (eval $ac_link) 2>conftest.er1 6749 ac_status=$? 6750 grep -v '^ *+' conftest.er1 >conftest.err 6751 rm -f conftest.er1 6752 cat conftest.err >&5 6753 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6754 (exit $ac_status); } && 6755 { ac_try='test -z "$ac_c_werror_flag" 6756 || test ! -s conftest.err' 6757 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6758 (eval $ac_try) 2>&5 6759 ac_status=$? 6760 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6761 (exit $ac_status); }; } && 6762 { ac_try='test -s conftest$ac_exeext' 6763 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6764 (eval $ac_try) 2>&5 6765 ac_status=$? 6766 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6767 (exit $ac_status); }; }; then 6768 ac_cv_lib_vorbis_main=yes 6769 else 6770 echo "$as_me: failed program was:" >&5 6771 sed 's/^/| /' conftest.$ac_ext >&5 6772 6773 ac_cv_lib_vorbis_main=no 6774 fi 6775 rm -f conftest.err conftest.$ac_objext \ 6776 conftest$ac_exeext conftest.$ac_ext 6777 LIBS=$ac_check_lib_save_LIBS 6778 fi 6779 echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_main" >&5 6780 echo "${ECHO_T}$ac_cv_lib_vorbis_main" >&6 6781 if test $ac_cv_lib_vorbis_main = yes; then 6782 FOUND_vorbis=yes 6783 fi 6784 6785 if test x$FOUND_vorbis = xyes ; then 6786 LIBS="$LIBS -lvorbis" 6787 else 6788 echo "------------------" 6789 echo "vorbis library not found." 6790 echo "please install the vorbis library, which can be found at http://www.xiph.org/ogg/vorbis/index.html" 6791 echo "------------------" 6792 exit -1 6793 fi 6794 6795 #------------# 6796 # vorbisfile # 6797 #------------# 6798 # checking for vorbis-headers 6799 6800 for ac_header in vorbis/vorbisfile.h 6801 do 6802 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 6803 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6804 echo "$as_me:$LINENO: checking for $ac_header" >&5 6805 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6806 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6807 echo $ECHO_N "(cached) $ECHO_C" >&6 6808 fi 6809 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6810 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6811 else 6812 # Is the header compilable? 6813 echo "$as_me:$LINENO: checking $ac_header usability" >&5 6814 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 6815 cat >conftest.$ac_ext <<_ACEOF 6816 /* confdefs.h. */ 6817 _ACEOF 6818 cat confdefs.h >>conftest.$ac_ext 6819 cat >>conftest.$ac_ext <<_ACEOF 6820 /* end confdefs.h. */ 6821 $ac_includes_default 6822 #include <$ac_header> 6823 _ACEOF 6824 rm -f conftest.$ac_objext 6825 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6826 (eval $ac_compile) 2>conftest.er1 6827 ac_status=$? 6828 grep -v '^ *+' conftest.er1 >conftest.err 6829 rm -f conftest.er1 6830 cat conftest.err >&5 6831 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6832 (exit $ac_status); } && 6833 { ac_try='test -z "$ac_c_werror_flag" 6834 || test ! -s conftest.err' 6835 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6836 (eval $ac_try) 2>&5 6837 ac_status=$? 6838 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6839 (exit $ac_status); }; } && 6840 { ac_try='test -s conftest.$ac_objext' 6841 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6842 (eval $ac_try) 2>&5 6843 ac_status=$? 6844 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6845 (exit $ac_status); }; }; then 6846 ac_header_compiler=yes 6847 else 6848 echo "$as_me: failed program was:" >&5 6849 sed 's/^/| /' conftest.$ac_ext >&5 6850 6851 ac_header_compiler=no 6852 fi 6853 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6854 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 6855 echo "${ECHO_T}$ac_header_compiler" >&6 6856 6857 # Is the header present? 6858 echo "$as_me:$LINENO: checking $ac_header presence" >&5 6859 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 6860 cat >conftest.$ac_ext <<_ACEOF 6861 /* confdefs.h. */ 6862 _ACEOF 6863 cat confdefs.h >>conftest.$ac_ext 6864 cat >>conftest.$ac_ext <<_ACEOF 6865 /* end confdefs.h. */ 6866 #include <$ac_header> 6867 _ACEOF 6868 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 6869 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 6870 ac_status=$? 6871 grep -v '^ *+' conftest.er1 >conftest.err 6872 rm -f conftest.er1 6873 cat conftest.err >&5 6874 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6875 (exit $ac_status); } >/dev/null; then 6876 if test -s conftest.err; then 6877 ac_cpp_err=$ac_c_preproc_warn_flag 6878 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 6879 else 6880 ac_cpp_err= 6881 fi 6882 else 6883 ac_cpp_err=yes 6884 fi 6885 if test -z "$ac_cpp_err"; then 6886 ac_header_preproc=yes 6887 else 6888 echo "$as_me: failed program was:" >&5 6889 sed 's/^/| /' conftest.$ac_ext >&5 6890 6891 ac_header_preproc=no 6892 fi 6893 rm -f conftest.err conftest.$ac_ext 6894 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 6895 echo "${ECHO_T}$ac_header_preproc" >&6 6896 6897 # So? What about this header? 6898 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 6899 yes:no: ) 6900 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 6901 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 6902 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 6903 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 6904 ac_header_preproc=yes 6905 ;; 6906 no:yes:* ) 6907 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 6908 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 6909 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 6910 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 6911 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 6912 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 6913 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 6914 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 6915 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 6916 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 6917 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 6918 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 6919 ( 6920 cat <<\_ASBOX 6921 ## ---------------------------------------------- ## 6922 ## Report this to orxonox-dev at mail.datacore.ch ## 6923 ## ---------------------------------------------- ## 6924 _ASBOX 6925 ) | 6926 sed "s/^/$as_me: WARNING: /" >&2 6927 ;; 6928 esac 6929 echo "$as_me:$LINENO: checking for $ac_header" >&5 6930 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6931 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6932 echo $ECHO_N "(cached) $ECHO_C" >&6 6933 else 6934 eval "$as_ac_Header=\$ac_header_preproc" 6935 fi 6936 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6937 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6938 6939 fi 6940 if test `eval echo '${'$as_ac_Header'}'` = yes; then 6941 cat >>confdefs.h <<_ACEOF 6942 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 6943 _ACEOF 6944 6945 else 6946 { { echo "$as_me:$LINENO: error: cannot find vorbisfile header." >&5 6947 echo "$as_me: error: cannot find vorbisfile header." >&2;} 6948 { (exit 1); exit 1; }; } 6949 fi 6950 6951 done 6952 6953 # checking for vorbisfile-lib 6954 echo "$as_me:$LINENO: checking for main in -lvorbisfile" >&5 6955 echo $ECHO_N "checking for main in -lvorbisfile... $ECHO_C" >&6 6956 if test "${ac_cv_lib_vorbisfile_main+set}" = set; then 6957 echo $ECHO_N "(cached) $ECHO_C" >&6 6958 else 6959 ac_check_lib_save_LIBS=$LIBS 6960 LIBS="-lvorbisfile $LIBS" 6961 cat >conftest.$ac_ext <<_ACEOF 6962 /* confdefs.h. */ 6963 _ACEOF 6964 cat confdefs.h >>conftest.$ac_ext 6965 cat >>conftest.$ac_ext <<_ACEOF 6966 /* end confdefs.h. */ 6967 6968 6969 int 6970 main () 6971 { 6972 main (); 6973 ; 6974 return 0; 6975 } 6976 _ACEOF 6977 rm -f conftest.$ac_objext conftest$ac_exeext 6978 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6979 (eval $ac_link) 2>conftest.er1 6980 ac_status=$? 6981 grep -v '^ *+' conftest.er1 >conftest.err 6982 rm -f conftest.er1 6983 cat conftest.err >&5 6984 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6985 (exit $ac_status); } && 6986 { ac_try='test -z "$ac_c_werror_flag" 6987 || test ! -s conftest.err' 6988 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6989 (eval $ac_try) 2>&5 6990 ac_status=$? 6991 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6992 (exit $ac_status); }; } && 6993 { ac_try='test -s conftest$ac_exeext' 6994 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6995 (eval $ac_try) 2>&5 6996 ac_status=$? 6997 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6998 (exit $ac_status); }; }; then 6999 ac_cv_lib_vorbisfile_main=yes 7000 else 7001 echo "$as_me: failed program was:" >&5 7002 sed 's/^/| /' conftest.$ac_ext >&5 7003 7004 ac_cv_lib_vorbisfile_main=no 7005 fi 7006 rm -f conftest.err conftest.$ac_objext \ 7007 conftest$ac_exeext conftest.$ac_ext 7008 LIBS=$ac_check_lib_save_LIBS 7009 fi 7010 echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_main" >&5 7011 echo "${ECHO_T}$ac_cv_lib_vorbisfile_main" >&6 7012 if test $ac_cv_lib_vorbisfile_main = yes; then 7013 FOUND_vorbisfile=yes 7014 fi 7015 7016 if test x$FOUND_vorbisfile = xyes ; then 7017 LIBS="$LIBS -lvorbisfile" 7018 else 7019 echo "------------------" 7020 echo "vorbisfile library not found." 7021 echo "please install the vorbisfile library, which can be found at http://www.xiph.org/ogg/vorbis/index.html" 7022 echo "------------------" 7023 exit -1 7024 fi 7025 7026 #---------# 7027 # SDL_ttf # 7028 #---------# 7029 # checking for SDL_ttf-headers 7030 7031 for ac_header in SDL_ttf.h 7032 do 7033 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 7034 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7035 echo "$as_me:$LINENO: checking for $ac_header" >&5 7036 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7037 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7038 echo $ECHO_N "(cached) $ECHO_C" >&6 7039 fi 7040 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 7041 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7042 else 7043 # Is the header compilable? 7044 echo "$as_me:$LINENO: checking $ac_header usability" >&5 7045 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 7046 cat >conftest.$ac_ext <<_ACEOF 7047 /* confdefs.h. */ 7048 _ACEOF 7049 cat confdefs.h >>conftest.$ac_ext 7050 cat >>conftest.$ac_ext <<_ACEOF 7051 /* end confdefs.h. */ 7052 $ac_includes_default 7053 #include <$ac_header> 7054 _ACEOF 7055 rm -f conftest.$ac_objext 7056 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7057 (eval $ac_compile) 2>conftest.er1 7058 ac_status=$? 7059 grep -v '^ *+' conftest.er1 >conftest.err 7060 rm -f conftest.er1 7061 cat conftest.err >&5 7062 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7063 (exit $ac_status); } && 7064 { ac_try='test -z "$ac_c_werror_flag" 7065 || test ! -s conftest.err' 7066 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7067 (eval $ac_try) 2>&5 7068 ac_status=$? 7069 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7070 (exit $ac_status); }; } && 7071 { ac_try='test -s conftest.$ac_objext' 7072 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7073 (eval $ac_try) 2>&5 7074 ac_status=$? 7075 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7076 (exit $ac_status); }; }; then 7077 ac_header_compiler=yes 7078 else 7079 echo "$as_me: failed program was:" >&5 7080 sed 's/^/| /' conftest.$ac_ext >&5 7081 7082 ac_header_compiler=no 7083 fi 7084 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7085 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 7086 echo "${ECHO_T}$ac_header_compiler" >&6 7087 7088 # Is the header present? 7089 echo "$as_me:$LINENO: checking $ac_header presence" >&5 7090 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 7091 cat >conftest.$ac_ext <<_ACEOF 7092 /* confdefs.h. */ 7093 _ACEOF 7094 cat confdefs.h >>conftest.$ac_ext 7095 cat >>conftest.$ac_ext <<_ACEOF 7096 /* end confdefs.h. */ 7097 #include <$ac_header> 7098 _ACEOF 7099 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 7100 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7101 ac_status=$? 7102 grep -v '^ *+' conftest.er1 >conftest.err 7103 rm -f conftest.er1 7104 cat conftest.err >&5 7105 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7106 (exit $ac_status); } >/dev/null; then 7107 if test -s conftest.err; then 7108 ac_cpp_err=$ac_c_preproc_warn_flag 7109 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 7110 else 7111 ac_cpp_err= 7112 fi 7113 else 7114 ac_cpp_err=yes 7115 fi 7116 if test -z "$ac_cpp_err"; then 7117 ac_header_preproc=yes 7118 else 7119 echo "$as_me: failed program was:" >&5 7120 sed 's/^/| /' conftest.$ac_ext >&5 7121 7122 ac_header_preproc=no 7123 fi 7124 rm -f conftest.err conftest.$ac_ext 7125 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 7126 echo "${ECHO_T}$ac_header_preproc" >&6 7127 7128 # So? What about this header? 7129 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 7130 yes:no: ) 7131 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 7132 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 7133 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 7134 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 7135 ac_header_preproc=yes 7136 ;; 7137 no:yes:* ) 7138 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 7139 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 7140 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 7141 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 7142 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 7143 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 7144 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 7145 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 7146 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 7147 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 7148 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 7149 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 7150 ( 7151 cat <<\_ASBOX 7152 ## ---------------------------------------------- ## 7153 ## Report this to orxonox-dev at mail.datacore.ch ## 7154 ## ---------------------------------------------- ## 7155 _ASBOX 7156 ) | 7157 sed "s/^/$as_me: WARNING: /" >&2 7158 ;; 7159 esac 7160 echo "$as_me:$LINENO: checking for $ac_header" >&5 7161 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7162 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7163 echo $ECHO_N "(cached) $ECHO_C" >&6 7164 else 7165 eval "$as_ac_Header=\$ac_header_preproc" 7166 fi 7167 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 7168 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7169 7170 fi 7171 if test `eval echo '${'$as_ac_Header'}'` = yes; then 7172 cat >>confdefs.h <<_ACEOF 7173 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 7174 _ACEOF 7175 7176 else 6408 7177 { { echo "$as_me:$LINENO: error: cannot find SDL_ttf header." >&5 6409 7178 echo "$as_me: error: cannot find SDL_ttf header." >&2;} … … 6486 7255 exit -1 6487 7256 fi 7257 6488 7258 6489 7259 #-----------# -
orxonox/trunk/configure.ac
r4484 r4504 402 402 ################################### 403 403 404 #--------# 405 # openAL # 406 #--------# 407 # checking for openAL-headers 408 AC_CHECK_HEADERS([AL/al.h] ,, 409 [AC_MSG_ERROR([cannot find openAL header.])]) 410 # checking for openAL-lib 411 AC_CHECK_LIB([openal], [main], [FOUND_openal=yes]) 412 if test x$FOUND_openal = xyes ; then 413 LIBS="$LIBS -lopenal" 414 else 415 echo "------------------" 416 echo "openal library not found." 417 echo "please install the openal library, which can be found at http://www.openal.org" 418 echo "------------------" 419 exit -1 420 fi 421 422 #-----# 423 # ogg # 424 #-----# 425 # checking for ogg-headers 426 AC_CHECK_HEADERS([ogg/ogg.h] ,, 427 [AC_MSG_ERROR([cannot find ogg header.])]) 428 # checking for ogg-lib 429 AC_CHECK_LIB([ogg], [main], [FOUND_ogg=yes]) 430 if test x$FOUND_ogg = xyes ; then 431 LIBS="$LIBS -logg" 432 else 433 echo "------------------" 434 echo "ogg library not found." 435 echo "please install the ogg library, which can be found at http://www.xiph.org/ogg/vorbis/index.html" 436 echo "------------------" 437 exit -1 438 fi 439 440 #--------# 441 # vorbis # 442 #--------# 443 # checking for vorbis-lib 444 AC_CHECK_LIB([vorbis], [main], [FOUND_vorbis=yes]) 445 if test x$FOUND_vorbis = xyes ; then 446 LIBS="$LIBS -lvorbis" 447 else 448 echo "------------------" 449 echo "vorbis library not found." 450 echo "please install the vorbis library, which can be found at http://www.xiph.org/ogg/vorbis/index.html" 451 echo "------------------" 452 exit -1 453 fi 454 455 #------------# 456 # vorbisfile # 457 #------------# 458 # checking for vorbis-headers 459 AC_CHECK_HEADERS([vorbis/vorbisfile.h] ,, 460 [AC_MSG_ERROR([cannot find vorbisfile header.])]) 461 # checking for vorbisfile-lib 462 AC_CHECK_LIB([vorbisfile], [main], [FOUND_vorbisfile=yes]) 463 if test x$FOUND_vorbisfile = xyes ; then 464 LIBS="$LIBS -lvorbisfile" 465 else 466 echo "------------------" 467 echo "vorbisfile library not found." 468 echo "please install the vorbisfile library, which can be found at http://www.xiph.org/ogg/vorbis/index.html" 469 echo "------------------" 470 exit -1 471 fi 472 404 473 #---------# 405 474 # SDL_ttf # … … 420 489 exit -1 421 490 fi 491 422 492 423 493 #-----------# -
orxonox/trunk/src/Makefile.am
r4500 r4504 1 1 MAINSRCDIR=. 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 4 3 5 4 … … 67 66 lib/graphics/importer/material.cc \ 68 67 lib/graphics/importer/texture.cc \ 68 lib/sound/sound_engine.cc \ 69 69 lib/lang/base_object.cc \ 70 70 lib/util/ini_parser.cc \ … … 116 116 defs/sdlincl.h \ 117 117 defs/glincl.h \ 118 defs/alincl.h \ 118 119 defs/comincl.h \ 119 120 defs/confincl.h \ … … 137 138 lib/graphics/importer/material.h \ 138 139 lib/graphics/importer/texture.h \ 140 lib/sound/sound_engine.h \ 139 141 lib/lang/base_object.h \ 140 142 lib/util/ini_parser.h \ -
orxonox/trunk/src/Makefile.in
r4500 r4504 69 69 text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \ 70 70 md2Model.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \ 71 material.$(OBJEXT) texture.$(OBJEXT) base_object.$(OBJEXT) \72 ini_parser.$(OBJEXT) substring.$(OBJEXT) vector.$(OBJEXT) \73 curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \71 material.$(OBJEXT) texture.$(OBJEXT) sound_engine.$(OBJEXT) \ 72 base_object.$(OBJEXT) ini_parser.$(OBJEXT) substring.$(OBJEXT) \ 73 vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \ 74 74 benchmark.$(OBJEXT) 75 75 orxonox_OBJECTS = $(am_orxonox_OBJECTS) … … 102 102 @AMDEP_TRUE@ ./$(DEPDIR)/resource_manager.Po \ 103 103 @AMDEP_TRUE@ ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \ 104 @AMDEP_TRUE@ ./$(DEPDIR)/skysphere.Po ./$(DEPDIR)/state.Po \ 104 @AMDEP_TRUE@ ./$(DEPDIR)/skysphere.Po \ 105 @AMDEP_TRUE@ ./$(DEPDIR)/sound_engine.Po ./$(DEPDIR)/state.Po \ 105 106 @AMDEP_TRUE@ ./$(DEPDIR)/story_entity.Po \ 106 107 @AMDEP_TRUE@ ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \ … … 296 297 lib/graphics/importer/material.cc \ 297 298 lib/graphics/importer/texture.cc \ 299 lib/sound/sound_engine.cc \ 298 300 lib/lang/base_object.cc \ 299 301 lib/util/ini_parser.cc \ … … 345 347 defs/sdlincl.h \ 346 348 defs/glincl.h \ 349 defs/alincl.h \ 347 350 defs/comincl.h \ 348 351 defs/confincl.h \ … … 366 369 lib/graphics/importer/material.h \ 367 370 lib/graphics/importer/texture.h \ 371 lib/sound/sound_engine.h \ 368 372 lib/lang/base_object.h \ 369 373 lib/util/ini_parser.h \ … … 402 406 esac; \ 403 407 done; \ 404 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/Makefile'; \408 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ 405 409 cd $(top_srcdir) && \ 406 $(AUTOMAKE) -- foreignsrc/Makefile410 $(AUTOMAKE) --gnu src/Makefile 407 411 .PRECIOUS: Makefile 408 412 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 491 495 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@ 492 496 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@ 497 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@ 493 498 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state.Po@am__quote@ 494 499 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@ … … 1210 1215 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1211 1216 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'lib/graphics/importer/texture.cc'; then $(CYGPATH_W) 'lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/texture.cc'; fi` 1217 1218 sound_engine.o: lib/sound/sound_engine.cc 1219 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.o -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc; \ 1220 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi 1221 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/sound/sound_engine.cc' object='sound_engine.o' libtool=no @AMDEPBACKSLASH@ 1222 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@ 1223 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1224 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc 1225 1226 sound_engine.obj: lib/sound/sound_engine.cc 1227 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.obj -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi`; \ 1228 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi 1229 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/sound/sound_engine.cc' object='sound_engine.obj' libtool=no @AMDEPBACKSLASH@ 1230 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@ 1231 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1232 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi` 1212 1233 1213 1234 base_object.o: lib/lang/base_object.cc … … 1445 1466 1446 1467 distdir: $(DISTFILES) 1447 $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/ util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities1468 $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/sound $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities 1448 1469 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 1449 1470 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -
orxonox/trunk/src/defs/include_paths.am
r4457 r4504 16 16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics 17 17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields 18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound 18 19 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs 19 20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font -
orxonox/trunk/src/lib/Makefile.in
r4484 r4504 186 186 esac; \ 187 187 done; \ 188 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/Makefile'; \188 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/Makefile'; \ 189 189 cd $(top_srcdir) && \ 190 $(AUTOMAKE) -- foreignsrc/lib/Makefile190 $(AUTOMAKE) --gnu src/lib/Makefile 191 191 .PRECIOUS: Makefile 192 192 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/event/Makefile.in
r4484 r4504 212 212 esac; \ 213 213 done; \ 214 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/event/Makefile'; \214 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/event/Makefile'; \ 215 215 cd $(top_srcdir) && \ 216 $(AUTOMAKE) -- foreignsrc/lib/event/Makefile216 $(AUTOMAKE) --gnu src/lib/event/Makefile 217 217 .PRECIOUS: Makefile 218 218 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/graphics/Makefile.in
r4438 r4504 177 177 esac; \ 178 178 done; \ 179 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile'; \179 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/Makefile'; \ 180 180 cd $(top_srcdir) && \ 181 $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile181 $(AUTOMAKE) --gnu src/lib/graphics/Makefile 182 182 .PRECIOUS: Makefile 183 183 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/graphics/importer/Makefile.in
r4438 r4504 181 181 esac; \ 182 182 done; \ 183 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile'; \183 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile'; \ 184 184 cd $(top_srcdir) && \ 185 $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile185 $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile 186 186 .PRECIOUS: Makefile 187 187 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/Makefile.in
r4438 r4504 241 241 esac; \ 242 242 done; \ 243 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile'; \243 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/Makefile'; \ 244 244 cd $(top_srcdir) && \ 245 $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile245 $(AUTOMAKE) --gnu src/lib/gui/Makefile 246 246 .PRECIOUS: Makefile 247 247 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/particles/Makefile.in
r4438 r4504 209 209 esac; \ 210 210 done; \ 211 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/particles/Makefile'; \211 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/particles/Makefile'; \ 212 212 cd $(top_srcdir) && \ 213 $(AUTOMAKE) -- foreignsrc/lib/particles/Makefile213 $(AUTOMAKE) --gnu src/lib/particles/Makefile 214 214 .PRECIOUS: Makefile 215 215 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/physics/Makefile.in
r4438 r4504 217 217 esac; \ 218 218 done; \ 219 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/physics/Makefile'; \219 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/physics/Makefile'; \ 220 220 cd $(top_srcdir) && \ 221 $(AUTOMAKE) -- foreignsrc/lib/physics/Makefile221 $(AUTOMAKE) --gnu src/lib/physics/Makefile 222 222 .PRECIOUS: Makefile 223 223 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/tinyxml/Makefile.in
r4438 r4504 204 204 esac; \ 205 205 done; \ 206 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/tinyxml/Makefile'; \206 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/tinyxml/Makefile'; \ 207 207 cd $(top_srcdir) && \ 208 $(AUTOMAKE) -- foreignsrc/lib/tinyxml/Makefile208 $(AUTOMAKE) --gnu src/lib/tinyxml/Makefile 209 209 .PRECIOUS: Makefile 210 210 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/orxonox.cc
r4446 r4504 33 33 #include "game_loader.h" 34 34 #include "graphics_engine.h" 35 #include "sound_engine.h" 35 36 #include "resource_manager.h" 36 37 #include "object_manager.h" … … 72 73 Orxonox::singletonRef = NULL; 73 74 delete GraphicsEngine::getInstance(); // deleting the Graphics 75 delete TextEngine::getInstance(); 76 delete SoundEngine::getInstance(); 74 77 delete ResourceManager::getInstance(); // deletes the Resource Manager 75 78 delete ObjectManager::getInstance(); … … 121 124 if( initVideo() == -1) return -1; 122 125 if( initSound() == -1) return -1; 123 printf("> Initializing input\n");126 PRINT(3)("> Initializing input\n"); 124 127 if( initInput() == -1) return -1; 125 printf("> Initializing networking\n");128 PRINT(3)("> Initializing networking\n"); 126 129 if( initNetworking () == -1) return -1; 127 130 //printf("> Initializing world\n"); … … 149 152 int Orxonox::initSound() 150 153 { 151 printf("> Initializing sound\n");154 PRINT(3)("> Initializing sound\n"); 152 155 // SDL_Init(SDL_INIT_AUDIO); 153 printf("Not yet implemented\n");156 SoundEngine::getInstance()->initAudio(); 154 157 return 0; 155 158 } -
orxonox/trunk/src/story_entities/world.cc
r4502 r4504 65 65 #include "event_handler.h" 66 66 67 #include "sound_engine.h" 68 67 69 using namespace std; 68 70 … … 182 184 delete this->particleEngine; 183 185 TextEngine::getInstance()->flush(); 186 SoundEngine::getInstance()->flushAllBuffers(); 187 184 188 delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence. 185 189 delete PhysicsEngine::getInstance(); … … 468 472 this->spawn(terrain); 469 473 474 SoundEngine::getInstance()->setListener(this->localCamera); 470 475 471 476 … … 1079 1084 this->garbageCollector->update(); 1080 1085 this->nullParent->update (this->dtS); 1086 1087 SoundEngine::getInstance()->update(); 1081 1088 } 1082 1089 -
orxonox/trunk/src/subprojects/Makefile.in
r4438 r4504 186 186 esac; \ 187 187 done; \ 188 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/Makefile'; \188 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/Makefile'; \ 189 189 cd $(top_srcdir) && \ 190 $(AUTOMAKE) -- foreignsrc/subprojects/Makefile190 $(AUTOMAKE) --gnu src/subprojects/Makefile 191 191 .PRECIOUS: Makefile 192 192 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/subprojects/gui/Makefile.in
r4438 r4504 194 194 target_vendor = @target_vendor@ 195 195 MAINSRCDIR = ../.. 196 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects197 196 AM_LDFLAGS = $(MWINDOWS) 198 197 gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a … … 229 228 esac; \ 230 229 done; \ 231 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/gui/Makefile'; \230 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/gui/Makefile'; \ 232 231 cd $(top_srcdir) && \ 233 $(AUTOMAKE) -- foreignsrc/subprojects/gui/Makefile232 $(AUTOMAKE) --gnu src/subprojects/gui/Makefile 234 233 .PRECIOUS: Makefile 235 234 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 688 687 uninstall-am uninstall-binPROGRAMS uninstall-info-am 689 688 689 include $(MAINSRCDIR)/defs/include_paths.am 690 690 # Tell versions [3.59,3.63) of GNU make to not export all variables. 691 691 # Otherwise a system limit (for SysV at least) may be exceeded. -
orxonox/trunk/src/subprojects/importer/Makefile.in
r4492 r4504 237 237 esac; \ 238 238 done; \ 239 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/importer/Makefile'; \239 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/importer/Makefile'; \ 240 240 cd $(top_srcdir) && \ 241 $(AUTOMAKE) -- foreignsrc/subprojects/importer/Makefile241 $(AUTOMAKE) --gnu src/subprojects/importer/Makefile 242 242 .PRECIOUS: Makefile 243 243 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/subprojects/particles/Makefile.in
r4493 r4504 260 260 esac; \ 261 261 done; \ 262 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/particles/Makefile'; \262 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/particles/Makefile'; \ 263 263 cd $(top_srcdir) && \ 264 $(AUTOMAKE) -- foreignsrc/subprojects/particles/Makefile264 $(AUTOMAKE) --gnu src/subprojects/particles/Makefile 265 265 .PRECIOUS: Makefile 266 266 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/subprojects/testmain/Makefile.in
r4438 r4504 180 180 target_vendor = @target_vendor@ 181 181 MAINSRCDIR = ../.. 182 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai183 182 AM_LDFLAGS = $(MWINDOWS) 184 183 testmain_SOURCES = testmain.cc … … 197 196 esac; \ 198 197 done; \ 199 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/testmain/Makefile'; \198 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/testmain/Makefile'; \ 200 199 cd $(top_srcdir) && \ 201 $(AUTOMAKE) -- foreignsrc/subprojects/testmain/Makefile200 $(AUTOMAKE) --gnu src/subprojects/testmain/Makefile 202 201 .PRECIOUS: Makefile 203 202 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 435 434 uninstall-am uninstall-binPROGRAMS uninstall-info-am 436 435 436 include $(MAINSRCDIR)/defs/include_paths.am 437 437 # Tell versions [3.59,3.63) of GNU make to not export all variables. 438 438 # Otherwise a system limit (for SysV at least) may be exceeded. -
orxonox/trunk/src/util/resource_manager.cc
r4468 r4504 24 24 #include "texture.h" 25 25 #include "text_engine.h" 26 #include "sound_engine.h" 26 27 27 28 #include "list.h" … … 312 313 else 313 314 PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName); 315 break; 316 case WAV: 317 if(isFile(fullName)) 318 tmpResource->pointer = new SoundBuffer(fullName); 314 319 break; 315 320 case IMAGE: … … 407 412 delete (Texture*)resource->pointer; 408 413 break; 414 case WAV: 415 delete (SoundBuffer*)resource->pointer; 416 break; 409 417 case TTF: 410 418 delete (Font*)resource->pointer; -
orxonox/trunk/src/world_entities/test_gun.cc
r4467 r4504 31 31 #include "list.h" 32 32 #include "animation3d.h" 33 #include "sound_engine.h" 33 34 34 35 #include "object_manager.h" … … 89 90 this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 90 91 } 91 92 93 this->fireSound = (SoundBuffer*)ResourceManager::getInstance()->load("sound/shot1.wav", WAV); 94 this->weaponSource = new SoundSource(this->fireSound, this); 95 this->weaponSource->setRolloffFactor(.1); 92 96 Projectile* p = new TestBullet(this); 93 97 ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p); … … 146 150 147 151 Projectile* pj = dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET)); 152 weaponSource->play(); 153 148 154 pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset); 149 155 pj->setAbsDir(this->getAbsDir()); -
orxonox/trunk/src/world_entities/weapon.h
r3888 r4504 175 175 int leftRight; // this will become an enum 176 176 177 SoundBuffer* fireSound; 178 SoundSource* weaponSource; 179 180 177 181 private: 178 182 bool enabled; //<! states if the weapon is enabled or not -
orxonox/trunk/src/world_entities/world_entity.h
r4261 r4504 13 13 #include "load_param.h" 14 14 15 16 15 //class CollisionCluster; 17 16 class CharacterAttributes; 18 17 class Model; 18 class SoundEngine; 19 class SoundBuffer; 20 class SoundSource; 21 19 22 //! Basic class from which all interactive stuff in the world is derived from 20 23 class WorldEntity : public PNode
Note: See TracChangeset
for help on using the changeset viewer.
