tvision-2.1.0_pre2-asneeded.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. --- tvision/config.pl
  2. +++ tvision/config.pl
  3. @@ -206,6 +206,7 @@
  4. }
  5. # Flags to link as a dynamic lib
  6. $MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
  7. +$MakeDefsRHIDE[7]='RHIDE_LIBS=';
  8. if ($OS eq 'UNIX')
  9. {
  10. if ($OSf ne 'Darwin')
  11. @@ -229,15 +230,15 @@
  12. }
  13. $libs=$conf{'X11Lib'};
  14. $libs=~s/(\S+)/-l$1/g;
  15. - $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
  16. + $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
  17. - $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
  18. + $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
  19. - $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
  20. + $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
  21. - $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
  22. + $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
  23. - $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
  24. + $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
  25. - $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
  26. + $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
  27. }
  28. -$MakeDefsRHIDE[7]="LIB_VER=$Version";
  29. +$MakeDefsRHIDE[8]="LIB_VER=$Version";
  30. -$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
  31. +$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
  32. ModifyMakefiles('intl/dummy/Makefile');
  33. CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
  34. --- tvision/makes/common.imk
  35. +++ tvision/makes/common.imk
  36. @@ -54,7 +54,7 @@
  37. C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
  38. RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
  39. $(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE) \
  40. - $(OBJFILES)
  41. + $(OBJFILES) $(addprefix -l,$(RHIDE_OS_LIBS))
  42. else
  43. RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
  44. $(ALL_PREREQ)