DLM support, without proprietary file (idl_export.h) (#2053)

Co-authored-by: Giloo <gildas@localhost>

Author: GillesDuvert

src/CMakeLists.txt

@@ -231,6 +231,8 @@ if(PYTHON_MODULE) #GDL.so
 	SET_TARGET_PROPERTIES(gdl PROPERTIES NO_SONAME TRUE)
         SET_TARGET_PROPERTIES(gdl PROPERTIES SUFFIX ".so") # e.g. Mac defaults to .dylib which is not looked for by Python
 else(PYTHON_MODULE) #GDL.so
+#permit gdl (exe) to export its symbols, necessary for linkimage and DLM
+    set (CMAKE_SHARED_LIBRARY_ENABLE_EXPORTS true)
 	set(SOURCES ${SOURCES} gdl.cpp)
 	add_executable(gdl ${SOURCES})
 endif(PYTHON_MODULE)
@@ -277,17 +279,17 @@ else(PYTHON_MODULE)
 	set_target_properties(gdl PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif(PYTHON_MODULE)
 
-#permit gdl.exe to export its symbols, necessary for linkimage and DLM
-if (NOT APPLE AND NOT OSX AND NOT MINGW)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
-endif()
-if (APPLE OR OSX )
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fvisibility=protected") #-exported_symbols_list ${EXPORTED_SYMBOLS_LIST}")
-endif()
-if (MINGW )
-#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")
-endif()
-
+### replaced by use of CMAKE_SHARED_LIBRARY_ENABLE_EXPORTS above
+### if (NOT APPLE AND NOT OSX AND NOT MINGW)
+###     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
+### endif()
+### if (APPLE OR OSX )
+###     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fvisibility=protected") #-exported_symbols_list ${EXPORTED_SYMBOLS_LIST}")
+### endif()
+### if (MINGW )
+###   #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")
+### endif()
+### 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pro/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/lib
 	PATTERN CVS EXCLUDE
 	PATTERN checks EXCLUDE

src/basic_pro_jmg.cpp

@@ -45,9 +45,9 @@ static SizeT increment=33; //why not?
 
   BaseGDL* CallDllFunc(EnvT* e) {
     void* address = static_cast<DLibPro*> (e->GetPro())->GetDllEntry();
-    IDL_SYSRTN_FUN calldllfunc = (IDL_SYSRTN_FUN) address;
+    EXPORT_SYSRTN_FUN calldllfunc = (EXPORT_SYSRTN_FUN) address;
     int argc = e->NParam();
-    IDL_VPTR argv[argc];
+    EXPORT_VPTR argv[argc];
     for (auto i = 0; i < argc; ++i) {
       // tells if input parameter is temporary (expression)
       bool tempo = (e->GetString(i).find('>') != std::string::npos);
@@ -74,42 +74,42 @@ static SizeT increment=33; //why not?
             //pass the variable anyway using GetRefExtraList
             BaseGDL* gvar = e->GetRefExtraList((*refextra)[i]);
             kws[i].varptr = gvar;
-            if (gvar == NULL) kws[i].type = IDL_TYP_UNDEF;
+            if (gvar == NULL) kws[i].type = GDL_TYP_UNDEF;
           } else {
             kws[i].readonly = 0;
             kws[i].varptr = *gvarp;
-            if (*gvarp == NULL) kws[i].type = IDL_TYP_UNDEF;
+            if (*gvarp == NULL) kws[i].type = GDL_TYP_UNDEF;
           }
         }
       }
       passed.npassed = nkw;
       passed.passed = kws;
       argk = (char*) (&passed);
     }
-    IDL_VPTR ret = calldllfunc(argc, argv, argk);
+    EXPORT_VPTR ret = calldllfunc(argc, argv, argk);
     //check if some argk keywords have been returned too. A real variable must be associated to be replaced in return
     for (auto i = 0; i < nkw; ++i) {
       if (kws[i].out != NULL) {
         BaseGDL** gvarp = e->GetRefExtraListPtr((*refextra)[i]); //Ptr as the variable may not exist
         if (gvarp) { //replace parameter's value
           GDLDelete(*gvarp);
-          *gvarp = (BaseGDL*) VPTR_ToGDL((IDL_VPTR) (kws[i].out));
+          *gvarp = (BaseGDL*) VPTR_ToGDL((EXPORT_VPTR) (kws[i].out));
         } else {
           e->Throw("Unexpected error, variable not existing. Please report.");
         }
       }
     }
-    if (ret->type == IDL_TYP_UNDEF) e->Throw("Variable is undefined: <UNDEFINED>."); 
+    if (ret->type == GDL_TYP_UNDEF) e->Throw("Variable is undefined: <UNDEFINED>."); 
     BaseGDL* back=VPTR_ToGDL(ret, true); //protect data
     GDL_FreeResources() ;
     return back;
   }
 
   void CallDllPro(EnvT* e) {
     void* address = static_cast<DLibPro*> (e->GetPro())->GetDllEntry();
-    IDL_SYSRTN_PRO calldllpro = (IDL_SYSRTN_PRO) address;
+    EXPORT_SYSRTN_PRO calldllpro = (EXPORT_SYSRTN_PRO) address;
     int argc = e->NParam();
-    IDL_VPTR argv[argc];
+    EXPORT_VPTR argv[argc];
     for (auto i = 0; i < argc; ++i) {
       // tells if input parameter is temporary (expression)
       bool tempo = (e->GetString(i).find('>') != std::string::npos);
@@ -136,11 +136,11 @@ static SizeT increment=33; //why not?
             //pass the variable anyway using GetRefExtraList
             BaseGDL* gvar = e->GetRefExtraList((*refextra)[i]);
             kws[i].varptr = gvar;
-            if (gvar == NULL) kws[i].type = IDL_TYP_UNDEF;
+            if (gvar == NULL) kws[i].type = GDL_TYP_UNDEF;
           } else {
             kws[i].readonly = 0;
             kws[i].varptr = *gvarp;
-            if (*gvarp == NULL) kws[i].type = IDL_TYP_UNDEF;
+            if (*gvarp == NULL) kws[i].type = GDL_TYP_UNDEF;
           }
         }
       }
@@ -155,7 +155,7 @@ static SizeT increment=33; //why not?
         BaseGDL** gvarp = e->GetRefExtraListPtr((*refextra)[i]); //Ptr as the variable may not exist
         if (gvarp) {
           GDLDelete(*gvarp);
-          *gvarp = (BaseGDL*) VPTR_ToGDL((IDL_VPTR) (kws[i].out));
+          *gvarp = (BaseGDL*) VPTR_ToGDL((EXPORT_VPTR) (kws[i].out));
         } else {
           e->Throw("Unexpected error, variable not existing. Please report.");
         }
@@ -604,8 +604,8 @@ void CleanupProc( DLibPro* proc ) {
     static bool IdlStaticsUninitialized=true;
     if (IdlStaticsUninitialized) {
       IdlStaticsUninitialized=false;
-      //set up values for some IDL_XXX info structures
-      //IDL_SysvVersion:
+      //set up values for some EXPORT_XXX info structures
+      //EXPORT_SysvVersion:
       DStructGDL* version = SysVar::Version();
       static unsigned releaseTag = version->Desc()->TagIndex( "RELEASE");
       static unsigned osTag = version->Desc()->TagIndex("OS");