Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-26 10:07:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove the GCC -Wshadow option.

Browse Source 
Use fltk_xyz for the PNG, JPEG, and ZLIB libraries instead of the normal
names, to avoid collisions with existing installs.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3727 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2004-07-29 18:13:11 +00:00
parent 601f7d0708
commit b98e54a92f
5 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jpeg/Makefile
+8 -8
View File
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $"
# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
#
# JPEG library makefile for the Fast Light Toolkit (FLTK).
#
@@ -41,7 +41,7 @@ OBJS = jmemnobs.o \
jidctflt.o jidctfst.o jidctint.o jidctred.o jquant1.o \
jquant2.o jutils.o jmemmgr.o
LIBJPEG = ../lib/libjpeg$(LIBEXT)
LIBJPEG = ../lib/libfltk_jpeg$(LIBEXT)
#
@@ -65,9 +65,9 @@ clean:
#
install:
echo "Installing libjpeg$(LIBEXT) in $(libdir)..."
echo "Installing libfltk_jpeg$(LIBEXT) in $(libdir)..."
-$(MKDIR) $(libdir)
$(RM) $(libdir)/libjpeg$(LIBEXT)
$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
$(CP) $(LIBJPEG) $(libdir)
@@ -76,12 +76,12 @@ install:
#
uninstall:
echo "Uninstalling libjpeg$(LIBEXT) in $(libdir)..."
$(RM) $(libdir)/libjpeg$(LIBEXT)
echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..."
$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
#
# libjpeg.a
# libfltk_jpeg.a
#
$(LIBJPEG): $(OBJS)
@@ -103,5 +103,5 @@ include makedepend
$(OBJS): ../makeinclude
#
# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $".
# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
#