Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit fead71d

Browse files
livecodeianlivecodeian
committed
initial import of refactor-graphics branch
1 parent 0652527 commit fead71d

File tree

135 files changed

+8672
-5504
lines changed

Some content is hidden

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

135 files changed

+8672
-5504
lines changed

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Engine Targets
33

44
.PHONY: libopenssl liburlcache libstubs
5-
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore
5+
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore libgraphics libskia
66
.PHONY: revsecurity libgif
77
.PHONY: kernel development standalone webruntime webplugin webplayer server
88
.PHONY: libireviam onrev-server
@@ -31,10 +31,13 @@ libgif:
3131
libopenssl:
3232
$(MAKE) -C ./thirdparty/libopenssl libopenssl
3333

34+
libskia:
35+
$(MAKE) -C ./thirdparty/libskia libskia
36+
3437
libcore:
3538
$(MAKE) -C ./libcore libcore
3639

37-
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
40+
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore libgraphics
3841
$(MAKE) -C ./engine -f Makefile.kernel libkernel
3942

4043
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel

‎engine/Makefile.common‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ CUSTOM_INCLUDES=\
1515
./src \
1616
$(MODE_INCLUDES)
1717

18-
CUSTOM_DEPS=libkernel.a libcore.a libpng.a libpcre.a libjpeg.a
18+
CUSTOM_DEPS=libkernel.a libcore.a libpng.a libpcre.a libjpeg.a libgraphics.a libskia.a
1919

20-
CUSTOM_LIBS=kernel core z gif png pcre jpeg openssl $(MODE_LIBS)
20+
CUSTOM_LIBS=kernel core z gif png pcre jpeg graphics skia openssl $(MODE_LIBS)
2121
CUSTOM_STATIC_LIBS=stdc++ $(MODE_STATIC_LIBS)
22-
CUSTOM_DYNAMIC_LIBS=dl X11 m Xext pthread $(MODE_DYNAMIC_LIBS)
22+
CUSTOM_DYNAMIC_LIBS=dl X11 m Xext pthread freetype $(MODE_DYNAMIC_LIBS)
2323

2424
CUSTOM_CCFLAGS=\
2525
-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti \

‎engine/Makefile.kernel‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@ SOURCES=\
77
cmdsm.cpp cmdsp.cpp cmdss.cpp constant.cpp control.cpp cpalette.cpp \
88
customprinter.cpp date.cpp debug.cpp dispatch.cpp dllst.cpp \
99
execpt.cpp express.cpp field.cpp fieldf.cpp fieldh.cpp fields.cpp \
10-
font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp group.cpp \
10+
font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp \
11+
graphicscontext.cpp \
12+
group.cpp \
1113
handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
1214
igif.cpp iimport.cpp ijpg.cpp image.cpp image_rep.cpp \
13-
image_rep_encoded.cpp image_rep_mutable.cpp image_rep_transformed.cpp \
14-
imagebitmap.cpp ipng.cpp \
15+
image_rep_encoded.cpp image_rep_mutable.cpp \
16+
imagebitmap.cpp ipng.cpp imagelist.cpp \
1517
iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
1618
itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
1719
mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \
1820
object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
19-
property.cpp pxmaplst.cpp pickle.cpp regex.cpp \
21+
property.cpp pickle.cpp regex.cpp \
2022
scriptpt.cpp scrolbar.cpp scrollbardraw.cpp sellst.cpp stack.cpp stack2.cpp \
2123
stack3.cpp stacklst.cpp \
2224
stacksecurity.cpp \
@@ -28,14 +30,14 @@ SOURCES=\
2830
combiners.cpp path.cpp metacontext.cpp \
2931
printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
3032
pathprocess.cpp \
31-
contextscalewrapper.cpp variablearray.cpp objectstream.cpp \
33+
variablearray.cpp objectstream.cpp \
3234
menuparse.cpp parentscript.cpp securemode.cpp \
3335
bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
3436
externalv0.cpp externalv1.cpp \
3537
dskspec.cpp sysunxdate.cpp sysunxnetwork.cpp \
3638
lnxpasteboard.cpp lnxtransfer.cpp lnxclipboard.cpp \
3739
lnxdc.cpp lnxdce.cpp lnxdcs.cpp lnxdclnx.cpp lnxflst.cpp lnxflstold.cpp \
38-
lnxstack.cpp lnxspec.cpp lnxcontext.cpp lnxans.cpp \
40+
lnxstack.cpp lnxspec.cpp lnxans.cpp \
3941
lnxgtktheme.cpp lnxgtkthemedrawing.cpp lnximagecache.cpp lnxpsprinter.cpp \
4042
lnxdnd.cpp lnxmplayer.cpp lnxaudio.cpp lnxkeymapping.cpp \
4143
lnxtextlayout.cpp lnxcolor.cpp lnxcursor.cpp lnxelevate.cpp lnxflst.cpp lnxmisc.cpp \

‎engine/engine.vcproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,10 @@
201201
ReferencedProjectIdentifier="{09751ABE-310B-4324-BACE-F7FFDA2299DE}"
202202
RelativePathToProject=".\thirdparty\libgif\libgif.vcproj"
203203
/>
204+
<ProjectReference
205+
ReferencedProjectIdentifier="{24B711E0-E67B-4EC7-9EC5-913BE3D6A047}"
206+
RelativePathToProject=".\thirdparty\libskia\libskia.vcproj"
207+
/>
204208
</References>
205209
<Files>
206210
<Filter

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 101 additions & 42 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)