Skip to content

Commit e44136b

Browse files
author
Fraser J. Gordon
committed
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode_execcontexts
Conflicts: engine/src/debug.cpp engine/src/debug.h engine/src/statemnt.cpp engine/src/variable.cpp
2 parents b1f2e37 + c570007 commit e44136b

File tree

154 files changed

+6020
-5484
lines changed

Some content is hidden

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

154 files changed

+6020
-5484
lines changed

‎engine/Android.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ LOCAL_SRC_FILES := $(addprefix src/,\
5656
exec-sensor.cpp exec-sound.cpp exec-store.cpp exec-textmessaging.cpp \
5757
exec-array.cpp exec-datetime.cpp exec-engine.cpp exec-files.cpp exec-filters.cpp exec-interface.cpp \
5858
exec-logic.cpp exec-math.cpp exec-multimedia.cpp exec-network.cpp exec-pasteboard.cpp exec-scripting.cpp \
59-
exec-strings.cpp exec-text.cpp exec-graphics.cpp exec-security.cpp exec-printing.cpp exec-debugging.cpp \
59+
exec-strings.cpp exec-strings-chunk.cpp exec-text.cpp exec-graphics.cpp exec-security.cpp exec-printing.cpp exec-debugging.cpp \
6060
exec-ide.cpp exec-server.cpp exec-interface2.cpp exec.cpp \
6161
exec-interface-aclip.cpp exec-interface-button.cpp exec-interface-card.cpp exec-interface-control.cpp \
62-
exec-interface-field.cpp exec-interface-graphic.cpp exec-interface-group.cpp exec-interface-image.cpp \
62+
exec-interface-field.cpp exec-interface-field-chunk.cpp exec-interface-graphic.cpp exec-interface-group.cpp exec-interface-image.cpp \
6363
exec-interface-object.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
6464
exec-interface-vclip.cpp exec-legacy.cpp exec-dialog.cpp \
6565
syntax.cpp \

‎engine/Makefile.kernel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ SOURCES=\
4646
fonttable.cpp fieldrtf.cpp fieldhtml.cpp syslnxfs.cpp stackcache.cpp \
4747
exec-array.cpp exec-datetime.cpp exec-engine.cpp exec-files.cpp exec-filters.cpp exec-interface.cpp \
4848
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 \
49+
exec-strings.cpp exec-strings-chunk.cpp exec-text.cpp exec-graphics.cpp exec-security.cpp exec-printing.cpp exec-debugging.cpp \
5050
exec-ide.cpp exec-server.cpp exec-interface2.cpp exec.cpp \
5151
exec-interface-aclip.cpp exec-interface-button.cpp exec-interface-card.cpp exec-interface-control.cpp \
5252
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 \
53+
exec-interface-object.cpp exec-interface-field-chunk.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
5454
exec-interface-vclip.cpp exec-legacy.cpp exec-dialog.cpp exec-strings-chunk.cpp \
5555
syntax.cpp \
5656
foundation-legacy.cpp legacy_spec.cpp

‎engine/engine-mobile.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@
274274
768D66C317622FE200F203A3 /* exec-nativecontrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 768D66C117622FE100F203A3 /* exec-nativecontrol.cpp */; };
275275
768D66C51765E11300F203A3 /* exec-pick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 768D66C41765E11300F203A3 /* exec-pick.cpp */; };
276276
768D66C61765E11300F203A3 /* exec-pick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 768D66C41765E11300F203A3 /* exec-pick.cpp */; };
277+
76B298B2180448AF0053EC38 /* exec-interface-field-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76B298B1180448AF0053EC38 /* exec-interface-field-chunk.cpp */; };
278+
76B298B4180449050053EC38 /* test.rev in Resources */ = {isa = PBXBuildFile; fileRef = 76B298B3180449050053EC38 /* test.rev */; };
277279
BE02B4FB17FEC652001BAFF0 /* exec-strings-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE02B4FA17FEC639001BAFF0 /* exec-strings-chunk.cpp */; };
278280
BE096E8B175CD7CF00F92F90 /* libfoundationmobile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE096E85175CD79D00F92F90 /* libfoundationmobile.a */; };
279281
BE0A3CD417E1FD2500C2361B /* mblnetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE0A3CD317E1FC9E00C2361B /* mblnetwork.cpp */; };
@@ -891,6 +893,8 @@
891893
7607CFD5176B232E00ADB512 /* mblandroidmediapick.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mblandroidmediapick.cpp; path = src/mblandroidmediapick.cpp; sourceTree = "<group>"; };
892894
768D66C117622FE100F203A3 /* exec-nativecontrol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-nativecontrol.cpp"; path = "src/exec-nativecontrol.cpp"; sourceTree = "<group>"; };
893895
768D66C41765E11300F203A3 /* exec-pick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-pick.cpp"; path = "src/exec-pick.cpp"; sourceTree = "<group>"; };
896+
76B298B1180448AF0053EC38 /* exec-interface-field-chunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-interface-field-chunk.cpp"; path = "src/exec-interface-field-chunk.cpp"; sourceTree = "<group>"; };
897+
76B298B3180449050053EC38 /* test.rev */ = {isa = PBXFileReference; lastKnownFileType = file; name = test.rev; path = ../test.rev; sourceTree = "<group>"; };
894898
BE02B4FA17FEC639001BAFF0 /* exec-strings-chunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-strings-chunk.cpp"; path = "src/exec-strings-chunk.cpp"; sourceTree = "<group>"; };
895899
BE096E7D175CD79D00F92F90 /* libfoundation-mobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libfoundation-mobile.xcodeproj"; path = "../libfoundation/libfoundation-mobile.xcodeproj"; sourceTree = SOURCE_ROOT; };
896900
BE0A3CD317E1FC9E00C2361B /* mblnetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblnetwork.cpp; path = src/mblnetwork.cpp; sourceTree = "<group>"; };
@@ -1314,6 +1318,7 @@
13141318
4DD3DD7B1040AA4700CAC7EF = {
13151319
isa = PBXGroup;
13161320
children = (
1321+
76B298B3180449050053EC38 /* test.rev */,
13171322
E82D43BF1712CF1A00A10289 /* Projects */,
13181323
E82D43BE1712CEF500A10289 /* Frameworks */,
13191324
4DD3DF3A1040B03B00CAC7EF /* Configurations */,
@@ -1379,6 +1384,7 @@
13791384
7607CF7F1769BB9B00ADB512 /* Exec-Interface */ = {
13801385
isa = PBXGroup;
13811386
children = (
1387+
76B298B1180448AF0053EC38 /* exec-interface-field-chunk.cpp */,
13821388
7607CF601769BB4C00ADB512 /* exec-interface-aclip.cpp */,
13831389
7607CF611769BB4C00ADB512 /* exec-interface-button.cpp */,
13841390
7607CF621769BB4C00ADB512 /* exec-interface-card.cpp */,
@@ -2041,6 +2047,7 @@
20412047
4D7E3A591281835D00E7F80A /* Default.png in Resources */,
20422048
4CD038F316C8FE1700EBCCBA /* [email protected] in Resources */,
20432049
BE44950D175CF03F00346B49 /* iphone_test.rev in Resources */,
2050+
76B298B4180449050053EC38 /* test.rev in Resources */,
20442051
);
20452052
runOnlyForDeploymentPostprocessing = 0;
20462053
};
@@ -2355,6 +2362,7 @@
23552362
7607CF7E1769BB4D00ADB512 /* exec-interface2.cpp in Sources */,
23562363
BE0A3CD417E1FD2500C2361B /* mblnetwork.cpp in Sources */,
23572364
BE02B4FB17FEC652001BAFF0 /* exec-strings-chunk.cpp in Sources */,
2365+
76B298B2180448AF0053EC38 /* exec-interface-field-chunk.cpp in Sources */,
23582366
);
23592367
runOnlyForDeploymentPostprocessing = 0;
23602368
};

‎engine/engine-mobile.xcodeproj/project.xcworkspace/xcshareddata/engine-mobile.xccheckout‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
6+
<false/>
7+
<key>IDESourceControlProjectIdentifier</key>
8+
<string>70B1204D-4A1B-431C-BB08-EE4E42BFDF48</string>
9+
<key>IDESourceControlProjectName</key>
10+
<string>engine-mobile</string>
11+
<key>IDESourceControlProjectOriginsDictionary</key>
12+
<dict>
13+
<key>0A55448A-9284-4586-87AC-D5A14D6856ED</key>
14+
<string>https://github.com/runrev/livecode.git</string>
15+
<key>20A62DB2-AACC-4B5C-B98F-4C2A1787F626</key>
16+
<string>https://github.com/runrev/livecode-thirdparty</string>
17+
</dict>
18+
<key>IDESourceControlProjectPath</key>
19+
<string>engine/engine-mobile.xcodeproj/project.xcworkspace</string>
20+
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
21+
<dict>
22+
<key>0A55448A-9284-4586-87AC-D5A14D6856ED</key>
23+
<string>../../..</string>
24+
<key>20A62DB2-AACC-4B5C-B98F-4C2A1787F626</key>
25+
<string>../../../thirdparty</string>
26+
</dict>
27+
<key>IDESourceControlProjectURL</key>
28+
<string>https://github.com/runrev/livecode.git</string>
29+
<key>IDESourceControlProjectVersion</key>
30+
<integer>110</integer>
31+
<key>IDESourceControlProjectWCCIdentifier</key>
32+
<string>0A55448A-9284-4586-87AC-D5A14D6856ED</string>
33+
<key>IDESourceControlProjectWCConfigurations</key>
34+
<array>
35+
<dict>
36+
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
37+
<string>public.vcs.git</string>
38+
<key>IDESourceControlWCCIdentifierKey</key>
39+
<string>0A55448A-9284-4586-87AC-D5A14D6856ED</string>
40+
<key>IDESourceControlWCCName</key>
41+
<string>refactor-syntax</string>
42+
</dict>
43+
<dict>
44+
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
45+
<string>public.vcs.git</string>
46+
<key>IDESourceControlWCCIdentifierKey</key>
47+
<string>20A62DB2-AACC-4B5C-B98F-4C2A1787F626</string>
48+
<key>IDESourceControlWCCName</key>
49+
<string>thirdparty</string>
50+
</dict>
51+
</array>
52+
</dict>
53+
</plist>

‎engine/engine-mobile.xcodeproj/xcshareddata/xcschemes/standalone-mobile.xcscheme‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
</MacroExpansion>
4141
</TestAction>
4242
<LaunchAction
43-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
44-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
44+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
4545
launchStyle = "0"
4646
useCustomWorkingDirectory = "NO"
4747
buildConfiguration = "Debug"

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@
559559
4DFFC7E013DD8A91006233A4 /* syscfdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFC7DE13DD8A91006233A4 /* syscfdate.cpp */; };
560560
4DFFC7E113DD8A91006233A4 /* sysunxnetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFC7DF13DD8A91006233A4 /* sysunxnetwork.cpp */; };
561561
4DFFC7E713DD8AB9006233A4 /* objectpropsets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFC7E613DD8AB9006233A4 /* objectpropsets.cpp */; };
562+
76D47DE918030E50006F9102 /* exec-interface-field-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76D47DE81802FD03006F9102 /* exec-interface-field-chunk.cpp */; };
563+
76D47DEA18030E52006F9102 /* exec-interface-field-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76D47DE81802FD03006F9102 /* exec-interface-field-chunk.cpp */; };
562564
76FA930A17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */; };
563565
76FA930B17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */; };
564566
A71F80540F4F178C003012FD /* Standalone.icns in Resources */ = {isa = PBXBuildFile; fileRef = A71F80530F4F178C003012FD /* Standalone.icns */; };
@@ -1408,7 +1410,7 @@
14081410
4DE3B0FF15888AB8008EB6B5 /* exec-strings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-strings.cpp"; path = "src/exec-strings.cpp"; sourceTree = "<group>"; };
14091411
4DE3B10115888AB8008EB6B5 /* exec-text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-text.cpp"; path = "src/exec-text.cpp"; sourceTree = "<group>"; };
14101412
4DE3B10215888AB8008EB6B5 /* exec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = exec.cpp; path = src/exec.cpp; sourceTree = "<group>"; };
1411-
4DE3B10315888AB8008EB6B5 /* exec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = exec.h; path = src/exec.h; sourceTree = "<group>"; };
1413+
4DE3B10315888AB8008EB6B5 /* exec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = exec.h; path = src/exec.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
14121414
4DE663070BF9C1E50084FE0B /* Standalone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "Standalone-Info.plist"; path = "rsrc/Standalone-Info.plist"; sourceTree = "<group>"; };
14131415
4DE7ED0D13B33B7F002634F5 /* dskspec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dskspec.cpp; path = src/dskspec.cpp; sourceTree = "<group>"; };
14141416
4DEE29F60FDE41BE0009423C /* libkernel.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libkernel.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1527,6 +1529,7 @@
15271529
768D66A21762087500F203A3 /* mbliphonesensor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonesensor.mm; path = src/mbliphonesensor.mm; sourceTree = "<group>"; };
15281530
768D66A31762087500F203A3 /* mbliphonestore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonestore.mm; path = src/mbliphonestore.mm; sourceTree = "<group>"; };
15291531
768D66A41762087500F203A3 /* mbliphonetextmessaging.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonetextmessaging.mm; path = src/mbliphonetextmessaging.mm; sourceTree = "<group>"; };
1532+
76D47DE81802FD03006F9102 /* exec-interface-field-chunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-interface-field-chunk.cpp"; path = "src/exec-interface-field-chunk.cpp"; sourceTree = "<group>"; };
15301533
76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-strings-chunk.cpp"; path = "src/exec-strings-chunk.cpp"; sourceTree = "<group>"; };
15311534
A04643DB0BAAA63A0030A830 /* w32ans.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = w32ans.cpp; path = src/w32ans.cpp; sourceTree = "<group>"; };
15321535
A04643DC0BAAA63A0030A830 /* w32context.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = w32context.cpp; path = src/w32context.cpp; sourceTree = "<group>"; };
@@ -2463,6 +2466,7 @@
24632466
E875FD8017293B29005A69F4 /* exec-interface */ = {
24642467
isa = PBXGroup;
24652468
children = (
2469+
76D47DE81802FD03006F9102 /* exec-interface-field-chunk.cpp */,
24662470
E875FD8117293B4F005A69F4 /* exec-interface-aclip.cpp */,
24672471
E875FD8217293B4F005A69F4 /* exec-interface-button.cpp */,
24682472
E875FD8317293B4F005A69F4 /* exec-interface-card.cpp */,
@@ -3760,6 +3764,7 @@
37603764
BEFD23CD17B5233800B9310D /* sysspec.cpp in Sources */,
37613765
1D17A9C317BE673E0024CCA8 /* osxans.mm in Sources */,
37623766
76FA930A17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */,
3767+
76D47DE918030E50006F9102 /* exec-interface-field-chunk.cpp in Sources */,
37633768
);
37643769
runOnlyForDeploymentPostprocessing = 0;
37653770
};
@@ -3809,6 +3814,7 @@
38093814
4D02A3CF17A6CC14009D8AF4 /* foundation-legacy.cpp in Sources */,
38103815
4D02A3E417A6CE55009D8AF4 /* legacy_spec.cpp in Sources */,
38113816
76FA930B17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */,
3817+
76D47DEA18030E52006F9102 /* exec-interface-field-chunk.cpp in Sources */,
38123818
);
38133819
runOnlyForDeploymentPostprocessing = 0;
38143820
};
@@ -4054,6 +4060,7 @@
40544060
MODE_INSTALLER,
40554061
);
40564062
INFOPLIST_FILE = "rsrc/Installer-Info.plist";
4063+
OTHER_LDFLAGS = "-ObjC";
40574064
PRODUCT_NAME = Installer;
40584065
};
40594066
name = Debug;
@@ -4066,6 +4073,7 @@
40664073
MODE_INSTALLER,
40674074
);
40684075
INFOPLIST_FILE = "rsrc/Installer-Info.plist";
4076+
OTHER_LDFLAGS = "-ObjC";
40694077
PRODUCT_NAME = Installer;
40704078
};
40714079
name = Release;
@@ -4088,7 +4096,9 @@
40884096
isa = XCBuildConfiguration;
40894097
buildSettings = {
40904098
INFOPLIST_FILE = "rsrc/Revolution-Info.plist";
4099+
OTHER_LDFLAGS = "-ObjC";
40914100
PRODUCT_NAME = "LiveCode-Community";
4101+
SDKROOT = macosx10.6;
40924102
WRAPPER_EXTENSION = app;
40934103
};
40944104
name = Debug;
@@ -4097,7 +4107,9 @@
40974107
isa = XCBuildConfiguration;
40984108
buildSettings = {
40994109
INFOPLIST_FILE = "rsrc/Revolution-Info.plist";
4110+
OTHER_LDFLAGS = "-ObjC";
41004111
PRODUCT_NAME = "LiveCode-Community";
4112+
SDKROOT = macosx10.6;
41014113
WRAPPER_EXTENSION = app;
41024114
};
41034115
name = Release;
@@ -4106,6 +4118,7 @@
41064118
isa = XCBuildConfiguration;
41074119
buildSettings = {
41084120
INFOPLIST_FILE = "rsrc/Standalone-Info.plist";
4121+
OTHER_LDFLAGS = "-ObjC";
41094122
PRODUCT_NAME = "Standalone-Community";
41104123
};
41114124
name = Debug;
@@ -4114,6 +4127,7 @@
41144127
isa = XCBuildConfiguration;
41154128
buildSettings = {
41164129
INFOPLIST_FILE = "rsrc/Standalone-Info.plist";
4130+
OTHER_LDFLAGS = "-ObjC";
41174131
PRODUCT_NAME = "Standalone-Community";
41184132
};
41194133
name = Release;
@@ -4136,6 +4150,7 @@
41364150
isa = XCBuildConfiguration;
41374151
buildSettings = {
41384152
GLOBAL_GCC_PREPROCESSOR_DEFINITIONS = "_SERVER _MAC_SERVER";
4153+
OTHER_LDFLAGS = "-ObjC";
41394154
PRODUCT_NAME = "Server-Community";
41404155
};
41414156
name = Debug;
@@ -4144,6 +4159,7 @@
41444159
isa = XCBuildConfiguration;
41454160
buildSettings = {
41464161
GLOBAL_GCC_PREPROCESSOR_DEFINITIONS = "_SERVER _MAC_SERVER";
4162+
OTHER_LDFLAGS = "-ObjC";
41474163
PRODUCT_NAME = "Server-Community";
41484164
};
41494165
name = Release;

‎engine/engine.xcodeproj/project.xcworkspace/xcshareddata/engine.xccheckout‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
6+
<false/>
7+
<key>IDESourceControlProjectIdentifier</key>
8+
<string>57C76E4F-58EE-4A3D-BE92-C074819CF9C1</string>
9+
<key>IDESourceControlProjectName</key>
10+
<string>engine</string>
11+
<key>IDESourceControlProjectOriginsDictionary</key>
12+
<dict>
13+
<key>09F7E677-AE4F-420F-A9B3-FA9A3154DE37</key>
14+
<string>https://github.com/runrev/livecode.git</string>
15+
<key>7017EEE8-E33B-43CE-88EC-7658BD78C3C1</key>
16+
<string>https://github.com/runrev/livecode-thirdparty</string>
17+
</dict>
18+
<key>IDESourceControlProjectPath</key>
19+
<string>engine/engine.xcodeproj/project.xcworkspace</string>
20+
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
21+
<dict>
22+
<key>09F7E677-AE4F-420F-A9B3-FA9A3154DE37</key>
23+
<string>../../..</string>
24+
<key>7017EEE8-E33B-43CE-88EC-7658BD78C3C1</key>
25+
<string>../../../thirdparty</string>
26+
</dict>
27+
<key>IDESourceControlProjectURL</key>
28+
<string>https://github.com/runrev/livecode.git</string>
29+
<key>IDESourceControlProjectVersion</key>
30+
<integer>110</integer>
31+
<key>IDESourceControlProjectWCCIdentifier</key>
32+
<string>09F7E677-AE4F-420F-A9B3-FA9A3154DE37</string>
33+
<key>IDESourceControlProjectWCConfigurations</key>
34+
<array>
35+
<dict>
36+
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
37+
<string>public.vcs.git</string>
38+
<key>IDESourceControlWCCIdentifierKey</key>
39+
<string>09F7E677-AE4F-420F-A9B3-FA9A3154DE37</string>
40+
<key>IDESourceControlWCCName</key>
41+
<string>refactor-syntax</string>
42+
</dict>
43+
<dict>
44+
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
45+
<string>public.vcs.git</string>
46+
<key>IDESourceControlWCCIdentifierKey</key>
47+
<string>7017EEE8-E33B-43CE-88EC-7658BD78C3C1</string>
48+
<key>IDESourceControlWCCName</key>
49+
<string>thirdparty</string>
50+
</dict>
51+
</array>
52+
</dict>
53+
</plist>

‎engine/kernel.vcproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6152,13 +6152,6 @@
61526152
<File
61536153
RelativePath=".\src\sysspec.cpp"
61546154
>
6155-
<FileConfiguration
6156-
Name="Debug|Win32"
6157-
>
6158-
<Tool
6159-
Name="VCCLCompilerTool"
6160-
/>
6161-
</FileConfiguration>
61626155
<FileConfiguration
61636156
Name="Release|Win32"
61646157
ExcludedFromBuild="true"
@@ -6406,6 +6399,10 @@
64066399
RelativePath=".\src\exec-interface-control.cpp"
64076400
>
64086401
</File>
6402+
<File
6403+
RelativePath=".\src\exec-interface-field-chunk.cpp"
6404+
>
6405+
</File>
64096406
<File
64106407
RelativePath=".\src\exec-interface-field.cpp"
64116408
>

0 commit comments

Comments
 (0)