set m_isBeingDeleted to true (only) in SendDestroyEvent(); call it as early as possib...

[wxWidgets.git] / src / png / scripts / makefile.gcc

diff --git a/src/png/scripts/makefile.gcc b/src/png/scripts/makefile.gcc
index f7fc3687447e69d03818e86419e3676806cdbe61..e899b108e3ee473f31ad8837f25ac4e3b9bbc456 100644 (file)
--- a/src/png/scripts/makefile.gcc
+++ b/src/png/scripts/makefile.gcc
@@ -10,42 +10,55 @@ ZLIBLIB = ../zlib
 # Compiler, linker, lib and other tools
 CC = gcc
 LD = $(CC)
 # Compiler, linker, lib and other tools
 CC = gcc
 LD = $(CC)

-AR = ar rcs
+AR_RC = ar rcs

 RANLIB = ranlib
 RANLIB = ranlib

-RM = rm -f
+RM_F = rm -f

 
 CDEBUG = -g -DPNG_DEBUG=5
 LDDEBUG =
 CRELEASE = -O2
 LDRELEASE = -s
 
 CDEBUG = -g -DPNG_DEBUG=5
 LDDEBUG =
 CRELEASE = -O2
 LDRELEASE = -s

-CFLAGS = -I$(ZLIBINC) -Wall $(CRELEASE)
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng -lz -lm $(LDRELEASE)
+#CFLAGS = -Wall $(CDEBUG)
+CFLAGS = -Wall $(CRELEASE)
+#LDFLAGS = $(LDDEBUG)
+LDFLAGS = $(LDRELEASE)
+LIBS = -lz -lm

 
 # File extensions
 O=.o
 A=.a
 
 # File extensions
 O=.o
 A=.a

-E=
+EXE=

 
 # Variables
 OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
 
 # Variables
 OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \

-       pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
-       pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
+       pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
+       pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)

 
 # Targets
 
 # Targets

-all: libpng$(A) pngtest$(E)
+all: static
+
+.c$(O):
+       $(CC) -c $(CFLAGS) -I$(ZLIBINC) $<
+
+static: libpng$(A) pngtest$(EXE)
+
+shared:
+       @echo This is a generic makefile that cannot create shared libraries.
+       @echo Please use a configuration that is specific to your platform.
+       @false

 
 libpng$(A): $(OBJS)
 
 libpng$(A): $(OBJS)

-       $(AR) $@ $(OBJS)
+       $(AR_RC) $@ $(OBJS)

        $(RANLIB) $@
 
        $(RANLIB) $@
 

-test: pngtest$(E)
-       ./pngtest$(E)
+test: pngtest$(EXE)
+       ./pngtest$(EXE)

 
 

-pngtest$(E): pngtest$(O) libpng$(A)
-       $(LD) -o $@ pngtest$(O) $(LDFLAGS)
+pngtest$(EXE): pngtest$(O) libpng$(A)
+       $(LD) $(LDFLAGS) -L$(ZLIBLIB) -o $@ pngtest$(O) libpng$(A) $(LIBS)

 
 clean:
 
 clean:

-       $(RM) *$(O) libpng$(A) pngtest$(E) pngout.png
+       $(RM_F) *$(O) libpng$(A) pngtest$(EXE) pngout.png

 
 png$(O): png.h pngconf.h
 pngerror$(O): png.h pngconf.h
 
 png$(O): png.h pngconf.h
 pngerror$(O): png.h pngconf.h