You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
97 lines
4.4 KiB
97 lines
4.4 KiB
Index: src/config.h |
|
--- src/config.h.orig 2019-12-29 11:31:23.000000000 +0100 |
|
+++ src/config.h 2020-02-10 20:01:22.659363000 +0100 |
|
@@ -31,7 +31,7 @@ |
|
|
|
#define WITH_FLOAT 1 |
|
#define WITH_REFERENCE 1 |
|
-#define WITH_DRAW 1 |
|
+#undef WITH_DRAW |
|
#define WITH_SQL 1 |
|
#define WITH_STATISTIC 0 |
|
#define WITH_COMPILATION_INFO 1 |
|
Index: src/heaputl.c |
|
--- src/heaputl.c.orig 2019-12-27 17:44:31.000000000 +0100 |
|
+++ src/heaputl.c 2020-02-10 20:01:22.659527000 +0100 |
|
@@ -38,8 +38,8 @@ |
|
#include "stdio.h" |
|
#if HAS_GETRLIMIT && defined STACK_SIZE |
|
/* In FreeBSD it is necessary to include <sys/types.h> before <sys/resource.h> */ |
|
-#include "sys/types.h" |
|
-#include "sys/resource.h" |
|
+#include <sys/types.h> |
|
+#include <sys/resource.h> |
|
#endif |
|
|
|
#include "common.h" |
|
Index: src/makefile |
|
--- src/makefile.orig 2020-01-01 15:52:49.000000000 +0100 |
|
+++ src/makefile 2020-02-10 20:03:51.934933000 +0100 |
|
@@ -4,7 +4,7 @@ |
|
# make |
|
# If you are under windows you should use MinGW with mk_mingw.mak, mk_nmake.mak or mk_msys.mak instead. |
|
|
|
-# CFLAGS = |
|
+CFLAGS = |
|
# CFLAGS = -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith |
|
# CFLAGS = -O2 -fomit-frame-pointer -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith |
|
# CFLAGS = -O2 -g -ffunction-sections -fdata-sections $(INCLUDE_OPTIONS) -Wall -Wextra -Wswitch-default -Wswitch-enum -Wcast-qual -Waggregate-return -Wwrite-strings -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -Wmissing-noreturn -Wno-multichar -Wc++-compat |
|
@@ -13,7 +13,7 @@ |
|
# CFLAGS = -O2 -g -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -ftrapv |
|
# CFLAGS = -O2 -g -x c++ -Wall -Winline -Wconversion -Wshadow -Wpointer-arith |
|
# CFLAGS = -O2 -g -ffunction-sections -fdata-sections -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -ftrapv |
|
-CFLAGS = -O2 -g -ffunction-sections -fdata-sections $(INCLUDE_OPTIONS) -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith |
|
+CFLAGS = -O2 -ffunction-sections -fdata-sections $(INCLUDE_OPTIONS) |
|
# CFLAGS = -O2 -g -ffunction-sections -fdata-sections $(INCLUDE_OPTIONS) -Wall -Winline -Wconversion -Wshadow -Wpointer-arith |
|
# CFLAGS = -O2 -g -std=c99 -D_POSIX_SOURCE -ffunction-sections -fdata-sections $(INCLUDE_OPTIONS) -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith |
|
# CFLAGS = -O2 -g -std=c1x -D_XOPEN_SOURCE -ffunction-sections -fdata-sections $(INCLUDE_OPTIONS) -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith |
|
@@ -22,10 +22,10 @@ |
|
# CFLAGS = -O2 -g -pg -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith |
|
# CFLAGS = -O2 -fomit-frame-pointer -funroll-loops -Wall |
|
# CFLAGS = -O2 -funroll-loops -Wall -pg |
|
-LDFLAGS = -Wl,--gc-sections |
|
+LDFLAGS = |
|
# LDFLAGS = -pg |
|
# LDFLAGS = -pg -lc_p |
|
-SYSTEM_LIBS = -lm -ldl |
|
+SYSTEM_LIBS = -lm |
|
# SYSTEM_LIBS = -lm -ldl -lgmp |
|
# SYSTEM_LIBS = -lm_p -lc_p |
|
# SYSTEM_DRAW_LIBS is defined in the file "macros". When doing "make depend" chkccomp.c writes it. |
|
@@ -37,12 +37,12 @@ |
|
# SYSTEM_CONSOLE_LIBS is defined in the file "macros". When doing "make depend" chkccomp.c writes it. |
|
# SYSTEM_CONSOLE_LIBS = -lncurses |
|
SEED7_LIB = seed7_05.a |
|
-DRAW_LIB = s7_draw.a |
|
+DRAW_LIB = |
|
CONSOLE_LIB = s7_con.a |
|
DATABASE_LIB = s7_db.a |
|
COMP_DATA_LIB = s7_data.a |
|
COMPILER_LIB = s7_comp.a |
|
-ALL_S7_LIBS = ../bin/$(COMPILER_LIB) ../bin/$(COMP_DATA_LIB) ../bin/$(DRAW_LIB) ../bin/$(CONSOLE_LIB) ../bin/$(DATABASE_LIB) ../bin/$(SEED7_LIB) |
|
+ALL_S7_LIBS = ../bin/$(COMPILER_LIB) ../bin/$(COMP_DATA_LIB) ../bin/$(CONSOLE_LIB) ../bin/$(DATABASE_LIB) ../bin/$(SEED7_LIB) |
|
# CC = g++ |
|
CC = gcc |
|
GET_CC_VERSION_INFO = $(CC) --version > |
|
@@ -66,7 +66,7 @@ |
|
tim_unx.o |
|
OBJ = $(MOBJ) |
|
SEED7_LIB_OBJ = $(ROBJ) $(DOBJ) |
|
-DRAW_LIB_OBJ = gkb_rtl.o drw_x11.o gkb_x11.o fwd_x11.o |
|
+DRAW_LIB_OBJ = |
|
CONSOLE_LIB_OBJ = kbd_rtl.o con_inf.o kbd_inf.o kbd_poll.o trm_inf.o trm_cap.o fwd_term.o |
|
DATABASE_LIB_OBJ = sql_base.o sql_db2.o sql_fire.o sql_lite.o sql_my.o sql_oci.o sql_odbc.o \ |
|
sql_post.o sql_srv.o sql_tds.o |
|
Index: src/objutl.c |
|
--- src/objutl.c.orig 2019-12-22 15:06:49.000000000 +0100 |
|
+++ src/objutl.c 2020-02-10 20:01:22.659952000 +0100 |
|
@@ -761,7 +761,9 @@ |
|
if (object->value.winValue != NULL) { |
|
object->value.winValue->usage_count--; |
|
if (object->value.winValue->usage_count == 0) { |
|
+#ifdef WITH_DRAW |
|
drwFree(object->value.winValue); |
|
+#endif |
|
} /* if */ |
|
} /* if */ |
|
SET_UNUSED_FLAG(object);
|
|
|