Browse Source

* Disable DYNAMIC_LINK for Win64 - it involves assembler blocks, which are specific to i386/stdcall and won't work in Win64. Since r17490 it won't compile, too. Patch from Cyrax, resolves #19371.

git-svn-id: trunk@17495 -
sergei 14 years ago
parent
commit
68f8eb2fdb
1 changed files with 5 additions and 0 deletions
  1. 5 0
      packages/winunits-jedi/src/jwawindows.pas

+ 5 - 0
packages/winunits-jedi/src/jwawindows.pas

@@ -124,6 +124,11 @@ the one of the project.
   {$IFDEF FPC}
     {$UNDEF JWA_INCLUDE_JWAADSTLB}
     {$UNDEF JWA_INCLUDE_SETUP_API}
+    {$IFDEF CPU64}
+       // Dynamic linking code contains assembler blocks, which are specific
+       // to i386 and stdcall calling convention.
+       {$UNDEF DYNAMIC_LINK}
+    {$ENDIF}
   {$ENDIF FPC}
 {$ENDIF PACKAGE_CONDITIONS}