Skip to content

Commit c49d9e6

Browse files
Merge branch 'develop' into refactor-syntax_unicode
Conflicts: engine/Makefile.kernel-server version
2 parents 0d01915 + b53f1d0 commit c49d9e6

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

engine/Makefile.kernel-server

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ SOURCES=\
5858
sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp sysunxrandom.cpp \
5959
srvmain.cpp dsklnx.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvdebug.cpp \
6060
srvscript.cpp srvoutput.cpp srvtheme.cpp \
61-
eventqueue.cpp encodederrors.cpp redraw.cpp tilecache.cpp tilecachesw.cpp \
61+
eventqueue.cpp encodederrors.cpp redraw.cpp tilecache.cpp tilecachesw.cpp \
6262
fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp \
63-
graphicscontext.cpp lnxflst.cpp lnxflstold.cpp lnxelevate.cpp \
63+
graphicscontext.cpp lnxflst.cpp lnxflstold.cpp lnxelevate.cpp \
6464
exec-array.cpp exec-datetime.cpp exec-engine.cpp exec-files.cpp exec-filters.cpp exec-interface.cpp \
6565
exec-logic exec-math.cpp exec-multimedia.cpp exec-network.cpp exec-pasteboard.cpp exec-scripting \
6666
exec-strings.cpp exec-strings-chunk.cpp exec-text.cpp exec-graphics.cpp exec-security.cpp exec-printing.cpp exec-debugging.cpp \
@@ -69,11 +69,12 @@ SOURCES=\
6969
exec-interface-field.cpp exec-interface-graphic.cpp exec-interface-group.cpp exec-interface-image.cpp \
7070
exec-interface-object.cpp exec-interface-field-chunk.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
7171
exec-interface-vclip.cpp exec-keywords.cpp exec-legacy.cpp exec-dialog.cpp exec-strings-chunk.cpp \
72-
syntax.cpp quicktime.cpp \
72+
syntax.cpp quicktime.cpp \
7373
foundation-legacy.cpp legacy_spec.cpp \
7474
srvposix.cpp \
75-
srvcgi.cpp srvmultipart.cpp
76-
75+
srvcgi.cpp srvmultipart.cpp \
76+
sysunxthreads.cpp, stacktile.cpp
77+
7778
SOURCE_DIRS=
7879

7980
CUSTOM_OVERRIDE_DEFINES=1
@@ -86,7 +87,7 @@ CUSTOM_INCLUDES=\
8687

8788
CUSTOM_CCFLAGS=\
8889
-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
89-
-fmessage-length=0
90+
-fmessage-length=0 -march=i486
9091

9192
include/revbuild.h: include/revbuild.h.in ../version ../util/encode_version.pl
9293
../util/encode_version.pl

0 commit comments

Comments
 (0)