Skip to content

Commit 2f21d2e

Browse files
livecodeianlivecodeian
committed
Merge branch 'master' into refactor-graphics
Conflicts: engine/Makefile.common engine/engine.xcodeproj/project.pbxproj engine/src/cmdsf.cpp engine/src/image.h engine/src/imagebitmap.cpp engine/src/lnxcontext.cpp engine/src/lnxcontext.h engine/src/lnxpsprinter.cpp engine/src/mbliphonestack.mm engine/src/mode_standalone.cpp engine/src/stack.h engine/src/stack2.cpp rules/common.linux.makefile thirdparty
2 parents 5a914e3 + 88ab073 commit 2f21d2e

2,681 files changed

Lines changed: 110001 additions & 891 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*.gitattributes text
1313
*.mk text
1414
*.lc text
15+
*.xml text
16+
*.md text
1517

1618
# Declare files that will always have CRLF line endings on checkout.
1719
*.sln text eol=crlf

‎Makefile‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ libskia:
3737

3838
libcore:
3939
$(MAKE) -C ./libcore libcore
40+
41+
revsecurity:
42+
$(MAKE) -C ./thirdparty/libopenssl -f Makefile.revsecurity revsecurity
4043

4144
libgraphics: libskia
4245
$(MAKE) -C ./libgraphics libgraphics
@@ -53,13 +56,13 @@ kernel-development: kernel
5356
kernel-server:
5457
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
5558

56-
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development
59+
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development revsecurity
5760
$(MAKE) -C ./engine -f Makefile.development engine-community
5861

59-
standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity kernel-standalone
62+
standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity kernel-standalone revsecurity
6063
$(MAKE) -C ./engine -f Makefile.standalone standalone-community
6164

62-
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
65+
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel revsecurity
6366
$(MAKE) -C ./engine -f Makefile.installer installer
6467

6568
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-server revsecurity
@@ -73,7 +76,7 @@ server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
7376
libcairopdf:
7477
$(MAKE) -C ./thirdparty/libcairo libcairopdf
7578

76-
revpdfprinter: libcairopdf
79+
revpdfprinter: libcairopdf libcore
7780
$(MAKE) -C ./revpdfprinter revpdfprinter
7881

7982
###############################################################################
@@ -100,7 +103,7 @@ libiodbc:
100103
dbpostgresql: libpq
101104
$(MAKE) -C ./revdb dbpostgresql
102105

103-
dbmysql: libmysql libz
106+
dbmysql: libmysql libz libopenssl
104107
$(MAKE) -C ./revdb dbmysql
105108

106109
dbsqlite: libsqlite libexternal
@@ -171,11 +174,14 @@ revandroid: libexternalv1
171174
# All Targets
172175

173176
.PHONY: all clean
177+
.DEFAULT_GOAL := all
174178

175179
all: revzip server-revzip
176180
all: revxml server-revxml
177181
all: revpdfprinter revandroid
178182
all: revdb dbodbc dbsqlite dbmysql dbpostgresql
179183
all: server-revdb server-dbodbc server-dbsqlite server-dbmysql server-dbpostgresql
180184
all: development standalone installer server
181-
#
185+
186+
clean:
187+
@rm -r _build/linux _cache/linux

‎README.md‎

Lines changed: 320 additions & 0 deletions
Large diffs are not rendered by default.

‎builder/builder.rev‎

2.32 KB
Binary file not shown.

‎builder/docs_builder.rev‎

81.8 KB
Binary file not shown.

‎builder/markdown_compiler.rev‎

143 KB
Binary file not shown.

‎builder/release_notes_builder.rev‎

32.8 KB
Binary file not shown.

‎builder/server_builder.rev‎

1.39 KB
Binary file not shown.

‎builder/tools_builder.rev‎

341 Bytes
Binary file not shown.

‎builder/tools_installer.rev‎

15.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)