Commit 1d777b19 authored by Alexander A. Maly's avatar Alexander A. Maly

Added dllspec to VM

parent f1028e1c
Pipeline #1956 failed with stages
in 2 minutes and 21 seconds
#ifndef KSTDLIB_DLL_H
#define KSTDLIB_DLL_H
#if !defined(DLL_IMP) && !defined(DLL_EXP)
#if defined(_MSC_VER)
#define DLL_IMP __declspec(dllimport)
#define DLL_EXP __declspec(dllexport)
......@@ -8,6 +9,7 @@
#define DLL_IMP
#define DLL_EXP
#endif
#endif
#ifdef KSTDLIB_LIBRARY
#define KS_DLL DLL_EXP
......
......@@ -340,12 +340,14 @@ public:
AbortHandler();
}
}
protected:
inline static void unsetError()
{
error.clear();
}
static String error;
static KS_DLL String error;
};
class Math
......
#ifndef VM_HPP
#define VM_HPP
#include "vm_dll.h"
#include <memory>
#include <kumir2-libs/stdlib/kumirstdlib.hpp>
......@@ -16,7 +18,7 @@ namespace VM
typedef std::shared_ptr<CriticalSectionLocker> ShPtrCSL;
class KumirVM
class VM_DLL KumirVM
{
public /*typedefs*/:
enum EntryPoint { EP_Main, EP_Testing };
......
#ifndef VM_DLL_H
#define VM_DLL_H
#if !defined(DLL_IMP) && !defined(DLL_EXP)
#if defined(_MSC_VER)
#define DLL_IMP __declspec(dllimport)
#define DLL_EXP __declspec(dllexport)
#else
#define DLL_IMP
#define DLL_EXP
#endif
#endif
#ifdef VM_LIBRARY
#define VM_DLL DLL_EXP
#else
#define VM_DLL DLL_IMP
#endif
#endif // VM_DLL_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment