On Tue, 2006-06-27 at 02:23 -0400, Youness Alaoui wrote:
> humm.. I guess you're right, but can't we set a minimal version ? at
> least, set it to the one CxImage came with, we don't know about backward
> compatibility...
Yes I guess you are right
> about your patch, am I dreaming, or is the latest Opera 9 buggy, or did
> you just forget to include the attachment ?
one of the first two, try to "view source"
Added the attachment again in a slightly different way..
diff -ur amsn~/Makefile.in amsn/Makefile.in
--- amsn~/Makefile.in 2006-04-28 00:10:17.000000000 +0200
+++ amsn/Makefile.in 2006-05-20 10:37:16.000000000 +0200
@@ -50,7 +50,7 @@
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
LIB_FLAGS := -I. -I$(capture_dir) -I$(capture_dir)/libng -I$(capture_dir)/structs
LIB_FLAGS += -I$(webcamsn_dir)/src -I$(tkcximage_dir)/src -I$(tkcximage_dir)/src/CxImage
-LIB_FLAGS += -I$(tkcximage_dir)/src/zlib -I$(tkcximage_dir)/src/png -I$(tkcximage_dir)/src/jpeg
+LIB_FLAGS += -Ipng -Ijpeg
LIBDIR := @LIBDIR@
@@ -100,7 +100,7 @@
CXXFLAGS += -fPIC
# libraries
-LDLIBS := @LDLIBS@
+LDLIBS := @LDLIBS@ -lpng -ljpeg
LDFLAGS := @LDFLAGS@
ifeq (@DEBUG@,no)
LDFLAGS += -s
@@ -224,9 +224,6 @@
include $(tkcximage_dir)/Rules.mk
include $(tkcximage_dir)/src/Rules.mk
include $(tkcximage_dir)/src/CxImage/Rules.mk
-include $(tkcximage_dir)/src/zlib/Rules.mk
-include $(tkcximage_dir)/src/png/Rules.mk
-include $(tkcximage_dir)/src/jpeg/Rules.mk
include $(tkcximage_dir)/src/Rules.mk
include $(webcamsn_dir)/Rules.mk
diff -ur amsn~/utils/TkCximage/src/CxImage/ximajpg.cpp amsn/utils/TkCximage/src/CxImage/ximajpg.cpp
--- amsn~/utils/TkCximage/src/CxImage/ximajpg.cpp 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximajpg.cpp 2006-05-18 23:03:20.000000000 +0200
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_JPG
-#include "../jpeg/jmorecfg.h"
+#include <jmorecfg.h>
#include "ximaiter.h"
diff -ur amsn~/utils/TkCximage/src/CxImage/ximajpg.h amsn/utils/TkCximage/src/CxImage/ximajpg.h
--- amsn~/utils/TkCximage/src/CxImage/ximajpg.h 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximajpg.h 2006-05-19 10:12:38.000000000 +0200
@@ -29,8 +29,8 @@
#define CXIMAGEJPG_SUPPORT_EXIF 1
extern "C" {
- #include "../jpeg/jpeglib.h"
- #include "../jpeg/jerror.h"
+ #include <jpeglib.h>
+ #include <jerror.h>
}
class DLL_EXP CxImageJPG: public CxImage
diff -ur amsn~/utils/TkCximage/src/CxImage/ximapng.h amsn/utils/TkCximage/src/CxImage/ximapng.h
--- amsn~/utils/TkCximage/src/CxImage/ximapng.h 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximapng.h 2006-05-18 23:04:57.000000000 +0200
@@ -22,7 +22,7 @@
#if CXIMAGE_SUPPORT_PNG
extern "C" {
-#include "../png/png.h"
+#include <png.h>
}
long int inline btohl( long int dword ) {
diff -ur amsn~/utils/TkCximage/src/Rules.mk amsn/utils/TkCximage/src/Rules.mk
--- amsn~/utils/TkCximage/src/Rules.mk 2006-02-02 22:08:21.000000000 +0100
+++ amsn/utils/TkCximage/src/Rules.mk 2006-05-19 09:57:03.000000000 +0200
@@ -1,7 +1,5 @@
OBJS-TkCximage := $(tkcximage_dir)/src/TkCximage.cpp.o $(tkcximage_dir)/src/PhotoFormat.cpp.o \
- $(tkcximage_dir)/src/procs.cpp.o $(tkcximage_dir)/src/CxImage/libCxImage.a \
- $(tkcximage_dir)/src/jpeg/libjpeg.a $(tkcximage_dir)/src/png/libpng.a \
- $(tkcximage_dir)/src/zlib/libzlib.a
+ $(tkcximage_dir)/src/procs.cpp.o $(tkcximage_dir)/src/CxImage/libCxImage.a
ifeq ($(STATIC),yes)
OBJS-TkCximage += libstdc++.a
endif
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Amsn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/amsn-devel
