Changeset 9317 in orxonox.OLD

Timestamp:

Jul 18, 2006, 10:35:50 AM (18 years ago)

Author:

bensch

Message:

recapture-mouse a new subproj

Location:

branches/proxy

Files:

• configure.ac (modified) (3 diffs)
• src/subprojects/recapture_mouse (copied) (copied from branches/proxy/src/subprojects/importer)
• src/subprojects/recapture_mouse/Makefile.am (modified) (2 diffs)

branches/proxy/configure.ac

@@ -449 +449 @@
     AC_CHECK_HEADERS([OpenGL/glu.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
-        AC_CHECK_LIB( OpenGL, main, , )
+        AC_CHECK_LIB( OpenGL, main, , )
    LIBS="$LIBS -framework OpenGL"
 
@@ -560 +560 @@
 #----#
 if test x$osX = xyes ; then
-#       PKG_CONFIG_PATH="$prefix"
-#       PKG_CHECK_MODULES( QT, QtOpenGL >= 4.01 QtCore >= 4.01 QtGui >= 4.0.1 )
-#       QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtOpenGL QtCore QtGui`
+#       PKG_CONFIG_PATH="$prefix"
+#       PKG_CHECK_MODULES( QT, QtOpenGL >= 4.01 QtCore >= 4.01 QtGui >= 4.0.1 )
+#       QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtOpenGL QtCore QtGui`
 #----------#
-            AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
-              if test x${QT_MOC} = xno ; then
-                AC_MSG_ERROR([QT MOC not found])
-              fi
-        AC_SUBST([QT_MOC])
-
-        AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
-        AC_SUBST([QT_UIC])
-
-        AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
-
-        AC_SUBST([QT_RCC])
-        AC_SUBST( QT_INCLUDE_DIR )
-        AC_SUBST( QT_CFLAGS )
-        AC_SUBST( QT_LDFLAGS )
-        AC_SUBST( QT_LIBS )
-        echo "QT_LIBS                   = $QT_LIBS"
-        echo "QT_CFLAGS                 = $QT_CFLAGS"
-        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"
+            AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+              if test x${QT_MOC} = xno ; then
+                AC_MSG_ERROR([QT MOC not found])
+              fi
+        AC_SUBST([QT_MOC])
+
+        AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+        AC_SUBST([QT_UIC])
+
+        AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+
+        AC_SUBST([QT_RCC])
+        AC_SUBST( QT_INCLUDE_DIR )
+        AC_SUBST( QT_CFLAGS )
+        AC_SUBST( QT_LDFLAGS )
+        AC_SUBST( QT_LIBS )
+        echo "QT_LIBS                   = $QT_LIBS"
+        echo "QT_CFLAGS                 = $QT_CFLAGS"
+        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"
 else
-        AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
-        if test x$have_qt = xno ; then
-                WITH_QT=no
-        fi
+        AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
+        if test x$have_qt = xno ; then
+                WITH_QT=no
+        fi
 fi
 
@@ -672 +672 @@
                  src/subprojects/collision_detection/Makefile
                  src/subprojects/network/Makefile
+                 src/subprojects/recapture_mouse/Makefile
                  ])
 

branches/proxy/src/subprojects/recapture_mouse/Makefile.am

@@ -11 +11 @@
 
 bin_PROGRAMS = \
-                importer \
-                multitex
-#               movie_player_test
+                recapturemouse
+
 
 DEPENDENCIES = \
@@ -27 +26 @@
                 $(MAINSRCDIR)/util/libORXutils.a
 
-importer_SOURCES= \
+recapturemouse_SOURCES= \
                 ../framework.cc \
-                importer.cc \
+                recapturer.cc \
                 $(MAINSRCDIR)/world_entities/space_ships/space_ship.cc \
                 $(MAINSRCDIR)/world_entities/weapons/test_gun.cc
 
-
-multitex_SOURCES= \
-                ../framework.cc \
-                multitex.cc \
-                $(MAINSRCDIR)/world_entities/space_ships/space_ship.cc \
-                $(MAINSRCDIR)/world_entities/weapons/test_gun.cc
-
-# movie_player_test_SOURCES= \
-#               ../framework.cc \
-#               movie_player_test.cc \
-#               $(MAINSRCDIR)/world_entities/space_ships/space_ship.cc \
-#               $(MAINSRCDIR)/world_entities/weapons/test_gun.cc