help windows DAS_RT_API

Author: aleksisch

CMakeLists.txt

@@ -916,7 +916,7 @@ MACRO(SETUP_LIBDASCRIPT library shared_lib)
             ${RUNTIME_SRCS}
             src/stubs/simulate_stub.cpp
         )
-        TARGET_COMPILE_DEFINITIONS(${library}_runtime PRIVATE DAS_EXPORTS=1 DAS_MOD_EXPORTS=1)
+        TARGET_COMPILE_DEFINITIONS(${library}_runtime PRIVATE DAS_RT_EXPORTS=1 DAS_MOD_EXPORTS=1)
         TARGET_COMPILE_DEFINITIONS(${library}_runtime PUBLIC DAS_ENABLE_DLL=1)
         target_include_directories(${library}_runtime PRIVATE
                 ${DAS_SMMALLOC_DIR}

include/daScript/ast/ast.h

@@ -81,7 +81,7 @@ namespace das
 
     //      [annotation (value,value,...,value)]
     //  or  [annotation (key=value,key,value,...,key=value)]
-    struct DAS_API AnnotationArgument {
+    struct DAS_RT_API AnnotationArgument {
         Type    type;       // only tInt, tFloat, tBool, and tString are allowed
         string  name;
         string  sValue;
@@ -114,7 +114,7 @@ namespace das
 
     typedef vector<AnnotationArgument> AnnotationArguments;
 
-    struct DAS_API AnnotationArgumentList : AnnotationArguments {
+    struct DAS_RT_API AnnotationArgumentList : AnnotationArguments {
         const AnnotationArgument * find ( const string & name, Type type ) const;
         bool getBoolOption(const string & name, bool def = false) const;
         int32_t getIntOption(const string & name, int32_t def = false) const;
@@ -123,7 +123,7 @@ namespace das
         void serialize ( AstSerializer & ser );
     };
 
-    struct DAS_API Annotation : BasicAnnotation {
+    struct DAS_RT_API Annotation : BasicAnnotation {
         Annotation ( const string & n, const string & cpn = "" ) : BasicAnnotation(n,cpn) {}
         virtual ~Annotation() {}
         virtual void seal( Module * m ) { module = m; }
@@ -140,7 +140,7 @@ namespace das
         Module *    module = nullptr;
     };
 
-    struct DAS_API AnnotationDeclaration : ptr_ref_count {
+    struct DAS_RT_API AnnotationDeclaration : ptr_ref_count {
         AnnotationPtr           annotation;
         AnnotationArgumentList  arguments;
         LineInfo                at;
@@ -158,7 +158,7 @@ namespace das
 
     AnnotationList cloneAnnotationList ( const AnnotationList & list );
 
-    class DAS_API Enumeration : public ptr_ref_count {
+    class DAS_RT_API Enumeration : public ptr_ref_count {
     public:
         struct EnumEntry {
             string          name;
@@ -202,7 +202,7 @@ namespace das
 #endif
     };
 
-    class DAS_API Structure : public ptr_ref_count {
+    class DAS_RT_API Structure : public ptr_ref_count {
     public:
         struct FieldDeclaration {
             string                  name;
@@ -334,7 +334,7 @@ namespace das
 #endif
     };
 
-    struct DAS_API Variable : ptr_ref_count {
+    struct DAS_RT_API Variable : ptr_ref_count {
         VariablePtr clone() const;
         string getMangledName() const;
         uint64_t getMangledNameHash() const;
@@ -435,7 +435,7 @@ namespace das
     struct ExprBlock;
     struct ExprCallFunc;
 
-    struct DAS_API FunctionAnnotation : Annotation {
+    struct DAS_RT_API FunctionAnnotation : Annotation {
         FunctionAnnotation ( const string & n ) : Annotation(n) {}
         virtual bool rtti_isFunctionAnnotation() const override { return true; }
         virtual bool apply ( const FunctionPtr & func, ModuleGroup & libGroup,
@@ -634,7 +634,7 @@ namespace das
         smart_ptr<Structure>   structureType;
     };
 
-    struct DAS_API Expression : ptr_ref_count {
+    struct DAS_RT_API Expression : ptr_ref_count {
         Expression() = default;
         Expression(const LineInfo & a) : at(a) {}
         string describe() const;
@@ -755,7 +755,7 @@ namespace das
 #pragma warning(push)
 #pragma warning(disable:4324)
 #endif
-    struct DAS_API ExprConst : Expression {
+    struct DAS_RT_API ExprConst : Expression {
         ExprConst ( ) : baseType(Type::none) { __rtti = "ExprConst"; }
         ExprConst ( Type t ) : baseType(t) { __rtti = "ExprConst"; }
         ExprConst ( const LineInfo & a, Type t ) : Expression(a), baseType(t) { __rtti = "ExprConst"; }
@@ -830,7 +830,7 @@ namespace das
         InferHistory(const LineInfo & a, const FunctionPtr & p) : at(a), func(p.get()) {}
         void serialize ( AstSerializer & ser );
     };
-    class DAS_API Function : public ptr_ref_count {
+    class DAS_RT_API Function : public ptr_ref_count {
     public:
         enum class DescribeExtra     { no, yes };
         enum class DescribeModule    { no, yes };
@@ -1030,7 +1030,7 @@ namespace das
     string getAotHashComment ( const Function * fun );
     uint64_t getVariableListAotHash ( const vector<const Variable *> & globs, uint64_t initHash );
 
-    class DAS_API BuiltInFunction : public Function {
+    class DAS_RT_API BuiltInFunction : public Function {
     public:
         BuiltInFunction ( const char *fn, const char * fnCpp );
         virtual string getAotBasicName() const override {
@@ -1129,7 +1129,7 @@ namespace das
 
     bool isValidBuiltinName ( const string & name, bool canPunkt = false );
 
-    class DAS_API Module {
+    class DAS_RT_API Module {
     public:
         Module ( const string & n = "" );
         void promoteToBuiltin(const FileAccessPtr & access);
@@ -1338,7 +1338,7 @@ namespace das
         virtual ModuleAotType aotRequire ( TextWriter & ) const { return ModuleAotType::cpp; }
     };
 
-    class DAS_API ModuleLibrary {
+    class DAS_RT_API ModuleLibrary {
         friend class Module;
         friend class Program;
     public:
@@ -1377,14 +1377,14 @@ namespace das
         Module *                        thisModule = nullptr;
     };
 
-    struct DAS_API ModuleGroupUserData {
+    struct DAS_RT_API ModuleGroupUserData {
         ModuleGroupUserData ( const string & n ) : name(n) {}
         virtual ~ModuleGroupUserData() {}
         string name;
     };
     typedef shared_ptr<ModuleGroupUserData> ModuleGroupUserDataPtr;
 
-    class DAS_API ModuleGroup : public ModuleLibrary {
+    class DAS_RT_API ModuleGroup : public ModuleLibrary {
     public:
         virtual ~ModuleGroup();
         ModuleGroupUserData * getUserData ( const string & dataName ) const;
@@ -1463,7 +1463,7 @@ namespace das
         string name;
     };
 
-    class DAS_API DebugInfoHelper : public ptr_ref_count {
+    class DAS_RT_API DebugInfoHelper : public ptr_ref_count {
     public:
         DebugInfoHelper () { debugInfo = make_shared<DebugInfoAllocator>(); }
         DebugInfoHelper ( const shared_ptr<DebugInfoAllocator> & di ) : debugInfo(di) {}
@@ -1860,7 +1860,7 @@ namespace das
         vector<pair<string, string>> paths; // from -> to
     };
 
-    struct DAS_API daScriptEnvironment {
+    struct DAS_RT_API daScriptEnvironment {
         ProgramPtr      g_Program;
         bool            g_isInAot = false;
         Module *        modules = nullptr;
@@ -1892,7 +1892,7 @@ namespace das
         inline static DAS_THREAD_LOCAL(daScriptEnvironment *) owned;
     };
 
-    struct DAS_API daScriptEnvironmentGuard {
+    struct DAS_RT_API daScriptEnvironmentGuard {
         das::daScriptEnvironment *initialBound;
         das::daScriptEnvironment *initialOwned;
 

include/daScript/ast/ast_aot_cpp.h

@@ -67,7 +67,7 @@ namespace das {
      * @param cppOutputDir output directory where context will be created
      * @param standaloneContextName class name
      */
-    DAS_API void runStandaloneVisitor(ProgramPtr program, const string& cppOutputDir, const StandaloneContextCfg &cfg);
+    DAS_RT_API void runStandaloneVisitor(ProgramPtr program, const string& cppOutputDir, const StandaloneContextCfg &cfg);
 }
 
 #endif //DAS_AST_AOT_CPP_H