Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 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
- --- libpng-1.6.10.0/Makefile.in 2014-03-06 19:35:14.000000000 +0100
- +++ libpng-1.6.10/Makefile.in 2014-04-18 16:02:10.000000000 +0200
- @@ -14,6 +14,11 @@
- @SET_MAKE@
- +OS2_LA_NAME=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
- +OS2_DLL_NAME=png@PNGLIB_MAJOR@@PNGLIB_MINOR@
- +OS2_DLL_OBJ=$(libpng16_la_OBJECTS:%.lo=%.o)
- +OS2_DLL_LIBS=$(LIBS)
- +
- # Makefile.am:
- # Source file for Makefile.in (and hence Makefile)
- #
- @@ -742,7 +747,7 @@
- # actually installed on a given system, so instead we check for every extension
- # we have seen.
- EXT_LIST = a dll.a so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ la sl dylib
- -all: $(BUILT_SOURCES) config.h
- +all: $(BUILT_SOURCES) config.h $(OS2_DLL_NAME).dll
- $(MAKE) $(AM_MAKEFLAGS) all-am
- .SUFFIXES:
- @@ -815,6 +820,11 @@
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
- + rm "$(DESTDIR)$(libdir)/$(OS2_DLL_NAME).a"
- + install $(OS2_DLL_NAME).dll "$(DESTDIR)$(libdir)"
- + install $(OS2_LA_NAME).a "$(DESTDIR)$(libdir)"
- + install $(OS2_LA_NAME)_s.a "$(DESTDIR)$(libdir)"
- + install $(OS2_LA_NAME).lib "$(DESTDIR)$(libdir)"
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @@ -2258,3 +2268,15 @@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- +
- +$(OS2_DLL_NAME).dll: $(OS2_LA_NAME).la
- + rm -f $(OS2_DLL_NAME)*.a
- + ar cru $(OS2_LA_NAME)_s.a $(OS2_DLL_OBJ)
- + echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def
- + echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
- + echo "EXPORTS" >> $(OS2_DLL_NAME).def
- + emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
- + gcc -g -Zbin-files -Zomf -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS)
- + emximp -o $(OS2_LA_NAME).a $(OS2_DLL_NAME).def
- + emximp -o $(OS2_LA_NAME).lib $(OS2_DLL_NAME).def
- + cp $@ .libs
- 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
- --- libpng-1.6.10.0/pngconf.h 2014-03-06 19:35:00.000000000 +0100
- +++ libpng-1.6.10/pngconf.h 2014-04-17 12:06:38.000000000 +0200
- @@ -266,6 +266,7 @@
- # if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
- # define PNGAPI _System
- # else /* !Windows/x86 && !OS/2 */
- +# define PNG_DLL_EXPORT
- /* Use the defaults, or define PNG*API on the command line (but
- * this will have to be done for every compile!)
- */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement