From 6a9ce85b9d152dc2ff4d94217c275eb8939c59bf Mon Sep 17 00:00:00 2001 From: cascade Date: Wed, 15 Aug 2007 13:11:45 +0000 Subject: [PATCH] OCC16602 Fix rollback - compilation errors on WNT --- src/WOKOBJS/OBJS.edl | 10 +++------- src/WOKOBJS/OBJSSCHEMA.edl | 13 ++++++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/WOKOBJS/OBJS.edl b/src/WOKOBJS/OBJS.edl index bbc955f..1ac40d1 100755 --- a/src/WOKOBJS/OBJS.edl +++ b/src/WOKOBJS/OBJS.edl @@ -45,15 +45,11 @@ @set %OBJS_OSSG_ArchDirective = ""; - @if ( %Station != "hp" && %Station != "mac" ) then - @set %LDPATHVAR = "LD_LIBRARY_PATH"; - @endif; - @if ( %Station == "hp" ) then + @if ( %Station != "hp" ) then + @set %LDPATHVAR = "LD_LIBRARY_PATH"; + @else @set %LDPATHVAR = "SHLIB_PATH"; @endif; - @if ( %Station == "mac" ) then - @set %LDPATHVAR = "DYLD_LIBRARY_PATH"; - @endif; @set %OBJS_OSSG_Suffix = " >& /tmp/ossg.$$"; diff --git a/src/WOKOBJS/OBJSSCHEMA.edl b/src/WOKOBJS/OBJSSCHEMA.edl index b39479c..a7fb4e6 100755 --- a/src/WOKOBJS/OBJSSCHEMA.edl +++ b/src/WOKOBJS/OBJSSCHEMA.edl @@ -6,18 +6,21 @@ @ifnotdefined ( %OBJSSCHEMA_EDL) then @set %OBJSSCHEMA_EDL = ""; -@set %OBJSSCHEMA_Shared = "libTKOBJSSchema.so"; @if ( %Station == "hp" ) then - @set %OBJSSCHEMA_Shared = "libTKOBJSSchema.sl"; + --@set %OBJSSCHEMA_Shared = "libOBJSSchema.sl"; + @set %OBJSSCHEMA_Shared = "libTKOBJSSchema.sl"; @endif; -@if ( %Station == "mac" ) then - @set %OBJSSCHEMA_Shared = "libTKOBJSSchema.dylib"; +@if ( %Station != "hp" ) then + --@set %OBJSSCHEMA_Shared = "libOBJSSchema.so"; + @set %OBJSSCHEMA_Shared = "libTKOBJSSchema.so"; @endif; + @if ( %Station == "wnt" ) then - @set %OBJSSCHEMA_Shared = "TKOBJSSchema.dll"; + --@set %OBJSSCHEMA_Shared = "OBJSSchema.dll"; + @set %OBJSSCHEMA_Shared = "TKOBJSSchema.dll"; @endif; @set %OBJSSCHEMA_Name = "OBJSSchema"; -- 2.39.5