minor bug in x32 version fixed

vladk1973 · Feb 22, 2018 · 8929cc9 · 8929cc9
1 parent 55156fd
commit 8929cc9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/Easy.diaplugin.pas b/Easy.diaplugin.pas
@@ -25,7 +25,9 @@   TdiaPlugin = class(TNppPlugin)
     procedure DoNppnToolbarModification; override;
     procedure DoNppnCharAdded(const ASCIIKey: Integer); override;
     procedure DoNppnModified(sn: PSCNotification); override;
+    {$IFDEF WIN64}
     procedure DoNppnUpdateAutoSelection(P: PAnsiChar); override;
+    {$ENDIF}
 
     procedure ShowAutocompletion(const TableName: string; Indx: TStringList);
     procedure ShowProcedureList;
@@ -455,6 +457,7 @@ function TdiaPlugin.GetTextRange(const Range: TCharacterRange): nppString;
   end;
 end;
 
+{$IFDEF WIN64}
 procedure TdiaPlugin.DoNppnUpdateAutoSelection(P: PAnsiChar);
 var
   S: AnsiString;
@@ -476,5 +479,6 @@ procedure TdiaPlugin.DoNppnUpdateAutoSelection(P: PAnsiChar);
       end;
     end;
 end;
+{$ENDIF}
 
 end.
diff --git a/dia2.notepad.dproj b/dia2.notepad.dproj
@@ -235,12 +235,27 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="ProjectiOSDeviceResourceRules">
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
                     <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
@@ -619,27 +634,12 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
+                <DeployClass Name="ProjectiOSDeviceResourceRules">
                     <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                 </DeployClass>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>