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

Commit 1fb15cc

Browse files
livecodefraserlivecodefraser
committed
Merge branch 'build-tame_lc_compile_bootstrap' of https://github.com/runrevmark/livecode into develop-gyp
Conflicts: engine/engine.xcodeproj/project.pbxproj engine/src/widget.cpp libscript/libscript.xcodeproj/project.pbxproj libscript/src/module-type.cpp toolchain/Makefile toolchain/lc-compile/src/support.g
2 parents 8a07008 + adde6ac commit 1fb15cc

45 files changed

Lines changed: 725 additions & 199 deletions

Some content is hidden

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

‎engine/src/dsklnxmain.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int main(int argc, char *argv[], char *envp[])
5656
setlocale(LC_ALL, "");
5757
MCsysencoding = strclone(nl_langinfo(CODESET));
5858

59-
extern bool MCModulesInitialize();
59+
extern "C" bool MCModulesInitialize();
6060
if (!MCInitialize() || !MCSInitialize() ||
6161
!MCModulesInitialize() || !MCScriptInitialize())
6262
exit(-1);
@@ -115,7 +115,7 @@ int main(int argc, char *argv[], char *envp[])
115115

116116
int t_exit_code = X_close();
117117

118-
extern void MCModulesFinalize();
118+
extern "C" void MCModulesFinalize();
119119
MCScriptFinalize();
120120
MCModulesFinalize();
121121
MCFinalize();

‎engine/src/dskw32main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
205205
++csptr;
206206
}
207207

208-
extern bool MCModulesInitialize();
208+
extern "C" bool MCModulesInitialize();
209209
if (!MCInitialize() || !MCSInitialize() ||
210210
!MCModulesInitialize() || !MCScriptInitialize())
211211
exit(-1);
@@ -314,7 +314,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
314314
g_mainthread_errno = _errno();
315315
int r = X_close();
316316

317-
extern void MCModulesFinalize();
317+
extern "C" void MCModulesFinalize();
318318
MCScriptFinalize();
319319
MCModulesFinalize();
320320
MCFinalize();

‎engine/src/mac-core.mm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1969,6 +1969,9 @@ static void display_reconfiguration_callback(CGDirectDisplayID display, CGDispla
19691969

19701970
////////////////////////////////////////////////////////////////////////////////
19711971

1972+
extern "C" bool MCModulesInitialize(void);
1973+
extern "C" void MCModulesFinalize(void);
1974+
19721975
int main(int argc, char *argv[], char *envp[])
19731976
{
19741977
extern bool MCS_mac_elevation_bootstrap_main(int argc, char* argv[]);
@@ -1988,7 +1991,6 @@ int main(int argc, char *argv[], char *envp[])
19881991
// Register for reconfigurations.
19891992
CGDisplayRegisterReconfigurationCallback(display_reconfiguration_callback, nil);
19901993

1991-
extern bool MCModulesInitialize();
19921994
if (!MCInitialize() || !MCSInitialize() ||
19931995
!MCModulesInitialize() || !MCScriptInitialize())
19941996
exit(-1);
@@ -2041,7 +2043,6 @@ int main(int argc, char *argv[], char *envp[])
20412043
// Drain the autorelease pool.
20422044
[t_pool release];
20432045

2044-
extern void MCModulesFinalize(void);
20452046
MCScriptFinalize();
20462047
MCModulesFinalize();
20472048
MCFinalize();

‎engine/src/mblandroiddc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
5454

5555
#include "script.h"
5656

57-
extern bool MCModulesInitialize();
57+
extern "C" bool MCModulesInitialize();
5858

5959
////////////////////////////////////////////////////////////////////////////////
6060

‎engine/src/mbliphoneapp.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,7 @@ Exec_stat MCIPhoneHandleMessage(MCNameRef p_message, MCParameter *p_parameters)
20262026
return s;
20272027
}
20282028

2029-
extern bool MCModulesInitialize();
2029+
extern "C" bool MCModulesInitialize();
20302030

20312031
MC_DLLEXPORT int main(int argc, char *argv[], char *envp[])
20322032
{

‎engine/src/module-canvas.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ static MCNameRef s_cap_style_map[kMCGCapStyleCount];
514514
bool MCCanvasStringsInitialize();
515515
void MCCanvasStringsFinalize();
516516

517-
bool MCCanvasModuleInitialize()
517+
extern "C" bool com_livecode_canvas_Initialize()
518518
{
519519
if (!MCCanvasErrorsInitialize())
520520
return false;
@@ -527,7 +527,7 @@ bool MCCanvasModuleInitialize()
527527
return true;
528528
}
529529

530-
void MCCanvasModuleFinalize()
530+
extern "C" void com_livecode_canvas_Finalize()
531531
{
532532
MCCanvasConstantsFinalize();
533533
MCCanvasTypesFinalize();

‎engine/src/module-engine.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ MCTypeInfoRef kMCEngineScriptObjectNoContextErrorTypeInfo = nil;
729729

730730
////////////////////////////////////////////////////////////////////////////////
731731

732-
bool MCEngineModuleInitialize(void)
732+
extern "C" bool com_livecode_engine_Initialize(void)
733733
{
734734
if (!MCNamedErrorTypeInfoCreate(MCNAME("com.livecode.engine.ScriptObjectDoesNotExistError"), MCNAME("engine"), MCSTR("object does not exist"), kMCEngineScriptObjectDoesNotExistErrorTypeInfo))
735735
return false;
@@ -748,7 +748,7 @@ bool MCEngineModuleInitialize(void)
748748
return true;
749749
}
750750

751-
void MCEngineModuleFinalize(void)
751+
extern "C" void com_livecode_engine_Finalize(void)
752752
{
753753
MCValueRelease(s_log_buffer);
754754
MCValueRelease(kMCEngineScriptObjectTypeInfo);

‎engine/src/srvmain.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,8 @@ void X_main_loop(void)
608608

609609
////////////////////////////////////////////////////////////////////////////////
610610

611-
extern bool MCModulesInitialize();
612-
extern void MCModulesFinalize();
611+
extern "C" bool MCModulesInitialize();
612+
extern "C" void MCModulesFinalize();
613613

614614
int main(int argc, char *argv[], char *envp[])
615615
{

‎engine/src/widget.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,4 +2412,14 @@ void MCWidgetModuleFinalize(void)
24122412
kMCWidgetSizeFormatErrorTypeInfo = nil;
24132413
}
24142414

2415+
extern "C" bool com_livecode_widget_Initialize(void)
2416+
{
2417+
return true;
2418+
}
2419+
2420+
extern "C" void com_livecode_widget_Finalize(void)
2421+
{
2422+
;
2423+
}
2424+
24152425
////////////////////////////////////////////////////////////////////////////////

‎libscript/src/module-arithmetic.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,3 +510,16 @@ extern "C" MC_DLLEXPORT void MCArithmeticEvalListOfStringParsedAsListOfNumber(MC
510510
{
511511
r_output = MCArithmeticExecParseListOfStringAsListOfNumber(p_list_of_string);
512512
}
513+
514+
////////////////////////////////////////////////////////////////////////////////////////////////////
515+
516+
extern "C" bool com_livecode_arithmetic_Initialize(void)
517+
{
518+
return true;
519+
}
520+
521+
extern "C" void com_livecode_arithmetic_Finalize(void)
522+
{
523+
}
524+
525+
////////////////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)