Egalware/egtengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtEngine 2.7k1 :

Browse Source 
- ricompilazione per C++ 20
- possibilità di abilitare dialoghi da script lua (da INI con [Scene] Enable=1).
This commit is contained in:
Dario Sassi
2025-11-02 17:35:08 +01:00
parent 24a703ba04
commit 05c133f447
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtEngine.cpp
+6 -4
View File
@@ -50,6 +50,7 @@ static char S_GEOMDB[] = "GeomDB" ;
static char K_NFEFONTDIR[] = "NfeFontDir" ;
static char K_DEFAULTFONT[] = "DefaultFont" ;
static char S_SCENE[] = "Scene" ;
static char K_ENABLE[] = "Enable" ;
static char K_MMUNITS[] = "MmUnits" ;
static char S_IMPORT[] = "Import" ;
static char K_BTLFLAG[] = "BtlFlag" ;
@@ -119,8 +120,8 @@ wmain( int argc, wchar_t* argv[])
ExeSetLockId( sLockId) ;
// Recupero livello e opzioni della chiave
int nKeyLev ; unsigned int nKeyOptions ;
bool bKey = ExeGetKeyLevel( 9935, 2710, 1, nKeyLev) &&
ExeGetKeyOptions( 9935, 2710, 1, nKeyOptions) ;
bool bKey = ExeGetKeyLevel( 9935, 2711, 1, nKeyLev) &&
ExeGetKeyOptions( 9935, 2711, 1, nKeyOptions) ;
// Recupero livello utente e livello di debug
int nUserLev = min( GetPrivateProfileInt( S_GENERAL, K_USERLEVEL, 1, sFileIni.c_str()), nKeyLev) ;
int nDebug = GetPrivateProfileInt( S_GENERAL, K_DEBUG, 0, sFileIni.c_str()) ;
@@ -152,6 +153,9 @@ wmain( int argc, wchar_t* argv[])
// Imposto direttorio ausiliario per import/gestione BTL (sempre dopo impostazioni lua)
string sBtlAuxDir = GetPrivateProfileStringUtf8( S_IMPORT, K_BTLAUXDIR, "", sFileIni.c_str()) ;
ExeSetBtlAuxDir( sBtlAuxDir) ;
// Imposto abilitazione interfaccia (per dialoghi da script lua)
bool bEnableUi = ( GetPrivateProfileInt( S_SCENE, K_ENABLE, 0, sFileIni.c_str()) != 0) ;
ExeSetEnableUI( bEnableUi) ;
// Imposto unità di misura di interfaccia (per generazione CN)
bool bMM = ( GetPrivateProfileInt( S_SCENE, K_MMUNITS, 1, sFileIni.c_str()) != 0) ;
ExeSetUiUnits( bMM) ;
@@ -181,8 +185,6 @@ wmain( int argc, wchar_t* argv[])
return 2 ;
}
ExeInitTscExec() ;
// Disabilito utilizzo UI perchè non definita
ExeSetEnableUI( false) ;
// Inizializzo gestore lavorazioni
ExeInitMachMgr( sMachinesRoot, sToolMakersDir) ;
// Eventuale inizializzazione gestore travi e pareti
EgtEngine.rc
+8 -8
View File
@@ -56,7 +56,7 @@ VS_VERSION_INFO$(_DEB32) VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO
#endif
FILEVERSION 2,7,10,1
FILEVERSION 2,7,11,1
PRODUCTVERSION 2,7,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
@@ -74,7 +74,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "Egalware s.r.l."
VALUE "FileDescription", "EgtEngine Debug Version"
VALUE "FileVersion", "2.7j1"
VALUE "FileVersion", "2.7k1"
VALUE "InternalName", "EgtEngine"
VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l."
VALUE "OriginalFilename", "EgtEngineD32.exe"
@@ -95,7 +95,7 @@ VS_VERSION_INFO$(NDEB32) VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO
#endif
FILEVERSION 2,7,10,1
FILEVERSION 2,7,11,1
PRODUCTVERSION 2,7,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
@@ -113,7 +113,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "Egalware s.r.l."
VALUE "FileDescription", "EgtEngine"
VALUE "FileVersion", "2.7j1"
VALUE "FileVersion", "2.7k1"
VALUE "InternalName", "EgtEngine"
VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l."
VALUE "OriginalFilename", "EgtEngineR32.exe"
@@ -134,7 +134,7 @@ VS_VERSION_INFO$(_DEB64) VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO
#endif
FILEVERSION 2,7,10,1
FILEVERSION 2,7,11,1
PRODUCTVERSION 2,7,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
@@ -152,7 +152,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "Egalware s.r.l."
VALUE "FileDescription", "EgtEngine Debug Version"
VALUE "FileVersion", "2.7j1"
VALUE "FileVersion", "2.7k1"
VALUE "InternalName", "EgtEngine"
VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l."
VALUE "OriginalFilename", "EgtEngineD64.exe"
@@ -173,7 +173,7 @@ VS_VERSION_INFO$(NDEB64) VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO
#endif
FILEVERSION 2,7,10,1
FILEVERSION 2,7,11,1
PRODUCTVERSION 2,7,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
@@ -191,7 +191,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "Egalware s.r.l."
VALUE "FileDescription", "EgtEngine"
VALUE "FileVersion", "2.7j1"
VALUE "FileVersion", "2.7k1"
VALUE "InternalName", "EgtEngine"
VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l."
VALUE "OriginalFilename", "EgtEngineR64.exe"
EgtEngine.vcxproj
+4 -4
View File
@@ -114,7 +114,7 @@
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -144,7 +144,7 @@
</AdditionalIncludeDirectories>
<DisableSpecificWarnings>
</DisableSpecificWarnings>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -182,7 +182,7 @@
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<OpenMPSupport>false</OpenMPSupport>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
@@ -225,7 +225,7 @@
<OpenMPSupport>true</OpenMPSupport>
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<IntelJCCErratum>true</IntelJCCErratum>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
</ClCompile>