diff options
| author | Yuri Dario <ydario@apache.org> | 2012-06-19 11:58:16 +0000 |
|---|---|---|
| committer | Yuri Dario <ydario@apache.org> | 2012-06-19 11:58:16 +0000 |
| commit | 795aa222de705053a937571a38b53f78b08a5fa5 (patch) | |
| tree | d56d74a5172f7519dfdfbbdcc11cec007c714cfa | |
| parent | 3d5352e1e1a1fbe14963cd5985228b6101e9fbdd (diff) | |
i118923 - OS/2 port: fix change of local LIBPATH.
Notes
Notes:
ignore: OS/2
| -rw-r--r-- | desktop/os2/source/applauncher/launcher.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx index 4daa30c49a34..95bc3c095c03 100644 --- a/desktop/os2/source/applauncher/launcher.cxx +++ b/desktop/os2/source/applauncher/launcher.cxx @@ -54,10 +54,14 @@ int main( int argc, char* argv[]) DosQueryModuleName(pib->pib_hmte, sizeof(szApplicationName), szApplicationName); // adjust libpath +#if OSL_DEBUG_LEVEL > 0 + rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH); + fprintf( stderr, "1 BeginLibPath: %s\n", szLibpath); +#endif _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); char* basedir = strstr( szDir, "\\PROGRAM\\"); if (basedir) *basedir = 0; - sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%BeginLIBPATH%", + sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%%BeginLIBPATH%%;", szDrive, szDir, szDrive, szDir); DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH); // make sure we load DLL from our path only, so multiple instances/versions @@ -67,6 +71,10 @@ int main( int argc, char* argv[]) // java cannot load with this flag enabled DosSetExtLIBPATH( (PCSZ)"T", LIBPATHSTRICT); #endif +#if OSL_DEBUG_LEVEL > 0 + rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH); + fprintf( stderr, "2 BeginLibPath: %s\n", szLibpath); +#endif // adjust exe name _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); |