diff --git a/Src/ClassicExplorer/ClassicExplorer.vcxproj b/Src/ClassicExplorer/ClassicExplorer.vcxproj index 55f59d9..4280d83 100644 --- a/Src/ClassicExplorer/ClassicExplorer.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorer.vcxproj @@ -100,7 +100,9 @@ - + + PreserveNewest + diff --git a/Src/ClassicExplorer/dllmain.cpp b/Src/ClassicExplorer/dllmain.cpp index 42adb2e..9e7a5eb 100644 --- a/Src/ClassicExplorer/dllmain.cpp +++ b/Src/ClassicExplorer/dllmain.cpp @@ -110,7 +110,7 @@ static DWORD CALLBACK DllInitThread( void* ) GetModuleFileName(g_Instance,path,_countof(path)); *PathFindFileName(path)=0; wchar_t fname[_MAX_PATH]; - Sprintf(fname,_countof(fname),L"%s" INI_PATH L"ExplorerL10N.ini",path); + Sprintf(fname,_countof(fname),L"%sExplorerL10N.ini",path); CString language=GetSettingString(L"Language"); ParseTranslations(fname,language); diff --git a/Src/ClassicExplorer/stdafx.h b/Src/ClassicExplorer/stdafx.h index b912334..b6226ae 100644 --- a/Src/ClassicExplorer/stdafx.h +++ b/Src/ClassicExplorer/stdafx.h @@ -27,10 +27,8 @@ using namespace ATL; #include #ifdef BUILD_SETUP -#define INI_PATH L"" #define DOC_PATH L"" #else -#define INI_PATH L"..\\" #define DOC_PATH L"..\\..\\Docs\\Help\\" #endif diff --git a/Src/ClassicIE/ClassicIEDLL/stdafx.h b/Src/ClassicIE/ClassicIEDLL/stdafx.h index 25c5416..2a270ef 100644 --- a/Src/ClassicIE/ClassicIEDLL/stdafx.h +++ b/Src/ClassicIE/ClassicIEDLL/stdafx.h @@ -25,10 +25,8 @@ using namespace ATL; #ifdef BUILD_SETUP -#define INI_PATH L"" #define DOC_PATH L"" #else -#define INI_PATH L"..\\" #define DOC_PATH L"..\\..\\Docs\\Help\\" #endif diff --git a/Src/StartMenu/StartMenu.vcxproj b/Src/StartMenu/StartMenu.vcxproj index dac1867..c535f82 100644 --- a/Src/StartMenu/StartMenu.vcxproj +++ b/Src/StartMenu/StartMenu.vcxproj @@ -74,7 +74,9 @@ - + + PreserveNewest + diff --git a/Src/StartMenu/StartMenuDLL/dllmain.cpp b/Src/StartMenu/StartMenuDLL/dllmain.cpp index df2a24e..51ccdec 100644 --- a/Src/StartMenu/StartMenuDLL/dllmain.cpp +++ b/Src/StartMenu/StartMenuDLL/dllmain.cpp @@ -62,7 +62,7 @@ static DWORD CALLBACK DllInitThread( void* ) *PathFindFileName(path)=0; wchar_t fname[_MAX_PATH]; - Sprintf(fname,_countof(fname),L"%s" INI_PATH L"StartMenuL10N.ini",path); + Sprintf(fname,_countof(fname),L"%sStartMenuL10N.ini",path); CString language=GetSettingString(L"Language"); ParseTranslations(fname,language); diff --git a/Src/StartMenu/StartMenuDLL/stdafx.h b/Src/StartMenu/StartMenuDLL/stdafx.h index 88e10be..3c575a5 100644 --- a/Src/StartMenu/StartMenuDLL/stdafx.h +++ b/Src/StartMenu/StartMenuDLL/stdafx.h @@ -23,10 +23,8 @@ #include #ifdef BUILD_SETUP -#define INI_PATH L"" #define DOC_PATH L"" #else -#define INI_PATH L"..\\" #define DOC_PATH L"..\\..\\Docs\\Help\\" #endif diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj index 876edc0..c293faf 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -95,7 +95,9 @@ - + + PreserveNewest + diff --git a/Src/StartMenu/StartMenuHelper/dllmain.cpp b/Src/StartMenu/StartMenuHelper/dllmain.cpp index 21c35ce..599e4a5 100644 --- a/Src/StartMenu/StartMenuHelper/dllmain.cpp +++ b/Src/StartMenu/StartMenuHelper/dllmain.cpp @@ -92,7 +92,7 @@ static DWORD CALLBACK DllInitThread( void* ) } wchar_t fname[_MAX_PATH]; - Sprintf(fname,_countof(fname),L"%s" INI_PATH L"StartMenuHelperL10N.ini",path); + Sprintf(fname,_countof(fname),L"%sStartMenuHelperL10N.ini",path); CString language=GetSettingString(L"Language"); ParseTranslations(fname,language); diff --git a/Src/StartMenu/StartMenuHelper/stdafx.h b/Src/StartMenu/StartMenuHelper/stdafx.h index 48ff5c7..4a90cdb 100644 --- a/Src/StartMenu/StartMenuHelper/stdafx.h +++ b/Src/StartMenu/StartMenuHelper/stdafx.h @@ -22,9 +22,3 @@ #include using namespace ATL; - -#ifdef BUILD_SETUP -#define INI_PATH L"" -#else -#define INI_PATH L"..\\" -#endif