1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
From: =?utf-8?q?Andreas_R=C3=B6nnquist?= <gusnan@debian.org>
Date: Tue, 19 Jun 2018 15:34:57 +0200
Subject: Build with Debian packaged Lua
Forwarded: not-needed
---
scite/gtk/deps.mak | 6 +-----
scite/gtk/makefile | 30 ++++--------------------------
2 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/scite/gtk/deps.mak b/scite/gtk/deps.mak
index 919cba9..af4432a 100644
--- a/scite/gtk/deps.mak
+++ b/scite/gtk/deps.mak
@@ -267,11 +267,7 @@ LuaExtension.o: \
../src/Extender.h \
../src/IFaceTable.h \
../src/SciTEKeys.h \
- ../src/LuaExtension.h \
- ../lua/src/lua.h \
- ../lua/src/luaconf.h \
- ../lua/src/lualib.h \
- ../lua/src/lauxlib.h
+ ../src/LuaExtension.h
MatchMarker.o: \
../src/MatchMarker.cxx \
../../scintilla/include/ScintillaTypes.h \
diff --git a/scite/gtk/makefile b/scite/gtk/makefile
index a53e8f4..86ad0fe 100644
--- a/scite/gtk/makefile
+++ b/scite/gtk/makefile
@@ -33,9 +33,9 @@ GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
PYTHON = $(if $(windir),pyw,python3)
-# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
-CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
-CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
+# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is.
+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.3)
+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.3)
gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
ifndef prefix
ifdef gnomeprefix
@@ -72,28 +72,6 @@ DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
BASE_FLAGS += $(if $(DEBUG),-g,-O3)
-ifndef NO_LUA
-LUA_CORE_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
- ltable.o ltm.o lundump.o lvm.o lzio.o
-
-LUA_LIB_OBJS = lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o lmathlib.o ltablib.o \
- lstrlib.o loadlib.o loslib.o linit.o lutf8lib.o
-
-LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
-
-vpath %.c $(srcdir)/../lua/src
-
-INCLUDES += -I$(srcdir)/../lua/src
-LUA_DEFINES = -DLUA_USE_POSIX -DLUA_USE_DLOPEN
-
-%.o: %.c
- $(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(WARNINGS) $(LUA_DEFINES) $(BASE_FLAGS) $(CFLAGS) -c $< -o $@
-
-else
-DEFINES += -DNO_LUA
-endif
-
LIBS += -lm -lstdc++
UNAME:=$(shell uname -s)
@@ -155,7 +133,7 @@ SRC_OBJS = \
StyleWriter.o \
Utf8_16.o
-$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
+$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) LuaExtension.o
$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
# Automatically generate header dependencies with "make depend"
|
