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

Commit f6a3c2e

Browse files
author
Ali Lloyd
committed
Merged in refactor-syntax_unicode, updated VS solution, server and pdfprinter makefiles
1 parent b889680 commit f6a3c2e

File tree

8 files changed

+18
-13
lines changed

8 files changed

+18
-13
lines changed

‎engine/Makefile.kernel-server‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ SOURCES=\
3434
combiners.cpp path.cpp metacontext.cpp \
3535
printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
3636
pathprocess.cpp \
37-
variablearray.cpp objectstream.cpp \
37+
objectstream.cpp \
3838
menuparse.cpp parentscript.cpp securemode.cpp \
3939
bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
4040
externalv0.cpp externalv1.cpp lextable.cpp uuid.cpp \
41-
objectprops.cpp objectpropsets.cpp variablevalue.cpp mcutility.cpp notify.cpp customprinter.cpp \
41+
objectprops.cpp objectpropsets.cpp mcutility.cpp notify.cpp customprinter.cpp \
4242
sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp sysunxrandom.cpp \
4343
srvmain.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvposix.cpp srvdebug.cpp \
4444
srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp srvtheme.cpp \

‎engine/Makefile.server‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CUSTOM_INCLUDES=\
1919

2020
CUSTOM_DEPS=libkernel-server.a
2121

22-
CUSTOM_LIBS=pcre png jpeg z core gif graphics skia kernel-server
22+
CUSTOM_LIBS=pcre png jpeg z foundation gif graphics skia kernel-server
2323
CUSTOM_STATIC_LIBS=curl ssl crypto rt
2424
CUSTOM_DYNAMIC_LIBS=dl m pthread
2525

‎engine/src/chunk.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4774,7 +4774,6 @@ Exec_stat MCChunk::setprop(Properties which, MCExecPoint &ep, MCNameRef index, B
47744774
t_object . part_id = t_obj_chunk . part_id;
47754775
t_object . index = index;
47764776

4777-
MCAutoValueRef t_value;
47784777
MCExecStoreProperty(ctxt, t_info, &t_object, *t_value);
47794778
}
47804779
else

‎engine/src/debug.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void MCB_break(MCExecContext &ctxt, uint2 line, uint2 pos)
9494

9595
void MCB_error(MCExecContext &ctxt, uint2 line, uint2 pos, uint2 id)
9696
{
97-
MCServerDebugError(ctct, line, pos, id);
97+
MCServerDebugError(ctxt, line, pos, id);
9898

9999
// Increasing the error lock means that more MCB_error invocations won't occur as
100100
// we step back up the (script) call stack.
@@ -107,7 +107,7 @@ void MCB_done(MCExecPoint &ep)
107107

108108
void MCB_setvar(MCExecContext &ctxt, MCValueRef p_value, MCNameRef name)
109109
{
110-
MCServerDebugVariableChanged(ctxt, p_value, name);
110+
MCServerDebugVariableChanged(ctxt, name);
111111
}
112112

113113
#else

‎engine/src/globals.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -745,10 +745,10 @@ void X_clear_globals(void)
745745
MCttfont = MCSTR("Lucida Grande");
746746
MCttsize = 11;
747747
#else
748-
uint2 MClook = LF_MOTIF;
749-
MCStringRef MCttbgcolor = MCSTR("255,255,207");
750-
MCStringRef MCttfont = MCSTR("Helvetica");
751-
uint2 MCttsize = 12;
748+
MClook = LF_MOTIF;
749+
MCttbgcolor = MCSTR("255,255,207");
750+
MCttfont = MCSTR("Helvetica");
751+
MCttsize = 12;
752752
#endif
753753
MCttsize = 12;
754754
MCtrylock = 0;

‎engine/src/mblandroidmisc.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,10 +1556,10 @@ static Exec_stat MCHandleClearTouches(void *context, MCParameter *p_parameters)
15561556
////////////////////////////////////////////////////////////////////////////////
15571557

15581558
// AL-2013-14-07 [[ Bug 10445 ]] Sort international on Android
1559-
int MCSystemCompareInternational(const char *p_left, const char *p_right)
1559+
int MCSystemCompareInternational(MCStringRef p_left, MCStringRef p_right)
15601560
{
15611561
int32_t t_compare;
1562-
MCAndroidEngineCall("compareInternational", "iss", &t_compare, p_left, p_right);
1562+
MCAndroidEngineCall("compareInternational", "ixx", &t_compare, p_left, p_right);
15631563
return t_compare;
15641564
}
15651565

‎revpdfprinter/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CUSTOM_DEFINES=
99

1010
CUSTOM_INCLUDES=./src ../thirdparty/libcairo/src
1111

12-
CUSTOM_LIBS=cairopdf core z
12+
CUSTOM_LIBS=cairopdf foundation z
1313
CUSTOM_DYNAMIC_LIBS=dl freetype fontconfig pango-1.0 pangoft2-1.0 gobject-2.0 m
1414

1515
CUSTOM_CCFLAGS=\

‎stage.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgraphics", "libgraphics\
9797
{8862ADC2-BEB0-4765-A1E4-0E3493718999} = {8862ADC2-BEB0-4765-A1E4-0E3493718999}
9898
EndProjectSection
9999
EndProject
100+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia", "C:\Users\John Smith\Documents\GitHub\livecode-ali\thirdparty\libskia\libskia.vcproj", "{24B711E0-E67B-4EC7-9EC5-913BE3D6A047}"
101+
EndProject
100102
Global
101103
GlobalSection(SolutionConfigurationPlatforms) = preSolution
102104
Debug|Win32 = Debug|Win32
@@ -247,6 +249,10 @@ Global
247249
{F9B1E2E6-8FD9-48C2-8D5C-9900865E7096}.Debug|Win32.Build.0 = Debug|Win32
248250
{F9B1E2E6-8FD9-48C2-8D5C-9900865E7096}.Release|Win32.ActiveCfg = Release|Win32
249251
{F9B1E2E6-8FD9-48C2-8D5C-9900865E7096}.Release|Win32.Build.0 = Release|Win32
252+
{24B711E0-E67B-4EC7-9EC5-913BE3D6A047}.Debug|Win32.ActiveCfg = Debug|Win32
253+
{24B711E0-E67B-4EC7-9EC5-913BE3D6A047}.Debug|Win32.Build.0 = Debug|Win32
254+
{24B711E0-E67B-4EC7-9EC5-913BE3D6A047}.Release|Win32.ActiveCfg = Release|Win32
255+
{24B711E0-E67B-4EC7-9EC5-913BE3D6A047}.Release|Win32.Build.0 = Release|Win32
250256
EndGlobalSection
251257
GlobalSection(SolutionProperties) = preSolution
252258
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)