xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🔥 move NASAL_EXPORT to nasal.h

This commit is contained in:
ValKmjolnir 2024-12-11 20:52:58 +08:00
parent 1b745ad176
commit dea19fe3c3
7 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/fib.cpp
View File

@ -124,7 +124,7 @@ module_func_info func_tbl[] = {
} }
NASAL_EXTERN module_func_info* get() { NASAL_EXPORT module_func_info* get() {
return fib_module::func_tbl; return fib_module::func_tbl;
} }

2
module/keyboard.cpp
View File

@ -111,7 +111,7 @@ module_func_info func_tbl[] = {
{nullptr, nullptr} {nullptr, nullptr}
}; };
NASAL_EXTERN module_func_info* get() { NASAL_EXPORT module_func_info* get() {
return func_tbl; return func_tbl;
} }

2
module/matrix.cpp
View File

@ -295,7 +295,7 @@ module_func_info func_tbl[] = {
{nullptr, nullptr} {nullptr, nullptr}
}; };
NASAL_EXTERN module_func_info* get() { NASAL_EXPORT module_func_info* get() {
return func_tbl; return func_tbl;
} }

2
module/nasocket.cpp
View File

@ -262,7 +262,7 @@ module_func_info func_tbl[] = {
{nullptr, nullptr} {nullptr, nullptr}
}; };
NASAL_EXTERN module_func_info* get() { NASAL_EXPORT module_func_info* get() {
return func_tbl; return func_tbl;
} }

10
src/nasal.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifndef __nasver__ #ifndef __nasver__
#define __nasver__ "11.3" #define __nasver__ "11.3.1"
#endif #endif
#include <cstddef> #include <cstddef>
@ -19,3 +19,11 @@ using f64 = double;
// virtual machine stack depth, both global depth and value stack depth // virtual machine stack depth, both global depth and value stack depth
const u32 VM_STACK_DEPTH = UINT16_MAX; const u32 VM_STACK_DEPTH = UINT16_MAX;
// avoid error loading function bug in MSVC version nasal.exe
#ifdef _MSC_VER
// and fuck MSVC again
#define NASAL_EXPORT extern "C" __declspec(dllexport)
#else
#define NASAL_EXPORT extern "C" __attribute__((visibility("default")))
#endif

9
src/nasal_gc.h
View File

@ -126,13 +126,4 @@ struct module_func_info {
// module function "get" type // module function "get" type
typedef module_func_info* (*get_func_ptr)(); typedef module_func_info* (*get_func_ptr)();
// avoid error loading function bug in MSVC version nasal.exe
#ifdef _MSC_VER
// and fuck MSVC again
#define NASAL_EXTERN extern "C" __declspec(dllexport)
#else
#define NASAL_EXTERN extern "C"
#endif
} }

6
src/nasal_web.h
View File

@ -3,12 +3,6 @@
#include "nasal.h" #include "nasal.h"
#ifdef _WIN32
#define NASAL_EXPORT __declspec(dllexport)
#else
#define NASAL_EXPORT __attribute__((visibility("default")))
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif