diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-11-16 13:12:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 13:12:46 +0100 |
| commit | 796a9bf23e63dfc6834b9fd04c10c8c27f894941 (patch) | |
| tree | e05b57eff35ba5434a2ab7d21e370466b53c897f /jpeg/Makefile | |
| parent | af0bb7e6c968a9c51baefbaba9fd3ea59753d545 (diff) | |
| parent | 46cbc31de25b4579801cc783a01e9ce1be4c53a6 (diff) | |
Merge pull request #292 from Albrecht-S/prefix-bundled-libs
Prefix bundled libs. This fixes issues #232 and #289 and STR 3514 (https://www.fltk.org/str.php?L3514).
Parts of this fix are based on the work of GitHub user @darealshinji who provided instructions to create the jpeg header file with prefixes in STR 3347 (https://www.fltk.org/str.php?L3347). Thanks.
Diffstat (limited to 'jpeg/Makefile')
| -rw-r--r-- | jpeg/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/jpeg/Makefile b/jpeg/Makefile index ac854d6c8..6dd48e361 100644 --- a/jpeg/Makefile +++ b/jpeg/Makefile @@ -106,6 +106,7 @@ install: $(LIBJPEG) $(INSTALL_DATA) jerror.h $(DESTDIR)$(includedir)/FL/images $(INSTALL_DATA) jmorecfg.h $(DESTDIR)$(includedir)/FL/images $(INSTALL_DATA) jpeglib.h $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) fltk_jpeg_prefix.h $(DESTDIR)$(includedir)/FL/images # @@ -120,6 +121,7 @@ uninstall: $(RM) $(includedir)/FL/images/jerror.h $(RM) $(includedir)/FL/images/jmorecfg.h $(RM) $(includedir)/FL/images/jpeglib.h + $(RM) $(includedir)/FL/images/fltk_jpeg_prefix.h # |