• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1967 (tree)
日時2011-10-14 15:29:53
作者satofumi

ログメッセージ

fixed compile error

変更サマリ

差分

--- trunk/libs/lua/luabindAudio.cpp (revision 1966)
+++ trunk/libs/lua/luabindAudio.cpp (revision 1967)
@@ -31,6 +31,7 @@
3131 class_<BackMusic>("BackMusic")
3232 .def(constructor<>())
3333 .def("setMute", &BackMusic::setMute)
34+ .def("isMute", &BackMusic::isMute)
3435 .def("setVolume", &BackMusic::setVolume)
3536 .def("play", &BackMusic::play)
3637 .def("stop", &BackMusic::stop)
@@ -39,6 +40,7 @@
3940 class_<SoundEffect>("SoundEffect")
4041 .def(constructor<const char*>())
4142 .def("setMute", &SoundEffect::setMute)
43+ .def("isMute", &SoundEffect::isMute)
4244 .def("setMasterVolume", &SoundEffect::setMasterVolume)
4345 .def("setVolume", &SoundEffect::setVolume)
4446 .def("play", &SoundEffect::play)
--- trunk/libs/lua/samples/bindCpp.cpp (revision 1966)
+++ trunk/libs/lua/samples/bindCpp.cpp (revision 1967)
@@ -29,7 +29,7 @@
2929 luabindSystem(L);
3030
3131 // 1つ上のパスを Lua の実行パスに追加
32- LuaHandler::addPath(L, "../?.lua\"");
32+ LuaHandler::addPath(L, "../?.lua");
3333
3434 // 引数で渡されたスクリプトの実行
3535 return LuaHandler::dofile(L, lua_script);
--- trunk/libs/range_sensor/c/samples/md_scan.c (revision 1966)
+++ trunk/libs/range_sensor/c/samples/md_scan.c (revision 1967)
@@ -11,7 +11,6 @@
1111 */
1212
1313 #include "urg_ctrl.h"
14-#include "urg_delay.h"
1514 #include <stdio.h>
1615 #include <stdlib.h>
1716 #include <assert.h>
--- trunk/libs/packages/c_urg_sample/md_scan.c (revision 1966)
+++ trunk/libs/packages/c_urg_sample/md_scan.c (revision 1967)
@@ -11,7 +11,6 @@
1111 */
1212
1313 #include "urg_ctrl.h"
14-#include "delay.h"
1514 #include <stdio.h>
1615 #include <stdlib.h>
1716 #include <assert.h>
--- trunk/libs/packages/urg/configure.in (revision 1966)
+++ trunk/libs/packages/urg/configure.in (revision 1967)
@@ -3,7 +3,7 @@
33
44 AC_PREREQ(2.59)
55
6-AC_INIT(urg, 0.8.13, satofumi@users.sourceforge.jp)
6+AC_INIT(urg, 0.8.14, satofumi@users.sourceforge.jp)
77 AM_INIT_AUTOMAKE
88 AC_CONFIG_SRCDIR([src/c/urg/urg_ctrl.c])
99 AM_CONFIG_HEADER([config.h])
@@ -40,6 +40,9 @@
4040
4141 INSTALL_LIBS="-lurg_monitor -lurg -lurg_coordinate -lurg_geometry -lurg_connection -lurg_connection_sdl -lurg_common -lurg_system"
4242 C_INSTALL_LIBS="-lc_urg -lc_urg_connection -lc_urg_system"
43+
44+AC_CHECK_LIB(m, cos, [C_INSTALL_LIBS="$C_INSTALL_LIBS -lm" INSTALL_LIBS="$INSTALL_LIBS -lm"], AC_MSG_ERROR([unable to find the cos() function]))
45+
4346 AC_SUBST(INSTALL_LIBS)
4447 AC_SUBST(C_INSTALL_LIBS)
4548
@@ -64,6 +67,7 @@
6467 AC_FUNC_SELECT_ARGTYPES
6568 AC_FUNC_STRERROR_R
6669 AC_FUNC_VPRINTF
70+AC_FUNC_STAT
6771 AC_CHECK_FUNCS([atexit floor gettimeofday memmove select strerror strrchr strtol strstr])
6872 AC_SUBST(SAMPLES_LIBS_PATH, "-L\${top_builddir}/src/c/urg -L\${top_builddir}/src/c/connection -L\${top_builddir}/src/c/system -L\${top_builddir}/src/cpp/urg -L\${top_builddir}/src/cpp/connection -L\${top_builddir}/src/cpp/common -L\${top_builddir}/src/cpp/system -L\${top_builddir}/src/cpp/monitor -L\${top_builddir}/src/cpp/coordinate -L\${top_builddir}/src/cpp/geometry -L\${top_builddir}/src/cpp/connection/sdl")
6973 AC_CONFIG_FILES([Makefile
--- trunk/libs/packages/urg/config.h.in (revision 1966)
+++ trunk/libs/packages/urg/config.h.in (revision 1967)
@@ -54,6 +54,10 @@
5454 /* Define to 1 if you have the `select' function. */
5555 #undef HAVE_SELECT
5656
57+/* Define to 1 if `stat' has the bug that it succeeds when given the
58+ zero-length file name argument. */
59+#undef HAVE_STAT_EMPTY_STRING_BUG
60+
5761 /* Define to 1 if stdbool.h conforms to C99. */
5862 #undef HAVE_STDBOOL_H
5963
@@ -122,6 +126,10 @@
122126 /* Define to 1 if the system has the type `_Bool'. */
123127 #undef HAVE__BOOL
124128
129+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
130+ slash. */
131+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
132+
125133 /* Define to the sub-directory in which libtool stores uninstalled libraries.
126134 */
127135 #undef LT_OBJDIR
--- trunk/libs/packages/urg/samples/c/Makefile.am (revision 1966)
+++ trunk/libs/packages/urg/samples/c/Makefile.am (revision 1967)
@@ -14,7 +14,7 @@
1414 intensity_sample_SOURCES = intensity_sample.c
1515 partial_scan_SOURCES = partial_scan.c
1616
17-LIBS = $(SAMPLES_LIBS_PATH) $(C_INSTALL_LIBS) -lm
17+LIBS = $(SAMPLES_LIBS_PATH) $(C_INSTALL_LIBS)
1818
1919 EXTRA_DIST = \
2020 samples_c.sln \
旧リポジトリブラウザで表示