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
|
Index: railcontrol/Makefile
===================================================================
--- railcontrol.orig/Makefile 2025-05-01 06:54:59.229303384 +0200
+++ railcontrol/Makefile 2025-05-01 06:56:37.075737980 +0200
@@ -2,11 +2,10 @@
RAILCONTROL_VERSION := 24
CFLAGSSQLITE=-g -O2 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DHAVE_USLEEP
-CFLAGSZLIB=-g -O2 -Wno-implicit-function-declaration -Wno-\#warnings -Wno-deprecated -Wno-deprecated-non-prototype
CXXFLAGS=-I. -g -O2 -Wall -Wextra -pedantic -Werror -Wno-missing-braces -std=c++11 -D_GNU_SOURCE
CXXFLAGSAMALGAMATION=-I. -g -O2 -Wall -Wextra -pedantic -Werror -Wno-missing-braces -std=c++11
LDFLAGS=-g
-LIBS=-lpthread -ldl
+LIBS=-lpthread -ldl -lz
LIBSAMALGAMATION=-lpthread -ldl
ifeq ($(OS),Windows_NT)
@@ -17,8 +16,7 @@
TMPDIRCYGWIN=/RailControl
CXXOBJ= $(patsubst %.cpp,%.o,$(sort Version.cpp $(wildcard *.cpp)) $(wildcard Server/Web/*.cpp Server/CS2/*.cpp Server/Z21/*.cpp DataModel/*.cpp Hardware/*.cpp Hardware/Protocols/*.cpp Logger/*.cpp Network/*.cpp Storage/*.cpp Utils/*.cpp))
-COBJ= $(patsubst %.c,%.o,$(wildcard Hardware/zlib/*.c))
-OBJ=Storage/sqlite/sqlite3.o $(CXXOBJ) $(COBJ)
+OBJ=Storage/sqlite/sqlite3.o $(CXXOBJ)
all: $(OBJ)
$(CXX) $(LDFLAGS) $(OBJ) -o railcontrol $(LIBS)
@@ -55,8 +53,8 @@
amalgamation.cpp:
./amalgamation.bash
-amalgamation: amalgamation.o Version.cpp Storage/sqlite/sqlite3.o $(COBJ)
- $(CXX) -g amalgamation.o Storage/sqlite/sqlite3.o Hardware/zlib/*.o -o railcontrol $(LIBSAMALGAMATION)
+amalgamation: amalgamation.o Version.cpp Storage/sqlite/sqlite3.o
+ $(CXX) -g amalgamation.o Storage/sqlite/sqlite3.o -o railcontrol $(LIBSAMALGAMATION)
strip railcontrol
rm -f amalgamation.o
rm -f amalgamation.cpp
@@ -67,9 +65,6 @@
Version.o: Version.cpp Version.h
$(CXX) $(CXXFLAGS) -c -o $@ $<
-Hardware/zlib/%.o: Hardware/zlib/%.c Hardware/zlib/*.h
- $(CC) $(CFLAGSZLIB) -c -o $@ $<
-
Storage/sqlite/sqlite3.o: Storage/sqlite/sqlite3.c Storage/sqlite/sqlite3.h
$(CC) $(CFLAGSSQLITE) -c -o $@ $<
@@ -90,3 +85,4 @@
tools:
make -C tools
+
Index: railcontrol/Hardware/ZLib.cpp
===================================================================
--- railcontrol.orig/Hardware/ZLib.cpp 2025-05-01 06:54:59.229303384 +0200
+++ railcontrol/Hardware/ZLib.cpp 2025-05-01 06:54:59.229303384 +0200
@@ -20,7 +20,7 @@
#include <string>
-#include "Hardware/zlib/zlib.h"
+#include <zlib.h>
#include "Hardware/ZLib.h"
#include "Utils/Utils.h"
|
