Blob Blame History Raw
diff -urN player-2.1.0rc2/client_libs/libplayerc++/test/Makefile.am player-2.1.0rc2.norpath/client_libs/libplayerc++/test/Makefile.am
--- player-2.1.0rc2/client_libs/libplayerc++/test/Makefile.am	2008-04-13 00:16:39.000000000 +0200
+++ player-2.1.0rc2.norpath/client_libs/libplayerc++/test/Makefile.am	2008-05-20 01:08:54.000000000 +0200
@@ -14,7 +14,7 @@
                   -L${top_builddir}/client_libs/libplayerc \
                   -L${top_builddir}/client_libs/libplayerc++
 
-test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr
+test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr $(top_builddir)/libplayercore/libplayerutils.la
 
 
 noinst_PROGRAMS =
diff -urN player-2.1.0rc2/examples/libplayerc/Makefile.am player-2.1.0rc2.norpath/examples/libplayerc/Makefile.am
--- player-2.1.0rc2/examples/libplayerc/Makefile.am	2008-04-13 00:16:59.000000000 +0200
+++ player-2.1.0rc2.norpath/examples/libplayerc/Makefile.am	2008-05-20 01:43:49.000000000 +0200
@@ -22,15 +22,15 @@
 example_DATA = vmap.c simple.c speech_c_client.c service_discovery.c
 
 vmap_SOURCES = vmap.c
-vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
 vmap_DEPENDENCIES = $(PLAYERC_DEPS)
 
 simple_SOURCES = simple.c
-simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
 simple_DEPENDENCIES = $(PLAYERC_DEPS)
 
 speech_c_client_SOURCES = speech_c_client.c
-speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
 speech_c_client_DEPENDENCIES = $(PLAYERC_DEPS)
 
 service_discovery_SOURCES = service_discovery.c
diff -urN player-2.1.0rc2/examples/libplayerc++/Makefile.am player-2.1.0rc2.norpath/examples/libplayerc++/Makefile.am
--- player-2.1.0rc2/examples/libplayerc++/Makefile.am	2008-04-13 00:17:00.000000000 +0200
+++ player-2.1.0rc2.norpath/examples/libplayerc++/Makefile.am	2008-05-20 01:50:34.000000000 +0200
@@ -62,70 +62,70 @@
                wallfollow.cc
 
 camera_SOURCES = camera.cc args.h
-camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 camera_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 example0_SOURCES = example0.cc
-example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 example0_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 example1_SOURCES = example1.cc args.h
-example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 example1_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 example2_SOURCES = example2.cc
-example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 example2_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 example3_SOURCES = example3.cc args.h
-example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 example3_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 example4_SOURCES = example4.cc
-example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 example4_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 goto_SOURCES = goto.cc
-goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 goto_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 grip_SOURCES = grip.cc args.h
-grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 grip_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 clientgraphics_SOURCES = clientgraphics.cc args.h
-clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 clientgraphics_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 clientgraphics3d_SOURCES = clientgraphics3d.cc args.h
-clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 clientgraphics3d_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 
 laserobstacleavoid_SOURCES = laserobstacleavoid.cc args.h
-laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 laserobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 ptz_SOURCES = ptz.cc args.h
-ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 ptz_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 randomwalk_SOURCES = randomwalk.cc args.h
-randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 randomwalk_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 sonarobstacleavoid_SOURCES = sonarobstacleavoid.cc args.h
-sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 sonarobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 speech_SOURCES = speech.cc args.h
-speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 speech_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 speech_cpp_client_SOURCES = speech_cpp_client.cc
-speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 speech_cpp_client_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 wallfollow_SOURCES = wallfollow.cc args.h
-wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
 wallfollow_DEPENDENCIES = $(PLAYERCC_DEPS)
diff -urN player-2.1.0rc2/examples/plugins/exampleinterface/Makefile.am player-2.1.0rc2.norpath/examples/plugins/exampleinterface/Makefile.am
--- player-2.1.0rc2/examples/plugins/exampleinterface/Makefile.am	2008-04-13 00:16:59.000000000 +0200
+++ player-2.1.0rc2.norpath/examples/plugins/exampleinterface/Makefile.am	2008-05-20 01:44:12.000000000 +0200
@@ -41,5 +41,5 @@
 libeginterf_la_SOURCES = example_interface.h example_xdr.h eginterf_client.c example_functiontable.c example_xdr.c
 
 example_client_SOURCES = example_client.c
-example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror libeginterf.la
+example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror -lplayerutils libeginterf.la
 example_client_DEPENDENCIES = $(PLAYERC_DEPS) example_interface.h
diff -urN player-2.1.0rc2/examples/plugins/opaquedriver/Makefile.am player-2.1.0rc2.norpath/examples/plugins/opaquedriver/Makefile.am
--- player-2.1.0rc2/examples/plugins/opaquedriver/Makefile.am	2008-04-13 00:16:58.000000000 +0200
+++ player-2.1.0rc2.norpath/examples/plugins/opaquedriver/Makefile.am	2008-05-20 01:44:24.000000000 +0200
@@ -22,5 +22,5 @@
 libopaquedriver_la_SOURCES = opaquedriver.cc sharedstruct.h
 
 opaque_client_SOURCES = opaque.c sharedstruct.h
-opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror
+opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror -lplayerutils
 opaque_client_DEPENDENCIES = $(PLAYERC_DEPS)
diff -urN player-2.1.0rc2/server/Makefile.am player-2.1.0rc2.norpath/server/Makefile.am
--- player-2.1.0rc2/server/Makefile.am	2008-04-13 00:16:22.000000000 +0200
+++ player-2.1.0rc2.norpath/server/Makefile.am	2008-05-20 00:24:11.000000000 +0200
@@ -21,6 +21,9 @@
 if HAVE_PLAYERSD
 player_LDADD += $(top_builddir)/libplayersd/libplayersd.la 
 endif
+if INCLUDE_JPEG
+player_LDADD += $(top_builddir)/libplayerjpeg/libplayerjpeg.la
+endif
 #player_LDADD   = -lm $(top_builddir)/server/libplayerdrivers/.libs/libplayerdrivers.a $(top_builddir)/libplayercore/.libs/libplayercore.a $(top_builddir)/libplayercore/.libs/libplayererror.a $(top_builddir)/libplayertcp/.libs/libplayertcp.a $(top_builddir)/libplayerxdr/.libs/libplayerxdr.a @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/.libs/libreplace.a
 
 player_LDFLAGS = -export-dynamic
diff -urN player-2.1.0rc2/utils/playercam/Makefile.am player-2.1.0rc2.norpath/utils/playercam/Makefile.am
--- player-2.1.0rc2/utils/playercam/Makefile.am	2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.0rc2.norpath/utils/playercam/Makefile.am	2008-05-20 01:57:03.000000000 +0200
@@ -9,4 +9,4 @@
 endif
 
 playercam_SOURCES = playercam.c
-playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GTK_LIBS@
+playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
diff -urN player-2.1.0rc2/utils/playerjoy/Makefile.am player-2.1.0rc2.norpath/utils/playerjoy/Makefile.am
--- player-2.1.0rc2/utils/playerjoy/Makefile.am	2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.0rc2.norpath/utils/playerjoy/Makefile.am	2008-05-20 01:58:08.000000000 +0200
@@ -19,7 +19,7 @@
                 $(top_builddir)/client_libs/libplayerc++/libplayerc++.la
 
 playerjoy_CPPFLAGS     = $(PLAYERCC_CFLAGS)
-playerjoy_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror
+playerjoy_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror -lplayerutils
 playerjoy_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 
diff -urN player-2.1.0rc2/utils/playernav/Makefile.am player-2.1.0rc2.norpath/utils/playernav/Makefile.am
--- player-2.1.0rc2/utils/playernav/Makefile.am	2008-04-13 00:16:55.000000000 +0200
+++ player-2.1.0rc2.norpath/utils/playernav/Makefile.am	2008-05-20 01:56:30.000000000 +0200
@@ -8,4 +8,4 @@
 
 playernav_SOURCES =  playernav.c gui.c playernav.h player.c parse.c
 
-playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GNOMECANVAS_LIBS@
+playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GNOMECANVAS_LIBS@
diff -urN player-2.1.0rc2/utils/playerprint/Makefile.am player-2.1.0rc2.norpath/utils/playerprint/Makefile.am
--- player-2.1.0rc2/utils/playerprint/Makefile.am	2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.0rc2.norpath/utils/playerprint/Makefile.am	2008-05-20 01:57:39.000000000 +0200
@@ -19,7 +19,7 @@
                 $(top_builddir)/client_libs/libplayerc++/libplayerc++.la
 
 playerprint_CPPFLAGS     = $(PLAYERCC_CFLAGS)
-playerprint_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
+playerprint_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
 playerprint_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 playerprint_SOURCES = playerprint.cc
diff -urN player-2.1.0rc2/utils/playerprop/Makefile.am player-2.1.0rc2.norpath/utils/playerprop/Makefile.am
--- player-2.1.0rc2/utils/playerprop/Makefile.am	2008-04-13 00:16:53.000000000 +0200
+++ player-2.1.0rc2.norpath/utils/playerprop/Makefile.am	2008-05-20 01:59:27.000000000 +0200
@@ -19,7 +19,7 @@
                 $(top_builddir)/client_libs/libplayerc++/libplayerc++.la
 
 playerprop_CPPFLAGS     = $(PLAYERCC_CFLAGS)
-playerprop_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
+playerprop_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
 playerprop_DEPENDENCIES = $(PLAYERCC_DEPS)
 
 playerprop_SOURCES = playerprop.cpp
diff -urN player-2.1.0rc2/utils/playervcr/Makefile.am player-2.1.0rc2.norpath/utils/playervcr/Makefile.am
--- player-2.1.0rc2/utils/playervcr/Makefile.am	2008-04-13 00:16:55.000000000 +0200
+++ player-2.1.0rc2.norpath/utils/playervcr/Makefile.am	2008-05-20 01:55:18.000000000 +0200
@@ -9,4 +9,4 @@
 playervcr_SOURCES =  playervcr.c
 
 playervcr_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
-playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la @GTK_LIBS@
+playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
diff -urN player-2.1.0rc2/utils/playerwritemap/Makefile.am player-2.1.0rc2.norpath/utils/playerwritemap/Makefile.am
--- player-2.1.0rc2/utils/playerwritemap/Makefile.am	2008-04-13 00:16:55.000000000 +0200
+++ player-2.1.0rc2.norpath/utils/playerwritemap/Makefile.am	2008-05-20 01:58:40.000000000 +0200
@@ -7,4 +7,4 @@
 playerwritemap_SOURCES =  playerwritemap.c
 
 playerwritemap_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
-playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GDK_PIXBUF_LIBS@
+playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GDK_PIXBUF_LIBS@