Changeset 2188 in orxonox.OLD for orxonox/branches
- Timestamp:
- Jul 17, 2004, 10:22:35 AM (20 years ago)
- Location:
- orxonox/branches/chris
- Files:
-
- 1 deleted
- 5 edited
- 1 copied
-
NEWS (copied) (copied from orxonox/trunk/NEWS)
-
config.h.in (modified) (1 diff)
-
configure (modified) (2 diffs)
-
configure.ac (modified) (2 diffs)
-
src/Makefile (deleted)
-
src/Makefile.am (modified) (2 diffs)
-
src/Makefile.in (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/chris/config.h.in
r1982 r2188 34 34 /* Define to 1 if you have the <memory.h> header file. */ 35 35 #undef HAVE_MEMORY_H 36 37 /* Define to 1 if you have the <SDL/SDL.h> header file. */ 38 #undef HAVE_SDL_SDL_H 36 39 37 40 /* Define to 1 if you have the `sqrt' function. */ -
orxonox/branches/chris/configure
r2058 r2188 1732 1732 mingw=yes 1733 1733 MSBITFIELDS="-mms-bitfields" 1734 MWINDOWS="-mwindows" 1734 1735 ;; 1735 1736 *) … … 4900 4901 fi 4901 4902 fi 4903 4904 ## SDL CHECK 4905 4906 #checking for SDL libs 4907 4908 for ac_header in SDL/SDL.h 4909 do 4910 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 4911 if eval "test \"\${$as_ac_Header+set}\" = set"; then 4912 echo "$as_me:$LINENO: checking for $ac_header" >&5 4913 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 4914 if eval "test \"\${$as_ac_Header+set}\" = set"; then 4915 echo $ECHO_N "(cached) $ECHO_C" >&6 4916 fi 4917 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 4918 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 4919 else 4920 # Is the header compilable? 4921 echo "$as_me:$LINENO: checking $ac_header usability" >&5 4922 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 4923 cat >conftest.$ac_ext <<_ACEOF 4924 /* confdefs.h. */ 4925 _ACEOF 4926 cat confdefs.h >>conftest.$ac_ext 4927 cat >>conftest.$ac_ext <<_ACEOF 4928 /* end confdefs.h. */ 4929 $ac_includes_default 4930 #include <$ac_header> 4931 _ACEOF 4932 rm -f conftest.$ac_objext 4933 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4934 (eval $ac_compile) 2>conftest.er1 4935 ac_status=$? 4936 grep -v '^ *+' conftest.er1 >conftest.err 4937 rm -f conftest.er1 4938 cat conftest.err >&5 4939 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4940 (exit $ac_status); } && 4941 { ac_try='test -z "$ac_c_werror_flag" 4942 || test ! -s conftest.err' 4943 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4944 (eval $ac_try) 2>&5 4945 ac_status=$? 4946 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4947 (exit $ac_status); }; } && 4948 { ac_try='test -s conftest.$ac_objext' 4949 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4950 (eval $ac_try) 2>&5 4951 ac_status=$? 4952 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4953 (exit $ac_status); }; }; then 4954 ac_header_compiler=yes 4955 else 4956 echo "$as_me: failed program was:" >&5 4957 sed 's/^/| /' conftest.$ac_ext >&5 4958 4959 ac_header_compiler=no 4960 fi 4961 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 4962 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 4963 echo "${ECHO_T}$ac_header_compiler" >&6 4964 4965 # Is the header present? 4966 echo "$as_me:$LINENO: checking $ac_header presence" >&5 4967 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 4968 cat >conftest.$ac_ext <<_ACEOF 4969 /* confdefs.h. */ 4970 _ACEOF 4971 cat confdefs.h >>conftest.$ac_ext 4972 cat >>conftest.$ac_ext <<_ACEOF 4973 /* end confdefs.h. */ 4974 #include <$ac_header> 4975 _ACEOF 4976 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 4977 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4978 ac_status=$? 4979 grep -v '^ *+' conftest.er1 >conftest.err 4980 rm -f conftest.er1 4981 cat conftest.err >&5 4982 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4983 (exit $ac_status); } >/dev/null; then 4984 if test -s conftest.err; then 4985 ac_cpp_err=$ac_c_preproc_warn_flag 4986 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 4987 else 4988 ac_cpp_err= 4989 fi 4990 else 4991 ac_cpp_err=yes 4992 fi 4993 if test -z "$ac_cpp_err"; then 4994 ac_header_preproc=yes 4995 else 4996 echo "$as_me: failed program was:" >&5 4997 sed 's/^/| /' conftest.$ac_ext >&5 4998 4999 ac_header_preproc=no 5000 fi 5001 rm -f conftest.err conftest.$ac_ext 5002 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 5003 echo "${ECHO_T}$ac_header_preproc" >&6 5004 5005 # So? What about this header? 5006 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 5007 yes:no: ) 5008 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 5009 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 5010 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 5011 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 5012 ac_header_preproc=yes 5013 ;; 5014 no:yes:* ) 5015 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 5016 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 5017 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 5018 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 5019 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 5020 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 5021 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 5022 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 5023 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 5024 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 5025 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 5026 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 5027 ( 5028 cat <<\_ASBOX 5029 ## ------------------------------------------- ## 5030 ## Report this to orxonox-dev@mail.datacore.ch ## 5031 ## ------------------------------------------- ## 5032 _ASBOX 5033 ) | 5034 sed "s/^/$as_me: WARNING: /" >&2 5035 ;; 5036 esac 5037 echo "$as_me:$LINENO: checking for $ac_header" >&5 5038 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 5039 if eval "test \"\${$as_ac_Header+set}\" = set"; then 5040 echo $ECHO_N "(cached) $ECHO_C" >&6 5041 else 5042 eval "$as_ac_Header=\$ac_header_preproc" 5043 fi 5044 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 5045 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 5046 5047 fi 5048 if test `eval echo '${'$as_ac_Header'}'` = yes; then 5049 cat >>confdefs.h <<_ACEOF 5050 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 5051 _ACEOF 5052 5053 else 5054 { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5 5055 echo "$as_me: error: cannot find SDL headers" >&2;} 5056 { (exit 1); exit 1; }; } 5057 fi 5058 5059 done 5060 5061 5062 echo "$as_me:$LINENO: checking for main in -lSDL" >&5 5063 echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6 5064 if test "${ac_cv_lib_SDL_main+set}" = set; then 5065 echo $ECHO_N "(cached) $ECHO_C" >&6 5066 else 5067 ac_check_lib_save_LIBS=$LIBS 5068 LIBS="-lSDL $LIBS" 5069 cat >conftest.$ac_ext <<_ACEOF 5070 /* confdefs.h. */ 5071 _ACEOF 5072 cat confdefs.h >>conftest.$ac_ext 5073 cat >>conftest.$ac_ext <<_ACEOF 5074 /* end confdefs.h. */ 5075 5076 5077 int 5078 main () 5079 { 5080 main (); 5081 ; 5082 return 0; 5083 } 5084 _ACEOF 5085 rm -f conftest.$ac_objext conftest$ac_exeext 5086 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5087 (eval $ac_link) 2>conftest.er1 5088 ac_status=$? 5089 grep -v '^ *+' conftest.er1 >conftest.err 5090 rm -f conftest.er1 5091 cat conftest.err >&5 5092 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5093 (exit $ac_status); } && 5094 { ac_try='test -z "$ac_c_werror_flag" 5095 || test ! -s conftest.err' 5096 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5097 (eval $ac_try) 2>&5 5098 ac_status=$? 5099 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5100 (exit $ac_status); }; } && 5101 { ac_try='test -s conftest$ac_exeext' 5102 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5103 (eval $ac_try) 2>&5 5104 ac_status=$? 5105 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5106 (exit $ac_status); }; }; then 5107 ac_cv_lib_SDL_main=yes 5108 else 5109 echo "$as_me: failed program was:" >&5 5110 sed 's/^/| /' conftest.$ac_ext >&5 5111 5112 ac_cv_lib_SDL_main=no 5113 fi 5114 rm -f conftest.err conftest.$ac_objext \ 5115 conftest$ac_exeext conftest.$ac_ext 5116 LIBS=$ac_check_lib_save_LIBS 5117 fi 5118 echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_main" >&5 5119 echo "${ECHO_T}$ac_cv_lib_SDL_main" >&6 5120 if test $ac_cv_lib_SDL_main = yes; then 5121 FOUND_SDL=yes 5122 fi 5123 5124 if test "$FOUND_SDL" = "yes" ; then 5125 LIBS="$LIBS -lSDL" 5126 # checking for Windows sdl library 5127 else 5128 echo "We did not find the Linux sdl Library. Checking for Windows Library" 5129 echo "$as_me:$LINENO: checking for main in -lsdlmain" >&5 5130 echo $ECHO_N "checking for main in -lsdlmain... $ECHO_C" >&6 5131 if test "${ac_cv_lib_sdlmain_main+set}" = set; then 5132 echo $ECHO_N "(cached) $ECHO_C" >&6 5133 else 5134 ac_check_lib_save_LIBS=$LIBS 5135 LIBS="-lsdlmain $LIBS" 5136 cat >conftest.$ac_ext <<_ACEOF 5137 /* confdefs.h. */ 5138 _ACEOF 5139 cat confdefs.h >>conftest.$ac_ext 5140 cat >>conftest.$ac_ext <<_ACEOF 5141 /* end confdefs.h. */ 5142 5143 5144 int 5145 main () 5146 { 5147 main (); 5148 ; 5149 return 0; 5150 } 5151 _ACEOF 5152 rm -f conftest.$ac_objext conftest$ac_exeext 5153 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5154 (eval $ac_link) 2>conftest.er1 5155 ac_status=$? 5156 grep -v '^ *+' conftest.er1 >conftest.err 5157 rm -f conftest.er1 5158 cat conftest.err >&5 5159 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5160 (exit $ac_status); } && 5161 { ac_try='test -z "$ac_c_werror_flag" 5162 || test ! -s conftest.err' 5163 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5164 (eval $ac_try) 2>&5 5165 ac_status=$? 5166 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5167 (exit $ac_status); }; } && 5168 { ac_try='test -s conftest$ac_exeext' 5169 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5170 (eval $ac_try) 2>&5 5171 ac_status=$? 5172 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5173 (exit $ac_status); }; }; then 5174 ac_cv_lib_sdlmain_main=yes 5175 else 5176 echo "$as_me: failed program was:" >&5 5177 sed 's/^/| /' conftest.$ac_ext >&5 5178 5179 ac_cv_lib_sdlmain_main=no 5180 fi 5181 rm -f conftest.err conftest.$ac_objext \ 5182 conftest$ac_exeext conftest.$ac_ext 5183 LIBS=$ac_check_lib_save_LIBS 5184 fi 5185 echo "$as_me:$LINENO: result: $ac_cv_lib_sdlmain_main" >&5 5186 echo "${ECHO_T}$ac_cv_lib_sdlmain_main" >&6 5187 if test $ac_cv_lib_sdlmain_main = yes; then 5188 FOUND_sdlmain=yes 5189 fi 5190 5191 if test "$FOUND_sdlmain" = "yes" ; then 5192 LIBS="$LIBS -lsdlmain -lsdl" 5193 else 5194 echo "------------------" 5195 echo "sdl library not found." 5196 echo "please install the libsdl, which can be found at http://www.libsdl.org" 5197 echo "------------------" 5198 exit -1 5199 fi 5200 fi 5201 5202 #checking for pthread libs 5203 echo "$as_me:$LINENO: checking for main in -lpthread" >&5 5204 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 5205 if test "${ac_cv_lib_pthread_main+set}" = set; then 5206 echo $ECHO_N "(cached) $ECHO_C" >&6 5207 else 5208 ac_check_lib_save_LIBS=$LIBS 5209 LIBS="-lpthread $LIBS" 5210 cat >conftest.$ac_ext <<_ACEOF 5211 /* confdefs.h. */ 5212 _ACEOF 5213 cat confdefs.h >>conftest.$ac_ext 5214 cat >>conftest.$ac_ext <<_ACEOF 5215 /* end confdefs.h. */ 5216 5217 5218 int 5219 main () 5220 { 5221 main (); 5222 ; 5223 return 0; 5224 } 5225 _ACEOF 5226 rm -f conftest.$ac_objext conftest$ac_exeext 5227 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5228 (eval $ac_link) 2>conftest.er1 5229 ac_status=$? 5230 grep -v '^ *+' conftest.er1 >conftest.err 5231 rm -f conftest.er1 5232 cat conftest.err >&5 5233 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5234 (exit $ac_status); } && 5235 { ac_try='test -z "$ac_c_werror_flag" 5236 || test ! -s conftest.err' 5237 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5238 (eval $ac_try) 2>&5 5239 ac_status=$? 5240 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5241 (exit $ac_status); }; } && 5242 { ac_try='test -s conftest$ac_exeext' 5243 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5244 (eval $ac_try) 2>&5 5245 ac_status=$? 5246 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5247 (exit $ac_status); }; }; then 5248 ac_cv_lib_pthread_main=yes 5249 else 5250 echo "$as_me: failed program was:" >&5 5251 sed 's/^/| /' conftest.$ac_ext >&5 5252 5253 ac_cv_lib_pthread_main=no 5254 fi 5255 rm -f conftest.err conftest.$ac_objext \ 5256 conftest$ac_exeext conftest.$ac_ext 5257 LIBS=$ac_check_lib_save_LIBS 5258 fi 5259 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 5260 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 5261 if test $ac_cv_lib_pthread_main = yes; then 5262 FOUND_pthread=yes 5263 fi 5264 5265 if test "$FOUND_pthread" = "yes" ; then 5266 LIBS="$LIBS -lpthread" 5267 fi 5268 5269 #checking for libs 5270 echo "$as_me:$LINENO: checking for main in -lpthread" >&5 5271 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 5272 if test "${ac_cv_lib_pthread_main+set}" = set; then 5273 echo $ECHO_N "(cached) $ECHO_C" >&6 5274 else 5275 ac_check_lib_save_LIBS=$LIBS 5276 LIBS="-lpthread $LIBS" 5277 cat >conftest.$ac_ext <<_ACEOF 5278 /* confdefs.h. */ 5279 _ACEOF 5280 cat confdefs.h >>conftest.$ac_ext 5281 cat >>conftest.$ac_ext <<_ACEOF 5282 /* end confdefs.h. */ 5283 5284 5285 int 5286 main () 5287 { 5288 main (); 5289 ; 5290 return 0; 5291 } 5292 _ACEOF 5293 rm -f conftest.$ac_objext conftest$ac_exeext 5294 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5295 (eval $ac_link) 2>conftest.er1 5296 ac_status=$? 5297 grep -v '^ *+' conftest.er1 >conftest.err 5298 rm -f conftest.er1 5299 cat conftest.err >&5 5300 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5301 (exit $ac_status); } && 5302 { ac_try='test -z "$ac_c_werror_flag" 5303 || test ! -s conftest.err' 5304 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5305 (eval $ac_try) 2>&5 5306 ac_status=$? 5307 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5308 (exit $ac_status); }; } && 5309 { ac_try='test -s conftest$ac_exeext' 5310 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5311 (eval $ac_try) 2>&5 5312 ac_status=$? 5313 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5314 (exit $ac_status); }; }; then 5315 ac_cv_lib_pthread_main=yes 5316 else 5317 echo "$as_me: failed program was:" >&5 5318 sed 's/^/| /' conftest.$ac_ext >&5 5319 5320 ac_cv_lib_pthread_main=no 5321 fi 5322 rm -f conftest.err conftest.$ac_objext \ 5323 conftest$ac_exeext conftest.$ac_ext 5324 LIBS=$ac_check_lib_save_LIBS 5325 fi 5326 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 5327 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 5328 if test $ac_cv_lib_pthread_main = yes; then 5329 FOUND_pthread=yes 5330 fi 5331 5332 if test "$FOUND_pthread" = "yes" ; then 5333 LIBS="$LIBS -lpthread" 5334 fi 5335 5336 5337 5338 4902 5339 4903 5340 # FIXME: Replace `main' with a function in `-lm': -
orxonox/branches/chris/configure.ac
r2058 r2188 13 13 mingw=yes 14 14 MSBITFIELDS="-mms-bitfields" 15 MWINDOWS="-mwindows" 15 16 ;; 16 17 *) … … 103 104 fi 104 105 106 ## SDL CHECK 107 108 #checking for SDL libs 109 AC_CHECK_HEADERS(SDL/SDL.h ,, 110 [AC_MSG_ERROR([cannot find SDL headers]) ]) 111 112 AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes) 113 if test "$FOUND_SDL" = "yes" ; then 114 LIBS="$LIBS -lSDL" 115 # checking for Windows sdl library 116 else 117 echo "We did not find the Linux sdl Library. Checking for Windows Library" 118 AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes) 119 if test "$FOUND_sdlmain" = "yes" ; then 120 LIBS="$LIBS -lsdlmain -lsdl" 121 else 122 echo "------------------" 123 echo "sdl library not found." 124 echo "please install the libsdl, which can be found at http://www.libsdl.org" 125 echo "------------------" 126 exit -1 127 fi 128 fi 129 130 #checking for pthread libs 131 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) 132 if test "$FOUND_pthread" = "yes" ; then 133 LIBS="$LIBS -lpthread" 134 fi 135 136 #checking for libs 137 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) 138 if test "$FOUND_pthread" = "yes" ; then 139 LIBS="$LIBS -lpthread" 140 fi 141 142 143 144 145 105 146 # FIXME: Replace `main' with a function in `-lm': 106 147 AC_CHECK_LIB([m], [main]) -
orxonox/branches/chris/src/Makefile.am
r2103 r2188 1 1 AM_CXXFLAGS="-I/usr/X11R6/include" 2 AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11" 2 AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS) 3 3 4 4 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include" … … 9 9 10 10 # uncomment the following if bencoder requires the math library 11 #gui_LDADD=-lm11 orxonox_LDADD=-lm 12 12 13 13 #EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo -
orxonox/branches/chris/src/Makefile.in
r2103 r2188 112 112 target_alias = @target_alias@ 113 113 AM_CXXFLAGS = "-I/usr/X11R6/include" 114 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11" 114 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS) 115 115 116 116 … … 118 118 bin_PROGRAMS = orxonox 119 119 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 120 121 # uncomment the following if bencoder requires the math library 122 orxonox_LDADD = -lm 120 123 subdir = src 121 124 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 131 134 ini_parser.$(OBJEXT) keynames.$(OBJEXT) track.$(OBJEXT) 132 135 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 133 orxonox_LDADD = $(LDADD)134 136 orxonox_DEPENDENCIES = 135 137 orxonox_LDFLAGS = … … 407 409 408 410 409 # uncomment the following if bencoder requires the math library410 #gui_LDADD=-lm411 412 411 #EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo 413 412
Note: See TracChangeset
for help on using the changeset viewer.
