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

Commit d229de6

Browse files
author
Fraser J. Gordon
committed
Fixes for the inevitable merge/build issues
1 parent 0afc5a8 commit d229de6

File tree

4 files changed

+7
-41
lines changed

4 files changed

+7
-41
lines changed

‎engine/Makefile.kernel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ SOURCES=\
7777
exec-interface-vclip.cpp exec-keywords.cpp exec-legacy.cpp exec-dialog.cpp exec-strings-chunk.cpp \
7878
syntax.cpp \
7979
foundation-legacy.cpp legacy_spec.cpp \
80-
sysunxthreads.cpp, stacktile.cpp
80+
sysunxthreads.cpp, stacktile.cpp \
81+
mcstring.cpp
8182

8283
linuxstubs.cpp: src/linux.stubs ../util/weak_stub_maker.pl
8384
# ../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.lc" <./src/linux.stubs >./src/linuxstubs.cpp

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@
291291
4D6C27FD1647D942007C96B7 /* exec-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D6C27FB1647D942007C96B7 /* exec-graphics.cpp */; };
292292
4D6C27FE1647D942007C96B7 /* exec-security.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D6C27FC1647D942007C96B7 /* exec-security.cpp */; };
293293
4D6C28B61647DC4F007C96B7 /* libfoundation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7FA7BB1594E0FA00EEF440 /* libfoundation.a */; };
294-
4D6F2AE718981E7F0099947D /* (null) in Sources */ = {isa = PBXBuildFile; };
295294
4D7740CB1226AA58001C9150 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5881C10B80C7C300200116 /* Quartz.framework */; };
296295
4D7740CC1226AA65001C9150 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5881C10B80C7C300200116 /* Quartz.framework */; };
297296
4D77F1DD183F8298002EEBB4 /* exec-keywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D77F1DC183F8298002EEBB4 /* exec-keywords.cpp */; };
@@ -4001,7 +4000,6 @@
40014000
4D1F9D53171C682E0091C6CB /* hndlrlst.cpp in Sources */,
40024001
4D1F9D54171C682E0091C6CB /* idraw.cpp in Sources */,
40034002
4D1F9D55171C682E0091C6CB /* ifile.cpp in Sources */,
4004-
E8AF7D2419F7E3BF000F68E9 /* graphics_util.cpp in Sources */,
40054003
4D1F9D56171C682E0091C6CB /* igif.cpp in Sources */,
40064004
4D1F9D57171C682E0091C6CB /* iimport.cpp in Sources */,
40074005
4D1F9D58171C682E0091C6CB /* ijpg.cpp in Sources */,
@@ -4767,10 +4765,6 @@
47674765
MODE_INSTALLER,
47684766
);
47694767
INFOPLIST_FILE = "rsrc/Installer-Info.plist";
4770-
LIBRARY_SEARCH_PATHS = (
4771-
"$(inherited)",
4772-
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
4773-
);
47744768
OTHER_LDFLAGS = "-ObjC";
47754769
PRODUCT_NAME = Installer;
47764770
};
@@ -4784,10 +4778,6 @@
47844778
MODE_INSTALLER,
47854779
);
47864780
INFOPLIST_FILE = "rsrc/Installer-Info.plist";
4787-
LIBRARY_SEARCH_PATHS = (
4788-
"$(inherited)",
4789-
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
4790-
);
47914781
OTHER_LDFLAGS = "-ObjC";
47924782
PRODUCT_NAME = Installer;
47934783
};
@@ -4813,10 +4803,6 @@
48134803
isa = XCBuildConfiguration;
48144804
buildSettings = {
48154805
INFOPLIST_FILE = "rsrc/Revolution-Info.plist";
4816-
LIBRARY_SEARCH_PATHS = (
4817-
"$(inherited)",
4818-
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
4819-
);
48204806
OTHER_LDFLAGS = "-ObjC";
48214807
PRODUCT_NAME = "LiveCode-Community";
48224808
WRAPPER_EXTENSION = app;
@@ -4827,10 +4813,6 @@
48274813
isa = XCBuildConfiguration;
48284814
buildSettings = {
48294815
INFOPLIST_FILE = "rsrc/Revolution-Info.plist";
4830-
LIBRARY_SEARCH_PATHS = (
4831-
"$(inherited)",
4832-
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
4833-
);
48344816
OTHER_LDFLAGS = "-ObjC";
48354817
PRODUCT_NAME = "LiveCode-Community";
48364818
WRAPPER_EXTENSION = app;
@@ -4841,11 +4823,6 @@
48414823
isa = XCBuildConfiguration;
48424824
baseConfigurationReference = 4D587DB40B80949B00200116 /* Debug.xcconfig */;
48434825
buildSettings = {
4844-
LIBRARY_SEARCH_PATHS = (
4845-
"$(inherited)",
4846-
"$(SOLUTION_DIR)/prebuilt/lib/mac",
4847-
"\"$(SRCROOT)/../_build/mac/Debug\"",
4848-
);
48494826
OTHER_LDFLAGS = (
48504827
"-ObjC",
48514828
"-lcustomssl",
@@ -4859,11 +4836,6 @@
48594836
isa = XCBuildConfiguration;
48604837
baseConfigurationReference = 4D587DB20B80949B00200116 /* Release.xcconfig */;
48614838
buildSettings = {
4862-
LIBRARY_SEARCH_PATHS = (
4863-
"$(inherited)",
4864-
"$(SOLUTION_DIR)/prebuilt/lib/mac",
4865-
"\"$(SRCROOT)/../_build/mac/Debug\"",
4866-
);
48674839
OTHER_LDFLAGS = (
48684840
"-ObjC",
48694841
"-lcustomssl",
@@ -4877,10 +4849,6 @@
48774849
isa = XCBuildConfiguration;
48784850
buildSettings = {
48794851
INFOPLIST_FILE = "rsrc/Standalone-Info.plist";
4880-
LIBRARY_SEARCH_PATHS = (
4881-
"$(inherited)",
4882-
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
4883-
);
48844852
OTHER_LDFLAGS = "-ObjC";
48854853
PRODUCT_NAME = "Standalone-Community";
48864854
};
@@ -4890,10 +4858,6 @@
48904858
isa = XCBuildConfiguration;
48914859
buildSettings = {
48924860
INFOPLIST_FILE = "rsrc/Standalone-Info.plist";
4893-
LIBRARY_SEARCH_PATHS = (
4894-
"$(inherited)",
4895-
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
4896-
);
48974861
OTHER_LDFLAGS = "-ObjC";
48984862
PRODUCT_NAME = "Standalone-Community";
48994863
};

‎engine/src/srvcgi.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,21 +1068,21 @@ static bool cgi_multipart_header_callback(void *p_context, MCMultiPartHeader *p_
10681068
if (MCCStringEqualCaseless(p_header->param_name[i], "name"))
10691069
{
10701070
MCAutoStringRef t_name;
1071-
MCStringCreateWithCStringAndRelease((char_t*)p_header->param_value[i], &t_name);
1071+
MCStringCreateWithCStringAndRelease(p_header->param_value[i], &t_name);
10721072
MCNameCreate(*t_name, t_context->name);
10731073
}
10741074
else if (MCCStringEqualCaseless(p_header->param_name[i], "filename"))
1075-
MCStringCreateWithCStringAndRelease((char_t*)p_header->param_value[i], t_context->file_name);
1075+
MCStringCreateWithCStringAndRelease(p_header->param_value[i], t_context->file_name);
10761076
}
10771077
}
10781078
else if (MCCStringEqualCaseless(p_header->name, "Content-Type"))
10791079
{
1080-
MCStringCreateWithCStringAndRelease((char_t*)p_header->value, t_context->type);
1080+
MCStringCreateWithCStringAndRelease(p_header->value, t_context->type);
10811081

10821082
for (uint32_t i = 0; i < p_header->param_count; i++)
10831083
{
10841084
if (MCCStringEqualCaseless(p_header->param_name[i], "boundary"))
1085-
MCStringCreateWithCStringAndRelease((char_t*)p_header->param_value[i], t_context->boundary);
1085+
MCStringCreateWithCStringAndRelease(p_header->param_value[i], t_context->boundary);
10861086
}
10871087
}
10881088
}

‎libfoundation/src/foundation-string.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ bool MCStringCreateWithNativeCharsAndRelease(char_t *p_chars, uindex_t p_char_co
442442
p_chars[p_char_count] = '\0';
443443
self -> native_chars = p_chars;
444444
self -> char_count = p_char_count;
445+
r_string = self;
445446
}
446447
else
447448
MCMemoryDelete(self);

0 commit comments

Comments
 (0)