Skip to content

Commit 2e3fe8b

Browse files
livecodeianlivecodeian
committed
initial merge of syntax refactor branch into git
1 parent 2788772 commit 2e3fe8b

File tree

730 files changed

+94496
-10084
lines changed

Some content is hidden

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

730 files changed

+94496
-10084
lines changed

‎Makefile‎

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

4-
.PHONY: libopenssl liburlcache libstubs
4+
.PHONY: libopenssl liburlcache libstubs libfoundation
55
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore
66
.PHONY: revsecurity libgif
77
.PHONY: kernel development standalone webruntime webplugin webplayer server
@@ -34,10 +34,13 @@ libopenssl:
3434

3535
libcore:
3636
$(MAKE) -C ./libcore libcore
37-
37+
38+
libfoundation:
39+
$(MAKE) -C ./libfoundation libfoundation
40+
3841
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
3942
$(MAKE) -C ./engine -f Makefile.kernel libkernel
40-
43+
4144
kernel-standalone: kernel
4245
$(MAKE) -C ./engine -f Makefile.kernel-standalone libkernel-standalone
4346

@@ -47,16 +50,16 @@ kernel-development: kernel
4750
kernel-server:
4851
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
4952

50-
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development
53+
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel kernel-development
5154
$(MAKE) -C ./engine -f Makefile.development engine-community
5255

53-
standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity kernel-standalone
56+
standalone: libz libgif libjpeg libpcre libpng libopenssl libfoundation kernel revsecurity kernel-standalone
5457
$(MAKE) -C ./engine -f Makefile.standalone standalone-community
5558

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

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

6265
###############################################################################

‎engine/Makefile.common‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SOURCES= \
22
$(MODE_SOURCES)
3-
3+
44
CUSTOM_DEFINES=\
55
LINUX \
66
X11 TARGET_PLATFORM_LINUX TARGET_PLATFORM_POSIX _LINUX \
@@ -12,9 +12,9 @@ CUSTOM_INCLUDES=\
1212
./src \
1313
$(MODE_INCLUDES)
1414

15-
CUSTOM_DEPS= libkernel.a libcore.a libpng.a libpcre.a libjpeg.a $(MODE_DEPS)
15+
CUSTOM_DEPS=libkernel.a libfoundation.a libpng.a libpcre.a libjpeg.a $(MODE_DEPS)
1616

17-
CUSTOM_LIBS=$(MODE_LIBS) kernel core z gif png pcre jpeg openssl
17+
CUSTOM_LIBS=$(MODE_LIBS) kernel foundation z gif png pcre jpeg openssl
1818
CUSTOM_STATIC_LIBS=stdc++ $(MODE_STATIC_LIBS)
1919
CUSTOM_DYNAMIC_LIBS=dl X11 m Xext pthread $(MODE_DYNAMIC_LIBS)
2020

‎engine/Makefile.kernel‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SOURCES=\
2828
combiners.cpp path.cpp metacontext.cpp \
2929
printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
3030
pathprocess.cpp \
31-
contextscalewrapper.cpp variablearray.cpp objectstream.cpp \
31+
contextscalewrapper.cpp objectstream.cpp \
3232
menuparse.cpp parentscript.cpp securemode.cpp \
3333
bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
3434
externalv0.cpp externalv1.cpp \
@@ -41,9 +41,19 @@ SOURCES=\
4141
lnxtextlayout.cpp lnxcolor.cpp lnxcursor.cpp lnxelevate.cpp lnxflst.cpp lnxmisc.cpp \
4242
lnximage.cpp dskmain.cpp dsklnxmain.cpp \
4343
linuxstubs.cpp notify.cpp eventqueue.cpp \
44-
objectprops.cpp objectpropsets.cpp variablevalue.cpp internal.cpp mcutility.cpp name.cpp \
44+
objectprops.cpp objectpropsets.cpp internal.cpp mcutility.cpp \
4545
redraw.cpp tilecache.cpp tilecachesw.cpp syslnxregion.cpp fieldstyledtext.cpp paragrafattr.cpp \
46-
fonttable.cpp fieldrtf.cpp fieldhtml.cpp stackcache.cpp
46+
fonttable.cpp fieldrtf.cpp fieldhtml.cpp syslnxfs.cpp stackcache.cpp \
47+
exec-array.cpp exec-datetime.cpp exec-engine.cpp exec-files.cpp exec-filters.cpp exec-interface.cpp \
48+
exec-logic exec-math.cpp exec-multimedia.cpp exec-network.cpp exec-pasteboard.cpp exec-scripting \
49+
exec-strings.cpp exec-text.cpp exec-graphics.cpp exec-security.cpp exec-printing.cpp exec-debugging.cpp \
50+
exec-ide.cpp exec-server.cpp exec-interface2.cpp exec.cpp \
51+
exec-interface-aclip.cpp exec-interface-button.cpp exec-interface-card.cpp exec-interface-control.cpp \
52+
exec-interface-field.cpp exec-interface-graphic.cpp exec-interface-group.cpp exec-interface-image.cpp \
53+
exec-interface-object.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
54+
exec-interface-vclip.cpp exec-legacy.cpp exec-dialog.cpp \
55+
syntax.cpp \
56+
foundation-legacy.cpp legacy_spec.cpp
4757

4858
linuxstubs.cpp: src/linux.stubs
4959
../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.lc" <./src/linux.stubs >./src/linuxstubs.cpp
@@ -54,5 +64,5 @@ include/revbuild.h: include/revbuild.h.in ../version
5464
include ../rules/environment.linux.makefile
5565

5666
$(CACHE_DIR)/mcstring.o: include/revbuild.h
57-
67+
5868
include Makefile.kernel-common

‎engine/engine.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194
RelativePathToProject=".\engine\kernel.vcproj"
195195
/>
196196
<ProjectReference
197-
ReferencedProjectIdentifier="{6899CD7E-BE16-44CE-A28B-27304F42E127}"
198-
RelativePathToProject=".\libcore\libcore.vcproj"
197+
ReferencedProjectIdentifier="{8862ADC2-BEB0-4765-A1E4-0E3493718999}"
198+
RelativePathToProject=".\libfoundation\libfoundation.vcproj"
199199
/>
200200
<ProjectReference
201201
ReferencedProjectIdentifier="{09751ABE-310B-4324-BACE-F7FFDA2299DE}"

0 commit comments

Comments
 (0)