Advertisement
Guest User

Untitled

a guest
Oct 30th, 2014
143
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.86 KB | None | 0 0
  1. diff -ur -x libtool -x '*.o' -x '*.lo' -x '*.la*' -x configure.lineno -x config.status -x config.log -x '*.Plo' -x '*.Po' -x .svn -x .git libpng-1.6.10.0/Makefile.in libpng-1.6.10/Makefile.in
  2. --- libpng-1.6.10.0/Makefile.in 2014-03-06 19:35:14.000000000 +0100
  3. +++ libpng-1.6.10/Makefile.in 2014-04-18 16:02:10.000000000 +0200
  4. @@ -14,6 +14,11 @@
  5.  
  6. @SET_MAKE@
  7.  
  8. +OS2_LA_NAME=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
  9. +OS2_DLL_NAME=png@PNGLIB_MAJOR@@PNGLIB_MINOR@
  10. +OS2_DLL_OBJ=$(libpng16_la_OBJECTS:%.lo=%.o)
  11. +OS2_DLL_LIBS=$(LIBS)
  12. +
  13. # Makefile.am:
  14. # Source file for Makefile.in (and hence Makefile)
  15. #
  16. @@ -742,7 +747,7 @@
  17. # actually installed on a given system, so instead we check for every extension
  18. # we have seen.
  19. EXT_LIST = a dll.a so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ la sl dylib
  20. -all: $(BUILT_SOURCES) config.h
  21. +all: $(BUILT_SOURCES) config.h $(OS2_DLL_NAME).dll
  22. $(MAKE) $(AM_MAKEFLAGS) all-am
  23.  
  24. .SUFFIXES:
  25. @@ -815,6 +820,11 @@
  26. echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
  27. $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
  28. }
  29. + rm "$(DESTDIR)$(libdir)/$(OS2_DLL_NAME).a"
  30. + install $(OS2_DLL_NAME).dll "$(DESTDIR)$(libdir)"
  31. + install $(OS2_LA_NAME).a "$(DESTDIR)$(libdir)"
  32. + install $(OS2_LA_NAME)_s.a "$(DESTDIR)$(libdir)"
  33. + install $(OS2_LA_NAME).lib "$(DESTDIR)$(libdir)"
  34.  
  35. uninstall-libLTLIBRARIES:
  36. @$(NORMAL_UNINSTALL)
  37. @@ -2258,3 +2268,15 @@
  38. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  39. # Otherwise a system limit (for SysV at least) may be exceeded.
  40. .NOEXPORT:
  41. +
  42. +$(OS2_DLL_NAME).dll: $(OS2_LA_NAME).la
  43. + rm -f $(OS2_DLL_NAME)*.a
  44. + ar cru $(OS2_LA_NAME)_s.a $(OS2_DLL_OBJ)
  45. + echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def
  46. + echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
  47. + echo "EXPORTS" >> $(OS2_DLL_NAME).def
  48. + emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
  49. + gcc -g -Zbin-files -Zomf -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS)
  50. + emximp -o $(OS2_LA_NAME).a $(OS2_DLL_NAME).def
  51. + emximp -o $(OS2_LA_NAME).lib $(OS2_DLL_NAME).def
  52. + cp $@ .libs
  53. diff -ur -x libtool -x '*.o' -x '*.lo' -x '*.la*' -x configure.lineno -x config.status -x config.log -x '*.Plo' -x '*.Po' -x .svn -x .git libpng-1.6.10.0/pngconf.h libpng-1.6.10/pngconf.h
  54. --- libpng-1.6.10.0/pngconf.h 2014-03-06 19:35:00.000000000 +0100
  55. +++ libpng-1.6.10/pngconf.h 2014-04-17 12:06:38.000000000 +0200
  56. @@ -266,6 +266,7 @@
  57. # if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
  58. # define PNGAPI _System
  59. # else /* !Windows/x86 && !OS/2 */
  60. +# define PNG_DLL_EXPORT
  61. /* Use the defaults, or define PNG*API on the command line (but
  62. * this will have to be done for every compile!)
  63. */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement