Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 06:56:24 +08:00
Code Issues Actions 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
zlib/Makefile
+9 -9
View File
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $"
# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
#
# GNU ZIP library makefile for the Fast Light Toolkit (FLTK).
#
@@ -34,7 +34,7 @@ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o \
trees.o zutil.o inflate.o infblock.o inftrees.o infcodes.o \
infutil.o inffast.o
LIBZ = ../lib/libz$(LIBEXT)
LIBZ = ../lib/libfltk_z$(LIBEXT)
#
@@ -58,11 +58,11 @@ clean:
#
install: $(LIBZ)
echo "Installing libz$(LIBEXT) in $(libdir)..."
echo "Installing libfltk_z$(LIBEXT) in $(libdir)..."
-$(MKDIR) $(libdir)
$(RM) $(libdir)/libz$(LIBEXT)
$(RM) $(libdir)/libfltk_z$(LIBEXT)
$(CP) $(LIBZ) $(libdir)
$(RANLIB) $(libdir)/libz$(LIBEXT)
$(RANLIB) $(libdir)/libfltk_z$(LIBEXT)
#
@@ -70,12 +70,12 @@ install: $(LIBZ)
#
uninstall:
echo "Uninstalling libz$(LIBEXT) in $(libdir)..."
$(RM) $(libdir)/libz$(LIBEXT)
echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..."
$(RM) $(libdir)/libfltk_z$(LIBEXT)
#
# libz.a
# libfltk_z.a
#
$(LIBZ): $(OBJS)
@@ -97,5 +97,5 @@ $(OBJS): ../makeinclude
#
# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $".
# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
#