152 lines
3.5 KiB
Diff
152 lines
3.5 KiB
Diff
|
diff --git a/src/imlua5.mak b/src/imlua5.mak
|
||
|
|
index f137b89..58809dc 100755
|
||
|
|
--- a/src/imlua5.mak
|
||
|
|
+++ b/src/imlua5.mak
|
||
|
|
@@ -46,7 +46,7 @@ ifdef USE_LUA54
|
||
|
|
LUASFX = 54
|
||
|
|
else
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUASFX = 53
|
||
|
|
+# LUASFX = 53
|
||
|
|
else
|
||
|
|
ifdef USE_LUA52
|
||
|
|
LUASFX = 52
|
||
|
|
diff --git a/src/imlua_avi5.mak b/src/imlua_avi5.mak
|
||
|
|
index ff7cb22..c46d574 100755
|
||
|
|
--- a/src/imlua_avi5.mak
|
||
|
|
+++ b/src/imlua_avi5.mak
|
||
|
|
@@ -36,7 +36,7 @@ ifdef USE_LUA54
|
||
|
|
LUASFX = 54
|
||
|
|
else
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUASFX = 53
|
||
|
|
+# LUASFX = 53
|
||
|
|
else
|
||
|
|
ifdef USE_LUA52
|
||
|
|
LUASFX = 52
|
||
|
|
diff --git a/src/imlua_capture5.mak b/src/imlua_capture5.mak
|
||
|
|
index 5e11cb4..faab2dc 100755
|
||
|
|
--- a/src/imlua_capture5.mak
|
||
|
|
+++ b/src/imlua_capture5.mak
|
||
|
|
@@ -36,7 +36,7 @@ ifdef USE_LUA54
|
||
|
|
LUASFX = 54
|
||
|
|
else
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUASFX = 53
|
||
|
|
+# LUASFX = 53
|
||
|
|
else
|
||
|
|
ifdef USE_LUA52
|
||
|
|
LUASFX = 52
|
||
|
|
diff --git a/src/imlua_fftw35.mak b/src/imlua_fftw35.mak
|
||
|
|
index 5c46764..7c39ab8 100755
|
||
|
|
--- a/src/imlua_fftw35.mak
|
||
|
|
+++ b/src/imlua_fftw35.mak
|
||
|
|
@@ -46,7 +46,7 @@ ifdef USE_LUA54
|
||
|
|
LUASFX = 54
|
||
|
|
else
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUASFX = 53
|
||
|
|
+# LUASFX = 53
|
||
|
|
else
|
||
|
|
ifdef USE_LUA52
|
||
|
|
LUASFX = 52
|
||
|
|
diff --git a/src/imlua_jp25.mak b/src/imlua_jp25.mak
|
||
|
|
index d811c32..dd26799 100755
|
||
|
|
--- a/src/imlua_jp25.mak
|
||
|
|
+++ b/src/imlua_jp25.mak
|
||
|
|
@@ -36,7 +36,7 @@ ifdef USE_LUA54
|
||
|
|
LUASFX = 54
|
||
|
|
else
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUASFX = 53
|
||
|
|
+# LUASFX = 53
|
||
|
|
else
|
||
|
|
ifdef USE_LUA52
|
||
|
|
LUASFX = 52
|
||
|
|
diff --git a/src/imlua_process5.mak b/src/imlua_process5.mak
|
||
|
|
index 5ec9ec7..61af09f 100755
|
||
|
|
--- a/src/imlua_process5.mak
|
||
|
|
+++ b/src/imlua_process5.mak
|
||
|
|
@@ -47,7 +47,7 @@ ifdef USE_LUA54
|
||
|
|
LUASFX = 54
|
||
|
|
else
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUASFX = 53
|
||
|
|
+# LUASFX = 53
|
||
|
|
else
|
||
|
|
ifdef USE_LUA52
|
||
|
|
LUASFX = 52
|
||
|
|
diff --git a/src/imlua_wmv5.mak b/src/imlua_wmv5.mak
|
||
|
|
index 38c3572..24241a7 100755
|
||
|
|
--- a/src/imlua_wmv5.mak
|
||
|
|
+++ b/src/imlua_wmv5.mak
|
||
|
|
@@ -36,7 +36,7 @@ ifdef USE_LUA54
|
||
|
|
LUASFX = 54
|
||
|
|
else
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUASFX = 53
|
||
|
|
+# LUASFX = 53
|
||
|
|
else
|
||
|
|
ifdef USE_LUA52
|
||
|
|
LUASFX = 52
|
||
|
|
diff --git a/tecmake.mak b/tecmake.mak
|
||
|
|
index 48991a4..42d7131 100755
|
||
|
|
--- a/tecmake.mak
|
||
|
|
+++ b/tecmake.mak
|
||
|
|
@@ -297,7 +297,7 @@ endif
|
||
|
|
|
||
|
|
ifdef GTK_DEFAULT
|
||
|
|
ifndef USE_GTK2
|
||
|
|
- ifneq ($(findstring Linux5, $(TEC_UNAME)), )
|
||
|
|
+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), )
|
||
|
|
USE_GTK3 = Yes
|
||
|
|
endif
|
||
|
|
ifneq ($(findstring Linux4, $(TEC_UNAME)), )
|
||
|
|
@@ -469,7 +469,7 @@ ifdef USE_LUA52
|
||
|
|
LIBLUA_SFX := 52
|
||
|
|
endif
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LIBLUA_SFX := 53
|
||
|
|
+# LIBLUA_SFX := 53
|
||
|
|
endif
|
||
|
|
ifdef USE_LUA54
|
||
|
|
LIBLUA_SFX := 54
|
||
|
|
@@ -877,8 +877,8 @@ ifdef USE_LUA52
|
||
|
|
endif
|
||
|
|
|
||
|
|
ifdef USE_LUA53
|
||
|
|
- LUA_SFX := 53
|
||
|
|
- LIBLUA_SFX := 53
|
||
|
|
+# LUA_SFX := 53
|
||
|
|
+# LIBLUA_SFX := 53
|
||
|
|
override USE_LUA = Yes
|
||
|
|
LUA := $(LUA53)
|
||
|
|
NO_LUALIB := Yes
|
||
|
|
@@ -1207,7 +1207,7 @@ ifdef USE_CD
|
||
|
|
ifneq ($(findstring Linux4, $(TEC_UNAME)), )
|
||
|
|
LIBS += fontconfig
|
||
|
|
endif
|
||
|
|
- ifneq ($(findstring Linux5, $(TEC_UNAME)), )
|
||
|
|
+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), )
|
||
|
|
LIBS += fontconfig
|
||
|
|
endif
|
||
|
|
ifneq ($(findstring cygw, $(TEC_UNAME)), )
|
||
|
|
@@ -1245,7 +1245,7 @@ ifdef USE_IM
|
||
|
|
endif
|
||
|
|
|
||
|
|
ifdef LINK_WEBKIT
|
||
|
|
- ifneq ($(findstring Linux5, $(TEC_UNAME)), )
|
||
|
|
+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), )
|
||
|
|
LIBS += webkit2gtk-4.0 gio-2.0
|
||
|
|
else
|
||
|
|
ifneq ($(findstring Linux4, $(TEC_UNAME)), )
|
||
|
|
@@ -1476,7 +1476,7 @@ ifdef USE_GTK
|
||
|
|
ifneq ($(findstring FreeBSD, $(TEC_UNAME)), )
|
||
|
|
STDINCS += /lib/X11R6/include/gtk-2.0
|
||
|
|
endif
|
||
|
|
- ifneq ($(findstring Linux5, $(TEC_UNAME)), )
|
||
|
|
+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), )
|
||
|
|
STDINCS += /usr/include/harfbuzz
|
||
|
|
endif
|
||
|
|
endif
|