From 3caeffafdaf54a321f89ef0faedf3cd3010082a8 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 16 Jan 2020 19:11:07 +0000 Subject: [PATCH] =?UTF-8?q?EgtCAM5=202.2a4=20:=20-=20aggiunta=20possibilit?= =?UTF-8?q?=C3=A0=20di=20usare=20un=20direttorio=20per=20le=20librerie=20l?= =?UTF-8?q?ua=20diverso=20tra=2032=20e=2064=20bit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Constants/ConstIni.vb | 1 + MainWindow/MainWindowVM.vb | 3 +++ My Project/AssemblyInfo.vb | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index b24c803..efabbd1 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -43,6 +43,7 @@ Module ConstIni Public Const S_LUA As String = "Lua" Public Const K_LIBSDIR As String = "LibsDir" + Public Const K_LIBSDIR64 As String = "LibsDir64" Public Const K_BASELIB As String = "BaseLib" Public Const S_GEOMDB As String = "GeomDB" diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index c166ef2..0b716f0 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -366,6 +366,9 @@ Public Class MainWindowVM ' imposto dir di default per libreria Lua e lancio libreria di base Dim sLuaLibsDir As String = String.Empty GetPrivateProfileString(S_LUA, K_LIBSDIR, "", sLuaLibsDir) + #If PLATFORM = "x64" Then + GetPrivateProfileString(S_LUA, K_LIBSDIR64, sLuaLibsDir, sLuaLibsDir) + #End If EgtSetLuaLibs(sLuaLibsDir) Dim sLuaBaseLib As String = String.Empty GetPrivateProfileString(S_LUA, K_BASELIB, "EgtBase", sLuaBaseLib) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index cf2ab5e..4ee3b15 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +