Export block functions

Author: adazem009

include/scratchcpp/compiler.h

@@ -9,6 +9,8 @@
 #include "enum_bitmask.h"
 #include "spimpl.h"
 
+#define BLOCK_EXPORT extern "C" LIBSCRATCHCPP_EXPORT
+
 namespace libscratchcpp
 {
 

src/blocks/controlblocks.cpp

@@ -186,43 +186,43 @@ CompilerValue *ControlBlocks::compileDeleteThisClone(Compiler *compiler)
     return nullptr;
 }
 
-extern "C" void control_stop_all(ExecutionContext *ctx)
+BLOCK_EXPORT void control_stop_all(ExecutionContext *ctx)
 {
     ctx->engine()->stop();
 }
 
-extern "C" void control_stop_other_scripts_in_target(ExecutionContext *ctx)
+BLOCK_EXPORT void control_stop_other_scripts_in_target(ExecutionContext *ctx)
 {
     Thread *thread = ctx->thread();
     ctx->engine()->stopTarget(thread->target(), thread);
 }
 
-extern "C" void control_start_wait(ExecutionContext *ctx, double seconds)
+BLOCK_EXPORT void control_start_wait(ExecutionContext *ctx, double seconds)
 {
     ctx->stackTimer()->start(seconds);
     ctx->engine()->requestRedraw();
 }
 
-extern "C" bool control_stack_timer_elapsed(ExecutionContext *ctx)
+BLOCK_EXPORT bool control_stack_timer_elapsed(ExecutionContext *ctx)
 {
     return ctx->stackTimer()->elapsed();
 }
 
-extern "C" void control_create_clone_of_myself(Target *target)
+BLOCK_EXPORT void control_create_clone_of_myself(Target *target)
 {
     if (!target->isStage())
         static_cast<Sprite *>(target)->clone();
 }
 
-extern "C" void control_create_clone_by_index(ExecutionContext *ctx, double index)
+BLOCK_EXPORT void control_create_clone_by_index(ExecutionContext *ctx, double index)
 {
     Target *target = ctx->engine()->targetAt(index);
 
     if (!target->isStage())
         static_cast<Sprite *>(target)->clone();
 }
 
-extern "C" void control_create_clone(ExecutionContext *ctx, const StringPtr *spriteName)
+BLOCK_EXPORT void control_create_clone(ExecutionContext *ctx, const StringPtr *spriteName)
 {
     static const StringPtr myself("_myself_");
 
@@ -239,7 +239,7 @@ extern "C" void control_create_clone(ExecutionContext *ctx, const StringPtr *spr
     }
 }
 
-extern "C" bool control_delete_this_clone(Target *target)
+BLOCK_EXPORT bool control_delete_this_clone(Target *target)
 {
     if (!target->isStage()) {
         Sprite *sprite = static_cast<Sprite *>(target);

src/blocks/eventblocks.cpp

@@ -173,7 +173,7 @@ CompilerValue *EventBlocks::compileWhenKeyPressed(Compiler *compiler)
     return nullptr;
 }
 
-extern "C" bool event_whentouchingobject_predicate(Target *target, const StringPtr *name)
+BLOCK_EXPORT bool event_whentouchingobject_predicate(Target *target, const StringPtr *name)
 {
     static const StringPtr MOUSE_STR = StringPtr("_mouse_");
     static const StringPtr EDGE_STR = StringPtr("_edge_");
@@ -196,7 +196,7 @@ extern "C" bool event_whentouchingobject_predicate(Target *target, const StringP
     }
 }
 
-extern "C" bool event_whengreaterthan_loudness_predicate(ExecutionContext *ctx, double value)
+BLOCK_EXPORT bool event_whengreaterthan_loudness_predicate(ExecutionContext *ctx, double value)
 {
     if (!EventBlocks::audioInput)
         EventBlocks::audioInput = AudioInput::instance().get();
@@ -205,12 +205,12 @@ extern "C" bool event_whengreaterthan_loudness_predicate(ExecutionContext *ctx,
     return (audioLoudness->getLoudness() > value);
 }
 
-extern "C" bool event_whengreaterthan_timer_predicate(ExecutionContext *ctx, double value)
+BLOCK_EXPORT bool event_whengreaterthan_timer_predicate(ExecutionContext *ctx, double value)
 {
     return ctx->engine()->timer()->value() > value;
 }
 
-extern "C" void event_broadcast(ExecutionContext *ctx, const StringPtr *name, bool wait)
+BLOCK_EXPORT void event_broadcast(ExecutionContext *ctx, const StringPtr *name, bool wait)
 {
     Thread *thread = ctx->thread();
     IEngine *engine = thread->engine();

src/blocks/listblocks.cpp

@@ -259,7 +259,7 @@ const std::string &ListBlocks::listContentsMonitorName(Block *block)
         return empty;
 }
 
-extern "C" void data_showlist(Target *target, List *list)
+BLOCK_EXPORT void data_showlist(Target *target, List *list)
 {
     Monitor *monitor = list->monitor();
 
@@ -289,7 +289,7 @@ extern "C" void data_showlist(Target *target, List *list)
     monitor->setVisible(true);
 }
 
-extern "C" void data_hidelist(Target *target, List *list)
+BLOCK_EXPORT void data_hidelist(Target *target, List *list)
 {
     Monitor *monitor = list->monitor();
 

src/blocks/looksblocks.cpp

@@ -338,7 +338,7 @@ CompilerValue *LooksBlocks::compileNextBackdrop(Compiler *compiler)
     return nullptr;
 }
 
-extern "C" void looks_start_stack_timer(ExecutionContext *ctx, double duration)
+BLOCK_EXPORT void looks_start_stack_timer(ExecutionContext *ctx, double duration)
 {
     ctx->stackTimer()->start(duration);
 }
@@ -356,7 +356,7 @@ void looks_show_bubble(Thread *thread, TextBubble::Type type, const StringPtr *m
         target->bubble()->setText(u8message);
 }
 
-extern "C" bool looks_update_bubble(ExecutionContext *ctx)
+BLOCK_EXPORT bool looks_update_bubble(ExecutionContext *ctx)
 {
     if (ctx->stackTimer()->elapsed()) {
         Thread *thread = ctx->thread();
@@ -372,57 +372,57 @@ extern "C" bool looks_update_bubble(ExecutionContext *ctx)
     return false;
 }
 
-extern "C" void looks_say(ExecutionContext *ctx, const StringPtr *message, bool saveThread)
+BLOCK_EXPORT void looks_say(ExecutionContext *ctx, const StringPtr *message, bool saveThread)
 {
     looks_show_bubble(ctx->thread(), TextBubble::Type::Say, message, saveThread);
 }
 
-extern "C" void looks_think(ExecutionContext *ctx, const StringPtr *message, bool saveThread)
+BLOCK_EXPORT void looks_think(ExecutionContext *ctx, const StringPtr *message, bool saveThread)
 {
     looks_show_bubble(ctx->thread(), TextBubble::Type::Think, message, saveThread);
 }
 
-extern "C" void looks_show(Sprite *sprite)
+BLOCK_EXPORT void looks_show(Sprite *sprite)
 {
     sprite->setVisible(true);
 }
 
-extern "C" void looks_hide(Sprite *sprite)
+BLOCK_EXPORT void looks_hide(Sprite *sprite)
 {
     sprite->setVisible(false);
 }
 
-extern "C" void looks_changeeffectby(Target *target, IGraphicsEffect *effect, double change)
+BLOCK_EXPORT void looks_changeeffectby(Target *target, IGraphicsEffect *effect, double change)
 {
     target->setGraphicsEffectValue(effect, target->graphicsEffectValue(effect) + change);
 }
 
-extern "C" void looks_seteffectto(Target *target, IGraphicsEffect *effect, double value)
+BLOCK_EXPORT void looks_seteffectto(Target *target, IGraphicsEffect *effect, double value)
 {
     target->setGraphicsEffectValue(effect, value);
 }
 
-extern "C" void looks_cleargraphiceffects(Target *target)
+BLOCK_EXPORT void looks_cleargraphiceffects(Target *target)
 {
     target->clearGraphicsEffects();
 }
 
-extern "C" void looks_changesizeby(Sprite *sprite, double change)
+BLOCK_EXPORT void looks_changesizeby(Sprite *sprite, double change)
 {
     sprite->setSize(sprite->size() + change);
 }
 
-extern "C" void looks_setsizeto(Sprite *sprite, double size)
+BLOCK_EXPORT void looks_setsizeto(Sprite *sprite, double size)
 {
     sprite->setSize(size);
 }
 
-extern "C" double looks_size(Sprite *sprite)
+BLOCK_EXPORT double looks_size(Sprite *sprite)
 {
     return sprite->size();
 }
 
-extern "C" void looks_set_costume_by_index(Target *target, long index)
+BLOCK_EXPORT void looks_set_costume_by_index(Target *target, long index)
 {
     const int costumeCount = target->costumes().size();
 
@@ -434,12 +434,12 @@ extern "C" void looks_set_costume_by_index(Target *target, long index)
     target->setCostumeIndex(index);
 }
 
-extern "C" void looks_nextcostume(Target *target)
+BLOCK_EXPORT void looks_nextcostume(Target *target)
 {
     looks_set_costume_by_index(target, target->costumeIndex() + 1);
 }
 
-extern "C" void looks_previouscostume(Target *target)
+BLOCK_EXPORT void looks_previouscostume(Target *target)
 {
     looks_set_costume_by_index(target, target->costumeIndex() - 1);
 }
@@ -452,7 +452,7 @@ void looks_randomcostume(Target *target, IRandomGenerator *rng)
         looks_set_costume_by_index(target, rng->randintExcept(0, count - 1, target->costumeIndex())); // exclude current costume
 }
 
-extern "C" void looks_switchcostumeto(Target *target, const ValueData *costume)
+BLOCK_EXPORT void looks_switchcostumeto(Target *target, const ValueData *costume)
 {
     // https://github.com/scratchfoundation/scratch-vm/blob/8dbcc1fc8f8d8c4f1e40629fe8a388149d6dfd1c/src/blocks/scratch3_looks.js#L389-L413
     if (!value_isString(costume)) {
@@ -485,7 +485,7 @@ extern "C" void looks_switchcostumeto(Target *target, const ValueData *costume)
     }
 }
 
-extern "C" void looks_start_backdrop_scripts(ExecutionContext *ctx, bool wait)
+BLOCK_EXPORT void looks_start_backdrop_scripts(ExecutionContext *ctx, bool wait)
 {
     IEngine *engine = ctx->engine();
     Stage *stage = engine->stage();
@@ -495,7 +495,7 @@ extern "C" void looks_start_backdrop_scripts(ExecutionContext *ctx, bool wait)
         engine->startBackdropScripts(backdrop->broadcast(), ctx->thread(), wait);
 }
 
-extern "C" void looks_switchbackdropto(ExecutionContext *ctx, const ValueData *backdrop)
+BLOCK_EXPORT void looks_switchbackdropto(ExecutionContext *ctx, const ValueData *backdrop)
 {
     Stage *stage = ctx->engine()->stage();
 
@@ -532,53 +532,53 @@ extern "C" void looks_switchbackdropto(ExecutionContext *ctx, const ValueData *b
     }
 }
 
-extern "C" void looks_move_to_front(ExecutionContext *ctx)
+BLOCK_EXPORT void looks_move_to_front(ExecutionContext *ctx)
 {
     Target *target = ctx->thread()->target();
     ctx->engine()->moveDrawableToFront(target);
 }
 
-extern "C" void looks_move_to_back(ExecutionContext *ctx)
+BLOCK_EXPORT void looks_move_to_back(ExecutionContext *ctx)
 {
     Target *target = ctx->thread()->target();
     ctx->engine()->moveDrawableToBack(target);
 }
 
-extern "C" void looks_move_forward_layers(ExecutionContext *ctx, double layers)
+BLOCK_EXPORT void looks_move_forward_layers(ExecutionContext *ctx, double layers)
 {
     Target *target = ctx->thread()->target();
     ctx->engine()->moveDrawableForwardLayers(target, layers);
 }
 
-extern "C" void looks_move_backward_layers(ExecutionContext *ctx, double layers)
+BLOCK_EXPORT void looks_move_backward_layers(ExecutionContext *ctx, double layers)
 {
     Target *target = ctx->thread()->target();
     ctx->engine()->moveDrawableBackwardLayers(target, layers);
 }
 
-extern "C" double looks_backdrop_number(ExecutionContext *ctx)
+BLOCK_EXPORT double looks_backdrop_number(ExecutionContext *ctx)
 {
     return ctx->engine()->stage()->costumeIndex() + 1;
 }
 
-extern "C" void looks_backdrop_name(StringPtr *ret, ExecutionContext *ctx)
+BLOCK_EXPORT void looks_backdrop_name(StringPtr *ret, ExecutionContext *ctx)
 {
     const std::string &name = ctx->engine()->stage()->currentCostume()->name();
     string_assign_cstring(ret, name.c_str());
 }
 
-extern "C" double looks_costume_number(Target *target)
+BLOCK_EXPORT double looks_costume_number(Target *target)
 {
     return target->costumeIndex() + 1;
 }
 
-extern "C" void looks_costume_name(StringPtr *ret, Target *target)
+BLOCK_EXPORT void looks_costume_name(StringPtr *ret, Target *target)
 {
     const std::string &name = target->currentCostume()->name();
     string_assign_cstring(ret, name.c_str());
 }
 
-extern "C" bool looks_backdrop_promise(ExecutionContext *ctx)
+BLOCK_EXPORT bool looks_backdrop_promise(ExecutionContext *ctx)
 {
     if (ctx->engine()->stage()->costumes().size() > 0) {
         ctx->setPromise(std::make_shared<Promise>());
@@ -588,7 +588,7 @@ extern "C" bool looks_backdrop_promise(ExecutionContext *ctx)
     return false;
 }
 
-extern "C" void looks_nextbackdrop(ExecutionContext *ctx)
+BLOCK_EXPORT void looks_nextbackdrop(ExecutionContext *ctx)
 {
     looks_nextcostume(ctx->engine()->stage());
 }