From ad0c7c4edf1fedadd1d1787d6225e636d2eb2cea Mon Sep 17 00:00:00 2001 From: Ianos Gnatiuc Date: Fri, 12 Jan 2007 19:58:17 +0000 Subject: [PATCH] Fixed charsets choosing menu. Added static linking solution configuration for MSVC8. --- golded.sln | 22 + golded3/gemenu.cpp | 5 +- windows/BuildAll.vcproj | 325 +++++++--- windows/golded.vcproj | 1266 ++++++++++++++++++++++++++++++++++++++- windows/goldlib.vcproj | 445 +++++++++++++- windows/goldnode.vcproj | 223 ++++++- windows/rddt.vcproj | 225 ++++++- 7 files changed, 2422 insertions(+), 89 deletions(-) diff --git a/golded.sln b/golded.sln index cdf7736..39dce57 100644 --- a/golded.sln +++ b/golded.sln @@ -31,6 +31,8 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release_Static|Win32 = Release_Static|Win32 + Release_Static|x64 = Release_Static|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -39,6 +41,10 @@ Global {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Debug|Win32.Build.0 = Debug|Win32 {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Debug|x64.ActiveCfg = Debug|x64 {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Debug|x64.Build.0 = Debug|x64 + {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Release_Static|x64.Build.0 = Release_Static|x64 {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Release|Win32.ActiveCfg = Release|Win32 {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Release|Win32.Build.0 = Release|Win32 {C2BF2897-937C-4469-ABB1-1C43869E1CE5}.Release|x64.ActiveCfg = Release|x64 @@ -47,6 +53,10 @@ Global {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Debug|Win32.Build.0 = Debug|Win32 {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Debug|x64.ActiveCfg = Debug|x64 {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Debug|x64.Build.0 = Debug|x64 + {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Release_Static|x64.Build.0 = Release_Static|x64 {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Release|Win32.ActiveCfg = Release|Win32 {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Release|Win32.Build.0 = Release|Win32 {C23888DA-7024-4A38-A8C5-CE4BEFA4629A}.Release|x64.ActiveCfg = Release|x64 @@ -55,6 +65,10 @@ Global {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Debug|Win32.Build.0 = Debug|Win32 {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Debug|x64.ActiveCfg = Debug|x64 {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Debug|x64.Build.0 = Debug|x64 + {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Release_Static|x64.Build.0 = Release_Static|x64 {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Release|Win32.ActiveCfg = Release|Win32 {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Release|Win32.Build.0 = Release|Win32 {B80E3728-98E5-4A9A-B883-9C064F1FFFA7}.Release|x64.ActiveCfg = Release|x64 @@ -63,6 +77,10 @@ Global {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Debug|Win32.Build.0 = Debug|Win32 {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Debug|x64.ActiveCfg = Debug|x64 {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Debug|x64.Build.0 = Debug|x64 + {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Release_Static|x64.Build.0 = Release_Static|x64 {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Release|Win32.ActiveCfg = Release|Win32 {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Release|Win32.Build.0 = Release|Win32 {951D76D2-FA57-4C95-8F65-A6C19C122AA5}.Release|x64.ActiveCfg = Release|x64 @@ -71,6 +89,10 @@ Global {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Debug|Win32.Build.0 = Debug|Win32 {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Debug|x64.ActiveCfg = Debug|x64 {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Debug|x64.Build.0 = Debug|x64 + {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Release_Static|x64.Build.0 = Release_Static|x64 {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Release|Win32.ActiveCfg = Release|Win32 {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Release|Win32.Build.0 = Release|Win32 {0AB7C044-50C5-4339-9C5D-7474969B6A3C}.Release|x64.ActiveCfg = Release|x64 diff --git a/golded3/gemenu.cpp b/golded3/gemenu.cpp index 4468343..5fa72b7 100644 --- a/golded3/gemenu.cpp +++ b/golded3/gemenu.cpp @@ -970,8 +970,9 @@ int ChangeXlatImport() else if (n != -1) { CFG->ignorecharset = true; - std::string xlatImport = Listi[n].substr(0, Listi[n].find(" ")); - AA->SetXlatimport(xlatImport.c_str()); + gstrarray xlat; + tokenize(xlat, Listi[n].c_str()); + AA->SetXlatimport(xlat[0].c_str()); } LoadCharset(AA->Xlatimport(), CFG->xlatlocalset); diff --git a/windows/BuildAll.vcproj b/windows/BuildAll.vcproj index 03b8538..7eeb7b9 100644 --- a/windows/BuildAll.vcproj +++ b/windows/BuildAll.vcproj @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -475,6 +695,24 @@ PreprocessorDefinitions="" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2862,6 +4108,24 @@ AdditionalIncludeDirectories="golded3" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -351,6 +498,22 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -446,6 +649,24 @@ PreprocessorDefinitions="" /> + + + + + + diff --git a/windows/rddt.vcproj b/windows/rddt.vcproj index e15822d..ee85ad9 100644 --- a/windows/rddt.vcproj +++ b/windows/rddt.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -448,6 +653,24 @@ PreprocessorDefinitions="" /> + + + + + +