Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit 9f1fe6a9 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Adding Windows friendly name export.

parent 3911242c
...@@ -246,3 +246,9 @@ throw ...@@ -246,3 +246,9 @@ throw
#ifdef WIN32 #ifdef WIN32
#define M_PI 3.14159265 #define M_PI 3.14159265
#endif #endif
#ifdef WIN32
#define ALTA_DLL_EXPORT extern "C" __declspec(dllexport)
#else
#define ALTA_DLL_EXPORT extern "C"
#endif
\ No newline at end of file
...@@ -174,7 +174,7 @@ function* plugins_manager::get_function(const std::string& n) ...@@ -174,7 +174,7 @@ function* plugins_manager::get_function(const std::string& n)
return NULL; return NULL;
} }
FunctionPrototype myFunction = (FunctionPrototype) function_lib.resolve("_Z16provide_functionv"); FunctionPrototype myFunction = (FunctionPrototype) function_lib.resolve("provide_function");
if(myFunction != NULL) if(myFunction != NULL)
{ {
...@@ -229,7 +229,7 @@ data* plugins_manager::get_data(const std::string& n) ...@@ -229,7 +229,7 @@ data* plugins_manager::get_data(const std::string& n)
return NULL; return NULL;
} }
DataPrototype myData = (DataPrototype) data_lib.resolve("_Z12provide_datav"); DataPrototype myData = (DataPrototype) data_lib.resolve("provide_data");
if(myData != NULL) if(myData != NULL)
{ {
...@@ -284,7 +284,7 @@ fitter* plugins_manager::get_fitter(const std::string& n) ...@@ -284,7 +284,7 @@ fitter* plugins_manager::get_fitter(const std::string& n)
return NULL; return NULL;
} }
FitterPrototype myFitter = (FitterPrototype) fitting_lib.resolve("_Z14provide_fitterv"); FitterPrototype myFitter = (FitterPrototype) fitting_lib.resolve("provide_fitter");
if(myFitter != NULL) if(myFitter != NULL)
{ {
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
function* provide_function() #include <core/common.h>
ALTA_DLL_EXPORT function* provide_function()
{ {
return new lafortune_function(); return new lafortune_function();
} }
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
function* provide_function() #include <core/common.h>
ALTA_DLL_EXPORT function* provide_function()
{ {
return new phong_function(); return new phong_function();
} }
......
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
#include <QTime> #include <QTime>
fitter* provide_fitter() #include <core/common.h>
ALTA_DLL_EXPORT fitter* provide_fitter()
{ {
return new nonlinear_fitter_eigen(); return new nonlinear_fitter_eigen();
} }
......
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
#include <QTime> #include <QTime>
fitter* provide_fitter() #include <core/common.h>
ALTA_DLL_EXPORT fitter* provide_fitter()
{ {
return new rational_fitter_eigen(); return new rational_fitter_eigen();
} }
......
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
#include <QTime> #include <QTime>
fitter* provide_fitter() #include <core/common.h>
ALTA_DLL_EXPORT fitter* provide_fitter()
{ {
return new rational_fitter_leastsquare(); return new rational_fitter_leastsquare();
} }
......
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
#define isnan(X) ((X != X)) #define isnan(X) ((X != X))
#endif #endif
fitter* provide_fitter() #include <core/common.h>
ALTA_DLL_EXPORT fitter* provide_fitter()
{ {
return new rational_fitter_quadprog(); return new rational_fitter_quadprog();
} }
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
function* provide_function() #include <core/common.h>
ALTA_DLL_EXPORT function* provide_function()
{ {
return new rational_function_chebychev(); return new rational_function_chebychev();
} }
......
CONFIG += qt CONFIG += qt \
console
DESTDIR = ../../build DESTDIR = ../../build
INCLUDEPATH += ../../ ../../libs/rational_1d \ INCLUDEPATH += ../../ ../../libs/rational_1d \
......
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