summaryrefslogtreecommitdiff
blob: 7be3905577c3c256995a85c43e5c337eab818274 (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
Use the system jpeg rather than the bundled one

--- mpeg_encode/Makefile
+++ mpeg_encode/Makefile
@@ -36,9 +36,9 @@
 ##############
 # JPEG STUFF #
 ##############
-JPEG_LIB = jpeg/libjpeg.a
-JPEG_DIR = -Ijpeg
-JPEG_LIB_DIR = -Ljpeg
+JPEG_LIB = -ljpeg
+JPEG_DIR = 
+JPEG_LIB_DIR = 
 MP_JPEG_OBJS = jpeg.o
 MP_JPEG_SRCS = jpeg.c
 
@@ -57,7 +57,7 @@
 #################
 # INCLUDE FILES # 
 #################
-INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
+INCLUDEDIR = -Iheaders
 
 ############################################################################
 # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
--- mpeg_encode/jpeg.c
+++ mpeg_encode/jpeg.c
@@ -79,7 +79,8 @@
 
 /* make it happier.... */
 #undef DCTSIZE2
-#include "jpeg/jpeglib.h"
+#include "jpeglib.h"
+#include "jpegint.h"
 
 
 #define HEADER_SIZE 607   /*JFIF header size used on output images*/