[Bug 2750] build for Win64

 loopback ppsapi dll needs def-file for entry point renaming in x86 target builds

bk: 5549370bfVXtKowtMdvHmCSBtXEBIw

diff --git a/ChangeLog b/ChangeLog
index 3e8634fdc332d0ed53af3537ca54ec860166ea4e..4c329b9b2153a29898fbee6f34bc3dc5982c3dd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
-
+* [Bug 2750] build for Win64
+  Building for 32bit of loopback ppsapi needs def file
 * CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776.
 * CID 1296235: Fix refclock_jjy.c and correcting type of the driver40-ja.html
 * CID 1269537: Clean up a line of dead code in getShmTime().

diff --git a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def
new file mode 100644 (file)
index 0000000..87531cf
--- /dev/null
+++ b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def
@@ -0,0 +1,11 @@
+LIBRARY        "loopback-ppsapi-provider.dll"
+; This is *needed* for x86 (32bit) builds, as it makes sure
+; that the *undecorated* names are exported in the DLL.
+; It *cannot* be used for the x64 (64bit) builds.
+EXPORTS
+    ppsapi_prov_init
+    prov_time_pps_create
+    prov_time_pps_destroy
+    prov_time_pps_fetch
+    prov_time_pps_kcbind
+    prov_time_pps_setparams
\ No newline at end of file

diff --git a/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj b/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj
index 33e11f30d49fd4c7dc525b73d84f099bc0f0917b..a2faa34668ff902c7256bef65c97cd9e68acc5b0 100644 (file)
--- a/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj
+++ b/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj
@@ -59,6 +59,7 @@
                                AdditionalDependencies="ntpd.lib"
                                Version="4.2"
                                AdditionalLibraryDirectories="$(OutDir)"
+                               ModuleDefinitionFile="..\..\ppsapi\loopback\src\loopback-ppsapi.def"
                                SubSystem="2"
                        />
                        <Tool
@@ -188,6 +189,7 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="ntpd.lib"
                                AdditionalLibraryDirectories="$(OutDir)"
+                               ModuleDefinitionFile="..\..\ppsapi\loopback\src\loopback-ppsapi.def"
                                SubSystem="2"
                        />
                        <Tool

diff --git a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj
index 1e29c6c91bf435b9f1aacfea129b34c0183c5c50..a0bcdce1cbc20afd66e58e43fa25e60bc66bb243 100644 (file)
--- a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj
+++ b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj
@@ -111,6 +111,7 @@
       <Version>4.2</Version>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
+      <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile>
     </Link>
     <Bscmake>
       <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
@@ -125,6 +126,7 @@
       <Version>4.2</Version>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
+      <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile>
     </Link>
     <Bscmake>
       <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
@@ -155,6 +157,7 @@
       <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
+      <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile>
     </Link>
     <Bscmake>
       <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
@@ -169,6 +172,7 @@
       <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
+      <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile>
     </Link>
     <Bscmake>
       <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>