Fixed build issue and dependency cross-linking issues.

NPowl · Jan 17, 2017 · 7672b7e · 7672b7e
1 parent 52b2043
commit 7672b7e
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 15 deletions.
diff --git a/Built/Modbus Master/Linux_32_ARM/Modbus Master Engine LinuxARM.llb b/Built/Modbus Master/Linux_32_ARM/Modbus Master Engine LinuxARM.llb
diff --git a/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb b/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb
diff --git a/Built/Modbus Master/Modbus Master Configuration.llb b/Built/Modbus Master/Modbus Master Configuration.llb
diff --git a/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb b/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb
diff --git a/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb b/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb
diff --git a/Source/Engine/Modbus Async.vi b/Source/Engine/Modbus Async.vi
diff --git a/Source/Engine/RT Driver VI.vi b/Source/Engine/RT Driver VI.vi
diff --git a/Source/Engine/SubVIs/Create Input Groups.vi b/Source/Engine/SubVIs/Create Input Groups.vi
diff --git a/Source/Engine/SubVIs/From Modbus To Veristand.vi b/Source/Engine/SubVIs/From Modbus To Veristand.vi
diff --git a/Source/Engine/SubVIs/From Veristand Master To Modbus.vi b/Source/Engine/SubVIs/From Veristand Master To Modbus.vi
diff --git a/Source/Engine/SubVIs/From Veristand Slave To Modbus.vi b/Source/Engine/SubVIs/From Veristand Slave To Modbus.vi
diff --git a/Source/Engine/SubVIs/Initialize Engine Output.vi b/Source/Engine/SubVIs/Initialize Engine Output.vi
diff --git a/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi b/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi
diff --git a/Source/Modbus Master Custom Device - Windows.lvlps b/Source/Modbus Master Custom Device - Windows.lvlps
@@ -1,5 +1,5 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "138,-798,682,-382"
+ProjectExplorer.ClassicPosition[String] = "116,1242,660,1658"
 
 [AB_Cache_{C67C1B30-A649-4BB4-8780-C96741B30EB4}]
 Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{C67C1"

diff --git a/Source/Modbus Master Custom Device - Windows.lvproj b/Source/Modbus Master Custom Device - Windows.lvproj
@@ -185,17 +185,6 @@
 				<Item Name="Invoke BuildTarget.vi" Type="VI" URL="/&lt;vilib&gt;/AppBuilder/Invoke BuildTarget.vi"/>
 				<Item Name="NI_App_Builder_API.lvlib" Type="Library" URL="/&lt;vilib&gt;/AppBuilder/AB_API_Simple/NI_App_Builder_API.lvlib"/>
 				<Item Name="GetTargetBuildSpecs.vi" Type="VI" URL="/&lt;vilib&gt;/AppBuilder/GetTargetBuildSpecs.vi"/>
-				<Item Name="Process.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Process.lvclass"/>
-				<Item Name="Process.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Process.lvclass/Process.ctl"/>
-				<Item Name="Data.Processes.Execute.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Data.Processes.Execute.vi"/>
-				<Item Name="Async.Processes.Report.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Methods/Async.Processes.Report.vi"/>
-				<Item Name="Read Data Access.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Data Member Access/Read Data Access.vi"/>
-				<Item Name="Data Access Engine.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Data Access Engine.lvclass"/>
-				<Item Name="Data.Processes.Lookup.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Data.Processes.Lookup.vi"/>
-				<Item Name="Write.Lookup.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Write.Lookup.vi"/>
-				<Item Name="Read.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/Read/Read.lvclass/Read.ctl"/>
-				<Item Name="Read.Data.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Read.Data.vi"/>
-				<Item Name="Read.ProcessData.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/Read/Read.ProcessData.vi"/>
 				<Item Name="Data Access Engine.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_Data Access Engine/Data Access Engine.lvlib"/>
 				<Item Name="VS Inline Async API.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_VS Inline Async API/VS Inline Async API.lvlib"/>
 				<Item Name="Data Access System Explorer.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_Data Access System Explorer/Data Access System Explorer.lvlib"/>
@@ -206,9 +195,6 @@
 			<Item Name="provcom_StringGlobals.vi" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/Common/provcom_StringGlobals.vi"/>
 			<Item Name="Export to Kepware Server.vi" Type="VI" URL="../System Explorer/SubVIs/Kepware/Export to Kepware Server.vi"/>
 			<Item Name="To Standard Name.vi" Type="VI" URL="../System Explorer/SubVIs/Kepware/To Standard Name.vi"/>
-			<Item Name="wsock32.dll" Type="Document" URL="wsock32.dll">
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
 		</Item>
 		<Item Name="Build Specifications" Type="Build">
 			<Item Name="Configuration Debug" Type="Source Distribution">

diff --git a/Source/System Explorer/Main Page.vi b/Source/System Explorer/Main Page.vi