alexander
/
iup-stack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
iup-stack/iup/without-lua-prefix-with-lin...

306 lines
7.2 KiB
Diff
Raw Normal View History

stack iup library
2023-02-20 16:44:45 +00:00
diff --git a/srclua5/config.mak b/srclua5/config.mak
index 77a8920..2118290 100755
--- a/srclua5/config.mak
+++ b/srclua5/config.mak
@@ -38,7 +38,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iup_mglplot.mak b/srclua5/iup_mglplot.mak
index 3c3407c..422eb8d 100755
--- a/srclua5/iup_mglplot.mak
+++ b/srclua5/iup_mglplot.mak
@@ -42,7 +42,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iup_plot.mak b/srclua5/iup_plot.mak
index b2af19d..0ba78fb 100755
--- a/srclua5/iup_plot.mak
+++ b/srclua5/iup_plot.mak
@@ -43,7 +43,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iup_scintilla.mak b/srclua5/iup_scintilla.mak
index 502bf59..08de8a1 100755
--- a/srclua5/iup_scintilla.mak
+++ b/srclua5/iup_scintilla.mak
@@ -42,7 +42,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupcd.mak b/srclua5/iupcd.mak
index 429cd3e..1ee8c72 100755
--- a/srclua5/iupcd.mak
+++ b/srclua5/iupcd.mak
@@ -44,7 +44,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupcontrols.mak b/srclua5/iupcontrols.mak
index cb00b95..492906f 100755
--- a/srclua5/iupcontrols.mak
+++ b/srclua5/iupcontrols.mak
@@ -43,7 +43,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupfiledlg.mak b/srclua5/iupfiledlg.mak
index 6c6cf98..64ca8b3 100755
--- a/srclua5/iupfiledlg.mak
+++ b/srclua5/iupfiledlg.mak
@@ -40,7 +40,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupgl.mak b/srclua5/iupgl.mak
index f633c1c..e1ae256 100755
--- a/srclua5/iupgl.mak
+++ b/srclua5/iupgl.mak
@@ -41,7 +41,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupglcontrols.mak b/srclua5/iupglcontrols.mak
index e6469f9..570d924 100755
--- a/srclua5/iupglcontrols.mak
+++ b/srclua5/iupglcontrols.mak
@@ -42,7 +42,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupim.mak b/srclua5/iupim.mak
index d2eb2d4..c3fc431 100755
--- a/srclua5/iupim.mak
+++ b/srclua5/iupim.mak
@@ -42,7 +42,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupimglib.mak b/srclua5/iupimglib.mak
index fb56ad6..08afb97 100755
--- a/srclua5/iupimglib.mak
+++ b/srclua5/iupimglib.mak
@@ -40,7 +40,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupluascripterdlg.mak b/srclua5/iupluascripterdlg.mak
index 56ae104..9132831 100755
--- a/srclua5/iupluascripterdlg.mak
+++ b/srclua5/iupluascripterdlg.mak
@@ -42,7 +42,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupole.mak b/srclua5/iupole.mak
index 0b625b6..75dd416 100755
--- a/srclua5/iupole.mak
+++ b/srclua5/iupole.mak
@@ -41,7 +41,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iuptuio.mak b/srclua5/iuptuio.mak
index 853430c..09ecae1 100755
--- a/srclua5/iuptuio.mak
+++ b/srclua5/iuptuio.mak
@@ -42,7 +42,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srclua5/iupweb.mak b/srclua5/iupweb.mak
index 9d7dff2..afe171a 100755
--- a/srclua5/iupweb.mak
+++ b/srclua5/iupweb.mak
@@ -42,7 +42,7 @@ ifdef USE_LUA54
LUASFX = 54
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
else
ifdef USE_LUA52
LUASFX = 52
diff --git a/srcluaconsole/config.mak b/srcluaconsole/config.mak
index 12baea3..8b02917 100755
--- a/srcluaconsole/config.mak
+++ b/srcluaconsole/config.mak
@@ -41,7 +41,7 @@ ifdef USE_LUA54
endif
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
ifneq ($(findstring SunOS, $(TEC_UNAME)), )
ifneq ($(findstring x86, $(TEC_UNAME)), )
FLAGS = -std=gnu99
diff --git a/srcluascripter/config.mak b/srcluascripter/config.mak
index 76300c6..a201098 100755
--- a/srcluascripter/config.mak
+++ b/srcluascripter/config.mak
@@ -38,7 +38,7 @@ ifdef USE_LUA54
endif
else
ifdef USE_LUA53
- LUASFX = 53
+# LUASFX = 53
ifneq ($(findstring SunOS, $(TEC_UNAME)), )
ifneq ($(findstring x86, $(TEC_UNAME)), )
FLAGS = -std=gnu99
diff --git a/srcvled/config.mak b/srcvled/config.mak
index d072320..9daf3e8 100755
--- a/srcvled/config.mak
+++ b/srcvled/config.mak
@@ -129,4 +129,6 @@ ifneq ($(findstring MacOS, $(TEC_UNAME)), )
LIBS += fontconfig
endif
+LIBS += gmodule-2.0
+
INCLUDES = ../src
diff --git a/srcweb/config.mak b/srcweb/config.mak
index c528f2c..0d321a4 100755
--- a/srcweb/config.mak
+++ b/srcweb/config.mak
@@ -35,7 +35,7 @@ else
LINK_WEBKIT = Yes
ifdef USE_GTK3
- ifneq ($(findstring Linux5, $(TEC_UNAME)), )
+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), )
DEFINES += USE_WEBKIT2
STDINCS += $(GTK)/include/webkitgtk-4.0
else
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