$ git clone http://tcclient.ion.nu/tc_client.git
commit 7b4f1fd9d83e5d0c1aadac2a43ff0e22325898c3
Author: Alicia <...>
Date: Fri Dec 2 14:24:58 2016 +0100
Buildsystem fixes.
diff --git a/ChangeLog b/ChangeLog
index 9855a4e..15b7235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Added some compatibility code for OSX.
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.
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 d9cfc93..3b22e66 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,12 @@ else
@echo 'Run ./configure first, make sure tc_client-gtk is enabled.'
endif
endif
-OBJ=client.o amfparser.o rtmp.o numlist.o amfwriter.o idlist.o colors.o endian.o media.o utilities/compat.o
+OBJ=client.o amfparser.o rtmp.o numlist.o amfwriter.o idlist.o colors.o endianutils.o media.o utilities/compat.o
IRCHACK_OBJ=utilities/irchack/irchack.o utilities/compat.o
MODBOT_OBJ=utilities/modbot/modbot.o utilities/list.o utilities/modbot/queue.o utilities/compat.o
CAMVIEWER_OBJ=utilities/camviewer/camviewer.o utilities/compat.o utilities/compat_av.o libcamera.a
CURSEDCHAT_OBJ=utilities/cursedchat/cursedchat.o utilities/cursedchat/buffer.o utilities/compat.o utilities/list.o
-TC_CLIENT_GTK_OBJ=utilities/gtk/camviewer.o utilities/gtk/userlist.o utilities/gtk/media.o utilities/gtk/compat.o utilities/gtk/config.o utilities/gtk/gui.o utilities/stringutils.o utilities/gtk/logging.o utilities/gtk/postproc.o utilities/compat.o utilities/compat_av.o utilities/gtk/inputhistory.o utilities/gtk/playmedia.o libcamera.a
+TC_CLIENT_GTK_OBJ=utilities/gtk/camviewer.o utilities/gtk/userlist.o utilities/gtk/media.o utilities/gtk/compat.o utilities/gtk/configfile.o utilities/gtk/gui.o utilities/stringutils.o utilities/gtk/logging.o utilities/gtk/postproc.o utilities/compat.o utilities/compat_av.o utilities/gtk/inputhistory.o utilities/gtk/playmedia.o libcamera.a
LIBCAMERA_OBJ=utilities/libcamera/camera.o utilities/libcamera/camera_img.o
UTILS=irchack modbot
CONFINFO=|Will enable the IRC utility irchack|Will enable the bot utility modbot
@@ -145,12 +145,12 @@ libcamera.a: $(LIBCAMERA_OBJ)
clean:
rm -f $(OBJ) $(IRCHACK_OBJ) $(MODBOT_OBJ) $(CAMVIEWER_OBJ) $(CURSEDCHAT_OBJ) $(TC_CLIENT_GTK_OBJ) $(LIBCAMERA_OBJ) tc_client irchack modbot camviewer cursedchat tc_client-gtk camplaceholder.gif
-SOURCES=Makefile client.c amfparser.c rtmp.c numlist.c amfwriter.c idlist.c colors.c endian.c media.c amfparser.h rtmp.h numlist.h amfwriter.h idlist.h colors.h endian.h media.h LICENSE README ChangeLog crossbuild.sh testbuilds.sh configure
+SOURCES=Makefile client.c amfparser.c rtmp.c numlist.c amfwriter.c idlist.c colors.c endianutils.c media.c amfparser.h rtmp.h numlist.h amfwriter.h idlist.h colors.h endianutils.h media.h LICENSE README ChangeLog crossbuild.sh testbuilds.sh configure
SOURCES+=utilities/irchack/irchack.c
SOURCES+=utilities/modbot/modbot.c utilities/modbot/queue.c utilities/modbot/queue.h utilities/modbot/commands.html
SOURCES+=utilities/camviewer/camviewer.c
SOURCES+=utilities/cursedchat/cursedchat.c utilities/cursedchat/buffer.c utilities/cursedchat/buffer.h
-SOURCES+=utilities/gtk/camviewer.c utilities/gtk/userlist.c utilities/gtk/media.c utilities/gtk/compat.c utilities/gtk/config.c utilities/gtk/gui.c utilities/gtk/logging.c utilities/gtk/postproc.c utilities/gtk/inputhistory.c utilities/gtk/playmedia.c utilities/gtk/main.h utilities/gtk/userlist.h utilities/gtk/media.h utilities/gtk/compat.h utilities/gtk/config.h utilities/gtk/gui.h utilities/gtk/logging.h utilities/gtk/postproc.h utilities/gtk/inputhistory.h utilities/gtk/playmedia.h gtkgui.glade
+SOURCES+=utilities/gtk/camviewer.c utilities/gtk/userlist.c utilities/gtk/media.c utilities/gtk/compat.c utilities/gtk/configfile.c utilities/gtk/gui.c utilities/gtk/logging.c utilities/gtk/postproc.c utilities/gtk/inputhistory.c utilities/gtk/playmedia.c utilities/gtk/main.h utilities/gtk/userlist.h utilities/gtk/media.h utilities/gtk/compat.h utilities/gtk/configfile.h utilities/gtk/gui.h utilities/gtk/logging.h utilities/gtk/postproc.h utilities/gtk/inputhistory.h utilities/gtk/playmedia.h gtkgui.glade
SOURCES+=utilities/gtk/gencamplaceholder.sh utilities/gtk/camplaceholder.xcf utilities/gtk/spinnerdot.xcf
SOURCES+=utilities/compat.c utilities/compat.h utilities/list.c utilities/list.h utilities/stringutils.c utilities/stringutils.h utilities/compat_av.c utilities/compat_av.h
SOURCES+=utilities/libcamera/camera.c utilities/libcamera/camera.h utilities/libcamera/camera_v4l2.c utilities/libcamera/camera_v4l2.h utilities/libcamera/camera_img.c utilities/libcamera/camera_img.h utilities/libcamera/camera_escapi.cpp utilities/libcamera/camera_escapi.h utilities/libcamera/camera_x11.c utilities/libcamera/camera_x11.h
diff --git a/amfparser.c b/amfparser.c
index fbcb887..72862ca 100644
--- a/amfparser.c
+++ b/amfparser.c
@@ -17,7 +17,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h> // For debugging
-#include "endian.h"
+#include "endianutils.h"
#include "utilities/compat.h"
#include "amfparser.h"
diff --git a/amfwriter.c b/amfwriter.c
index 1946879..42a1ab8 100644
--- a/amfwriter.c
+++ b/amfwriter.c
@@ -18,7 +18,7 @@
#include <string.h>
#include <stdint.h>
#include <unistd.h>
-#include "endian.h"
+#include "endianutils.h"
#include "rtmp.h"
#include "amfwriter.h"
diff --git a/endian.c b/endianutils.c
similarity index 98%
rename from endian.c
rename to endianutils.c
index 6f1a336..3a5691b 100644
--- a/endian.c
+++ b/endianutils.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "endian.h"
+#include "endianutils.h"
uint64_t be64(uint64_t in)
{
diff --git a/endian.h b/endianutils.h
similarity index 100%
rename from endian.h
rename to endianutils.h
diff --git a/media.c b/media.c
index 8d4deb7..0776545 100644
--- a/media.c
+++ b/media.c
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "endian.h"
+#include "endianutils.h"
#include "media.h"
#include "amfwriter.h"
#include "idlist.h"
diff --git a/rtmp.c b/rtmp.c
index 6e5b54c..f86e12c 100644
--- a/rtmp.c
+++ b/rtmp.c
@@ -18,7 +18,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
-#include "endian.h"
+#include "endianutils.h"
#include "rtmp.h"
struct chunk
diff --git a/utilities/gtk/camviewer.c b/utilities/gtk/camviewer.c
index fc56916..8b9e342 100644
--- a/utilities/gtk/camviewer.c
+++ b/utilities/gtk/camviewer.c
@@ -54,7 +54,7 @@
#include "userlist.h"
#include "media.h"
#include "compat.h"
-#include "config.h"
+#include "configfile.h"
#include "gui.h"
#include "logging.h"
#include "../stringutils.h"
diff --git a/utilities/gtk/config.c b/utilities/gtk/configfile.c
similarity index 99%
rename from utilities/gtk/config.c
rename to utilities/gtk/configfile.c
index 7ec133a..a7feb90 100644
--- a/utilities/gtk/config.c
+++ b/utilities/gtk/configfile.c
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include "config.h"
+#include "configfile.h"
struct configitem
{
diff --git a/utilities/gtk/config.h b/utilities/gtk/configfile.h
similarity index 100%
rename from utilities/gtk/config.h
rename to utilities/gtk/configfile.h
diff --git a/utilities/gtk/gui.c b/utilities/gtk/gui.c
index 7778df0..2417a9f 100644
--- a/utilities/gtk/gui.c
+++ b/utilities/gtk/gui.c
@@ -18,7 +18,7 @@
#include <string.h>
#include <stdint.h>
#include <gtk/gtk.h>
-#include "config.h"
+#include "configfile.h"
#include "logging.h"
#include "compat.h"
#include "userlist.h"
diff --git a/utilities/gtk/logging.c b/utilities/gtk/logging.c
index be16132..dc740e7 100644
--- a/utilities/gtk/logging.c
+++ b/utilities/gtk/logging.c
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <time.h>
#include <sys/stat.h>
-#include "config.h"
+#include "configfile.h"
#include "../stringutils.h"
#include "../compat.h"