ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Settings] #define EXPORT to abolish some MSVC-isms.

This commit is contained in:
2016-02-06 17:23:27 -05:00
parent 1c7a42274f
commit 3038a8f288
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Settings/Settings.cpp
View File

@ -55,24 +55,24 @@ static bool g_PluginInitilized = false;
static char g_PluginSettingName[300]; static char g_PluginSettingName[300];
extern "C" { extern "C" {
__declspec(dllexport) void SetSettingInfo (PLUGIN_SETTINGS * info); EXPORT void SetSettingInfo (PLUGIN_SETTINGS * info);
__declspec(dllexport) void SetSettingInfo2 (PLUGIN_SETTINGS2 * info); EXPORT void SetSettingInfo2 (PLUGIN_SETTINGS2 * info);
__declspec(dllexport) void SetSettingInfo3 (PLUGIN_SETTINGS3 * info); EXPORT void SetSettingInfo3 (PLUGIN_SETTINGS3 * info);
} }
__declspec(dllexport) void SetSettingInfo (PLUGIN_SETTINGS * info) EXPORT void SetSettingInfo (PLUGIN_SETTINGS * info)
{ {
g_PluginSettings = *info; g_PluginSettings = *info;
g_PluginInitilized = true; g_PluginInitilized = true;
info->UseUnregisteredSetting = UseUnregisteredSetting; info->UseUnregisteredSetting = UseUnregisteredSetting;
} }
__declspec(dllexport) void SetSettingInfo2 (PLUGIN_SETTINGS2 * info) EXPORT void SetSettingInfo2 (PLUGIN_SETTINGS2 * info)
{ {
g_PluginSettings2 = *info; g_PluginSettings2 = *info;
} }
__declspec(dllexport) void SetSettingInfo3 (PLUGIN_SETTINGS3 * info) EXPORT void SetSettingInfo3 (PLUGIN_SETTINGS3 * info)
{ {
g_PluginSettings3 = *info; g_PluginSettings3 = *info;
} }

6
Source/Settings/Settings.h
View File

@ -4,6 +4,12 @@
extern "C" { extern "C" {
#endif #endif
#if defined(_WIN32)
#define EXPORT __declspec(dllexport)
#else
#define EXPORT __attribute__((visibility("default")))
#endif
// Get Plugin Settings, take a setting id // Get Plugin Settings, take a setting id
unsigned int GetSetting ( short SettingID ); unsigned int GetSetting ( short SettingID );
const char * GetSettingSz ( short SettingID, char * Buffer, int BufferLen ); const char * GetSettingSz ( short SettingID, char * Buffer, int BufferLen );