OCC16602 Fix rollback - compilation errors on WNT

diff --git a/src/WOKOBJS/OBJS.edl b/src/WOKOBJS/OBJS.edl
index bbc955ff6bc59448cac2404fc7d65a3efbf1a7ae..1ac40d1bf3ab51aec62df66207499dfa26043b82 100755 (executable)
--- 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 b39479c0fa1a9fc6282c5667e11924a60e6b44a1..a7fb4e6e4548b17e399a5d905bc51e86db179a35 100755 (executable)
--- 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";