[Plplot-cvs] SF.net SVN: plplot:[9864] trunk/bindings/f95

[<arj...@us...>]

Revision: 9864
          http://plplot.svn.sourceforge.net/plplot/?rev=9864&view=rev
Author:   arjenmarkus
Date:     2009-04-29 04:46:02 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
Restored settings for .def file, for the bare Windows case. Also restored/repaired CVF-specific settings, as the calling convention needs to be set right.

Modified Paths:
--------------
    trunk/bindings/f95/CMakeLists.txt
    trunk/bindings/f95/plstubs.h

Modified: trunk/bindings/f95/CMakeLists.txt
===================================================================
--- trunk/bindings/f95/CMakeLists.txt	2009-04-29 04:44:51 UTC (rev 9863)
+++ trunk/bindings/f95/CMakeLists.txt	2009-04-29 04:46:02 UTC (rev 9864)
@@ -59,11 +59,8 @@
     # correct case and calling convention for the Fortran compiler
     IF(TARGET_FORTRAN MATCHES "IVF")
       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DIVF")
-      #
-      # (AM) This flag make the C compiler create __cdecl style routines.
-      # This is not the default for Compaq Visual Fortran.
-      #ELSEIF(TARGET_FORTRAN MATCHES "CVF")
-      #  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DCVF")
+    ELSEIF(TARGET_FORTRAN MATCHES "CVF")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DCVF")
     ENDIF(TARGET_FORTRAN MATCHES "IVF")
   endif(WIN32)
 
@@ -116,6 +113,10 @@
     sfstubs.h
     )
 
+  if(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW AND NOT CYGWIN)
+    SET(plplotf95${LIB_TAG}_LIB_SRCS ${plplotf95${LIB_TAG}_LIB_SRCS} plplotf95.def)
+  endif(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW AND NOT CYGWIN)
+
   # Explicitly include dependencies for sfstubsf95.f90
   include(AddFileDependencies)
   add_file_dependencies(sfstubsf95.f90 ${CMAKE_CURRENT_BINARY_DIR}/plflt.inc)

Modified: trunk/bindings/f95/plstubs.h
===================================================================
--- trunk/bindings/f95/plstubs.h	2009-04-29 04:44:51 UTC (rev 9863)
+++ trunk/bindings/f95/plstubs.h	2009-04-29 04:46:02 UTC (rev 9864)
@@ -128,7 +128,7 @@
 #define FNAME_(x,y)	y
 
 #elif STUB_LINKAGE == STUB_U
-#define FNAME(x,y)	x
+#define FNAME(x,y)	PLDLLIMPEXP_F95C __stdcall x
 #define FNAME_(x,y)	x
 
 #elif STUB_LINKAGE == STUB_FORTRAN


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.