$ git clone http://tcclient.ion.nu/tc_client.git
commit 639febffec292b9c1ae23f02c39c49f450e7f831
Author: Alicia <...>
Date: Mon Dec 5 22:29:02 2016 +0100
More fixes for compiling in a separate directory.
diff --git a/ChangeLog b/ChangeLog
index c2b7605..3e3a9e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Enabled compiling in a directory separate from the source directory.
Added a /disablesnapshots command to disable capturing outgoing cams for the flash client's "snapshot" feature, /enablesnapshots to re-enable.
Fixes for compiling in a separate directory.
Buildsystem fixes.
+More fixes for compiling in a separate directory.
tc_client-gtk: bugfix: don't rely on stack allocated variables for GUI callbacks.
tc_client-gtk: install the camera placeholder animation for the 'install' target.
tc_client-gtk: mark outgoing video keyframes as keyframes.
diff --git a/Makefile b/Makefile
index a88d056..7116b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ tc_client-gtk: $(TC_CLIENT_GTK_OBJ) camplaceholder.gif modicon.png
camplaceholder.gif: utilities/gtk/gencamplaceholder.sh utilities/gtk/camplaceholder.xcf utilities/gtk/spinnerdot.xcf
utilities/gtk/gencamplaceholder.sh
-modicon.png: utilities/gtk/modicon.xcf
+modicon.png: $(SRCDIR)utilities/gtk/modicon.xcf
convert -background none $< -layers Merge -scale x20 $@
libcamera.a: $(LIBCAMERA_OBJ)
diff --git a/configure b/configure
index 5f7982c..2e5b8d3 100755
--- a/configure
+++ b/configure
@@ -304,6 +304,7 @@ if [ "." != "$srcdir" ]; then
done
echo "utilities/libcamera/%.o: ${srcdir}/utilities/libcamera/%.cpp" >> Makefile
echo ' $(CXX) $(CXXFLAGS) -c $<...>> Makefile
+ echo "SRCDIR=${srcdir}/" >> config.mk
fi
echo Done
diff --git a/utilities/gtk/userlist.c b/utilities/gtk/userlist.c
index 463feea..e296143 100644
--- a/utilities/gtk/userlist.c
+++ b/utilities/gtk/userlist.c
@@ -18,6 +18,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include "gui.h"
+#include "compat.h"
#include "userlist.h"
struct user* userlist=0;