blob: ffccaf6099409406634977b57c5a8b3e153aaea6 (
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
|
Index: v4l4j-0.8.10/libvideo/Makefile
===================================================================
--- v4l4j-0.8.10.orig/libvideo/Makefile 2011-03-27 00:06:05.000000000 -0500
+++ v4l4j-0.8.10/libvideo/Makefile 2011-08-22 14:59:05.417274581 -0500
@@ -71,12 +71,12 @@
qc-probe.o fps-param-probe.o v4l1-query.o v4l2-query.o v4l1-tuner.o \
v4l2-tuner.o palettes.o
-CC := gcc
+#CC := gcc
CFLAGS := $(DBG) -DVER_MAJ=$(VERSION_MAJOR) -DVER_MIN=$(VERSION_MINOR) \
$(OPTIMISATION) -fPIC -I.
-LD := gcc
-LDFLAGS := -lm -lrt -shared
+LD := $(CC)
+LDFLAGS += -lm -lrt -shared
all: $(LIB).$(LIB_RELEASE)
Index: v4l4j-0.8.10/src/Makefile
===================================================================
--- v4l4j-0.8.10.orig/src/Makefile 2010-11-15 05:10:14.000000000 -0600
+++ v4l4j-0.8.10/src/Makefile 2011-08-22 14:59:31.337596732 -0500
@@ -41,13 +41,13 @@
v4l4j_DeviceInfo.o v4l4j_VideoDevice.o v4l4j_Control.o v4l4j_Tuner.o \
v4l4j_ResolutionInfo.o v4l4j_FrameInterval.o
-CC := gcc
+#CC := gcc
INCLUDES := -I$(JDK_HOME)/include -I$(JDK_HOME)/include/linux/ \
-I$(LIBVIDEO_PATH) -I.
CFLAGS := $(INCLUDES) $(DBG) $(OPTIMISATION) -fPIC
-LD := gcc
-LDFLAGS := -shared -ljpeg -L$(LIBVIDEO_PATH) -l$(LIBVIDEO_NAME)
+LD := $(CC)
+LDFLAGS += -shared -ljpeg -L$(LIBVIDEO_PATH) -l$(LIBVIDEO_NAME)
all: $(LIB)
|
