mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
102 lines
2.7 KiB
Plaintext
102 lines
2.7 KiB
Plaintext
From 35ab8a765c73b70cd09e0af717aba448ae5a258d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Fri, 5 May 2023 17:54:39 +0200
|
|
Subject: fix build (constness and linking order)
|
|
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 858c5f7..bc666d6 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -12,13 +12,13 @@ gltron_LDADD = \
|
|
src/video/libvideo.a \
|
|
src/configuration/libconfiguration.a \
|
|
src/base/libbase.a \
|
|
- src/filesystem/libfilesystem.a \
|
|
nebu/input/libinput.a \
|
|
nebu/audio/libaudio.a \
|
|
nebu/video/libvideo.a \
|
|
nebu/scripting/libscripting.a \
|
|
nebu/filesystem/libfilesystem.a \
|
|
nebu/base/libbase.a \
|
|
+ src/filesystem/libfilesystem.a \
|
|
lua/src/liblua.a \
|
|
lua/src/lib/liblualib.a
|
|
|
|
diff --git a/nebu/scripting/scripting.c b/nebu/scripting/scripting.c
|
|
index e26bc77..0fa39c0 100644
|
|
--- a/nebu/scripting/scripting.c
|
|
+++ b/nebu/scripting/scripting.c
|
|
@@ -169,16 +169,16 @@ int scripting_CopyStringResult(char *s, int len) {
|
|
return status;
|
|
}
|
|
|
|
-void scripting_RunFile(char *name) {
|
|
+void scripting_RunFile(const char *name) {
|
|
lua_dofile(L, name);
|
|
}
|
|
|
|
-void scripting_Run(char *command) {
|
|
+void scripting_Run(const char *command) {
|
|
/* fprintf(stderr, "[command] %s\n", command); */
|
|
lua_dostring(L, command);
|
|
}
|
|
|
|
-void scripting_RunFormat(char *format, ... ) {
|
|
+void scripting_RunFormat(const char *format, ... ) {
|
|
char buf[4096];
|
|
va_list ap;
|
|
va_start(ap, format);
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From a99e603eaf8d5d08d96be5bf18f60bd7b7d264d5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Sun, 30 Apr 2023 19:56:49 +0200
|
|
Subject: use proper settings file name for Haiku
|
|
|
|
|
|
diff --git a/src/include/game/gltron.h b/src/include/game/gltron.h
|
|
index c66d31f..34978b7 100644
|
|
--- a/src/include/game/gltron.h
|
|
+++ b/src/include/game/gltron.h
|
|
@@ -30,6 +30,11 @@
|
|
#define RC_NAME "gltronPrefs.txt"
|
|
#endif
|
|
|
|
+#ifdef __HAIKU__ /* Haiku */
|
|
+#undef RC_NAME
|
|
+#define RC_NAME "GLtron settings"
|
|
+#endif
|
|
+
|
|
/* the engine */
|
|
#include "Nebu.h"
|
|
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From 0fe379ad906fb31da3751ea8e34ed5f7bd161927 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Fri, 5 May 2023 18:06:17 +0200
|
|
Subject: remove comments from Makefile.am to fix automake
|
|
|
|
|
|
diff --git a/nebu/scripting/Makefile.am b/nebu/scripting/Makefile.am
|
|
index b4a9e9b..76c90f6 100644
|
|
--- a/nebu/scripting/Makefile.am
|
|
+++ b/nebu/scripting/Makefile.am
|
|
@@ -6,8 +6,6 @@ libscripting_a_SOURCES= \
|
|
libscripting_a_LIBADD= \
|
|
$(top_builddir)/lua/src/liblua.a \
|
|
$(top_builddir)/lua/src/lib/liblualib.a
|
|
- # @top_srcdir@/lua/src/liblua.a \
|
|
- # @top_srcdir@/lua/src/lib/liblualib.a
|
|
|
|
AM_CFLAGS = \
|
|
-I$(top_srcdir)/nebu/include/base \
|
|
--
|
|
2.37.3
|
|
|