Changeset 19118

Timestamp:

08/04/06 15:05:57 (2 years ago)

Author:

dshipton

Message:

Juggler makes use of flagpoll now.

Files:

• juggler/trunk/modules/vrjuggler/Makefile.inc.in (modified) (3 diffs)
• juggler/trunk/modules/vrjuggler/configure.ac (modified) (7 diffs)
• juggler/trunk/modules/vrjuggler/plugins/configure.ac (modified) (4 diffs)

juggler/trunk/modules/vrjuggler/Makefile.inc.in

@@ -381 +381 @@
-        @echo "Setting up developer installation"
-        @echo "------------------------------------------------"
+        $(SHELL) $(MKINSTALLDIRS) $(instlinks)/share/flagpoll
+        cat $(topdir)/vrjuggler.fpc | sed -e "s|AUTOGENERATEDPREFIX|$(instlinks)|g" > $(topdir)/vrjuggler.fpc.tmp
+        $(INSTALL) -m $(EXEC_PERMS) $(GROUP_OPT_UNIX)                   \
+          $(EXTRA_INSTALL_ARGS) $(topdir)/vrjuggler.fpc.tmp $(instlinks)/share/flagpoll/vrjuggler.fpc
+        rm -f $(topdir)/vrjuggler.fpc.tmp
+
-ifdef BUILD_TYPE
-        $(MAKE) links-$(BUILD_TYPE)
@@ -476 +482 @@
-        @$(MAKE) install-data
-        @$(MAKE) install-m4
+        @$(MAKE) install-flagpoll
-        $(INSTALL) -m $(EXEC_PERMS) $(GROUP_OPT_UNIX)                   \
-          $(EXTRA_INSTALL_ARGS) $(topdir)/vrjuggler-config $(bindir)
@@ -552 +559 @@
-          $(datadir)/aclocal
-
+install-flagpoll:
+        @echo "------------------------------------------------"
+        @echo "Installing Flagpoll metadata file"
+        @echo "------------------------------------------------"
+        $(SHELL) $(MKINSTALLDIRS) $(libdir)$(LIBBITSUF)/flagpoll
+        cat $(topdir)/vrjuggler.fpc | sed -e "s|AUTOGENERATEDPREFIX|$(prefix)|g" > $(topdir)/vrjuggler.fpc.tmp
+        $(INSTALL) -m $(EXEC_PERMS) $(GROUP_OPT_UNIX)                   \
+          $(topdir)/vrjuggler.fpc.tmp                   \
+          $(libdir)$(LIBBITSUF)/flagpoll/vrjuggler-$(VERSION_DOT).$(PLATFORM).$(ISA).`date '+%s'`.fpc
+        rm -f $(topdir)/vrjuggler.fpc.tmp
+
-# =============================================================================
-# Clean-up targets.  '_clean' removes all the files in the build directories.  

juggler/trunk/modules/vrjuggler/configure.ac

@@ -152 +152 @@
-# -----------------------------------------------------------------------------
-VPR_PATH([1.1.23], , [AC_MSG_ERROR(*** VPR required for VR Juggler ***)])
-
+
-JCCL_PATH_CXX([1.1.5], ,
-              [AC_MSG_ERROR(*** JCCL C++ API required for VR Juggler ***)])
@@ -303 +303 @@
-#fi
-
-_MIN $JCCL_CXXFLAGS_MIN $GADGET_CXXFLAGS_MIN
+ $JCCL_CXXFLAGS $GADGET_CXXFLAGS
-BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS"
-INCLUDES_MIN $JCCL_INCLUDES_MIN $GADGET_INCLUDES_MIN $SNX_INCLUDES_MIN
+CXXFLAGS $JCCL_CXXFLAGS $GADGET_CXXFLAGS $SNX_CXXFLAGS
-vrj_cxxflags="$STDFLAGS"
-
@@ -417 +417 @@
-
-if test "$OS_TYPE" = "UNIX" ; then
-SNX_LIBS_CC_MIN $GADGET_LIBS_CC_MIN $JCCL_LIBS_CC_MIN $JCCL_EXTRA_LIBS_CC
+VPR_LIBS $VPR_EXTRA_LIBS $SNX_LIBS $GADGET_LIBS $JCCL_LIBS $JCCL_EXTRA_LIBS
-    DYLIB_DEPS_VJ="$REQ_EXTRA_LIBS"
-    DYLIB_DEPS_GL="-L\$(LIBDIR) -l$vrj_lib_name $REQ_EXTRA_LIBS"
@@ -428 +428 @@
-    fi
-
-_CC_MIN $GADGET_PROF_LIBS_CC_MIN $JCCL_PROF_LIBS_CC_MIN $VPR_PROF_LIBS_CC_MIN $VPR_EXTRA_LIBS_CC_MIN
+ $GADGET_PROF_LIBS $JCCL_PROF_LIBS $VPR_PROF_LIBS $VPR_EXTRA_LIBS
-    DYLIB_PROF_DEPS_VJ="$REQ_EXTRA_PROF_LIBS"
-    DYLIB_PROF_DEPS_GL="-L\$(LIBDIR) -l$vrj_prof_lib_name $OGL_LDFLAGS $LIBOPENGL $REQ_EXTRA_PROF_LIBS"
@@ -480 +480 @@
-
-elif test "$OS_TYPE" = "Win32" ; then
-GADGET_LIBS_LD_MIN $SNX_LIBS_LD $JCCL_LIBS_LD_MIN $JCCL_EXTRA_LIBS_LD
+VPR_LIBS $VPR_EXTRA_LIBS $GADGET_LIBS $SNX_LIBS $JCCL_LIBS $JCCL_EXTRA_LIBS
-    BASIC_WIN32_LIBS='comctl32.lib user32.lib gdi32.lib'
-    DYLIB_DEPS_BASIC="$REQ_EXTRA_LIBS $BASIC_WIN32_LIBS"
@@ -686 +686 @@
-
-AC_CONFIG_FILES([
--config
+.fpc
-   Makefile
-   Makefile.inc
@@ -773 +773 @@
-   mtree/VJ.tools.dist
-   VARS.pl
-,
-[chmod a+x vrjuggler-config]
+
+
-
-AC_OUTPUT

juggler/trunk/modules/vrjuggler/plugins/configure.ac

@@ -149 +149 @@
-   ])
-
+VPR_PATH([1.1.23], , [AC_MSG_ERROR([*** VPR required for plugins ***])])
+
-min_tweek_version='1.1.5'
-if test "x$test_tweek_cxx" = "xY" ; then
@@ -156 +158 @@
-      ])
-fi
+
-
-if test "x$BUILD_JAVA" = "xY" ; then
@@ -201 +204 @@
-#fi
-
-
-
-
+
-BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS"
-TWEEK_INCLUDES_MIN
+VPR_CXXFLAGS $TWEEK_CXXFLAGS $VRJ_CXXFLAGS
-
-if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" = "xno" ; then
@@ -244 +245 @@
-
-# $DSO_PLUGIN_DEPS must list all the libraries required to link a VRJ plug-in.
-
-
-
-
-
-
+
+
-
-VJ_BUILD_LIB_FILE_LIST([$DSO_PLUGIN_DEPS], [DSO_PLUGIN_DEP_FILES])