Attachment #9092 for issue #19271

View | Details | Raw Unified | Return to issue 19271
Collapse All | Expand All

Lines 796-801 void check_system() Link Here

(-)setup2/mow/source/loader/loader.c (+4 lines)
796	#endif	796	#endif
797	if( pLDPath )	797	if( pLDPath )
798	{	798	{
		799	pLDPath = strdup( pLDPath );
		800
799	char* pToken = strtok( pLDPath, ":" );	801	char* pToken = strtok( pLDPath, ":" );
800	while( pToken != NULL )	802	while( pToken != NULL )
801	{	803	{
Lines 819-824 void check_system() Link Here
819	}	821	}
820	pToken = strtok( NULL, ":" );	822	pToken = strtok( NULL, ":" );
821	}	823	}
		824
		825	free( pLDPath );
822	}	826	}
823		827
824	for( i = 0; i < MAX_FILENAMES; ++i )	828	for( i = 0; i < MAX_FILENAMES; ++i )




     # 2) link against 'libcppuhelper$(COMID).so.$(UDK_MAJOR)'
     #    instead of obsolete 'libcppuhelper$(UDK_MAJOR)$(COMID).so'
     # @@@ </NOTE> @@@
	 LD_LIBRARY_PATH=${sd_archive_path}:.:$LD_LIBRARY_PATH
	 export LD_LIBRARY_PATH
	 ;;
  Darwin)
	 DYLD_LIBRARY_PATH=${sd_archive_path}:.:$DYLD_LIBRARY_PATH
	 export DYLD_LIBRARY_PATH
	 ;;
  IRIX*)
	 LD_LIBRARYN32_PATH=${sd_archive_path}:$LD_LIBRARY32_PATH
	 export LD_LIBRARYN32_PATH
	 ;;
  *)
	 LD_LIBRARY_PATH=${sd_archive_path}:$LD_LIBRARY_PATH
	 export LD_LIBRARY_PATH
	 ;;
esac

Return to issue 19271

Lines 115-133 case $sd_platform in Link Here

(-)setup2/script/setup.sh (-4 / +4 lines)
115	# 2) link against 'libcppuhelper$(COMID).so.$(UDK_MAJOR)'	115	# 2) link against 'libcppuhelper$(COMID).so.$(UDK_MAJOR)'
116	# instead of obsolete 'libcppuhelper$(UDK_MAJOR)$(COMID).so'	116	# instead of obsolete 'libcppuhelper$(UDK_MAJOR)$(COMID).so'
117	# @@@ </NOTE> @@@	117	# @@@ </NOTE> @@@
118	LD_LIBRARY_PATH=${sd_archive_path}:.	118	LD_LIBRARY_PATH=${sd_archive_path}:.:$LD_LIBRARY_PATH
119	export LD_LIBRARY_PATH	119	export LD_LIBRARY_PATH
120	;;	120	;;
121	Darwin)	121	Darwin)
122	DYLD_LIBRARY_PATH=${sd_archive_path}:.	122	DYLD_LIBRARY_PATH=${sd_archive_path}:.:$DYLD_LIBRARY_PATH
123	export DYLD_LIBRARY_PATH	123	export DYLD_LIBRARY_PATH
124	;;	124	;;
125	IRIX*)	125	IRIX*)
126	LD_LIBRARYN32_PATH=${sd_archive_path}	126	LD_LIBRARYN32_PATH=${sd_archive_path}:$LD_LIBRARY32_PATH
127	export LD_LIBRARYN32_PATH	127	export LD_LIBRARYN32_PATH
128	;;	128	;;
129	*)	129	*)
130	LD_LIBRARY_PATH=${sd_archive_path}	130	LD_LIBRARY_PATH=${sd_archive_path}:$LD_LIBRARY_PATH
131	export LD_LIBRARY_PATH	131	export LD_LIBRARY_PATH
132	;;	132	;;
133	esac	133	esac