blob: 0b72bd245b0f56bb4d2aaa9b0caddd4ae4aeea57 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- src/Makefile
+++ src/Makefile
@@ -12,10 +12,10 @@
CXX = g++
CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
-INCPATH = -I../support/include -I../support/glpng/include -I/usr/X11R6/include
+INCPATH = -I../support/glpng/include -I/usr/X11R6/include
LINK = g++
LFLAGS =
-LIBS = $(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS)
+LIBS = $(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) -lpng
MOC = $(QTDIR)/bin/moc
UIC = $(QTDIR)/bin/uic
--- support/glpng/src/glpng.c
+++ support/glpng/src/glpng.c
@@ -3,11 +3,12 @@
#include <windows.h>
#endif
+#define GL_GLEXT_PROTOTYPES 1
#include <GL/glpng.h>
#include <GL/gl.h>
#include <stdlib.h>
#include <math.h>
-#include "png/png.h"
+#include <png.h>
/* Used to decide if GL/gl.h supports the paletted extension */
#ifdef GL_COLOR_INDEX1_EXT
--- support/glpng/src/Makefile
+++ support/glpng/src/Makefile
@@ -54,27 +54,7 @@
zlib/inftrees.c \
zlib/infutil.c \
zlib/zutil.c
-OBJECTS = glpng.o \
- png/png.o \
- png/pngerror.o \
- png/pngget.o \
- png/pngmem.o \
- png/pngpread.o \
- png/pngread.o \
- png/pngrio.o \
- png/pngrtran.o \
- png/pngrutil.o \
- png/pngset.o \
- png/pngtrans.o \
- zlib/adler32.o \
- zlib/crc32.o \
- zlib/infblock.o \
- zlib/infcodes.o \
- zlib/inffast.o \
- zlib/inflate.o \
- zlib/inftrees.o \
- zlib/infutil.o \
- zlib/zutil.o
+OBJECTS = glpng.o
INTERFACES =
UICDECLS =
UICIMPLS =
|
GitWeb
