Changeset 3827 in Sophya for trunk/AddOn

Timestamp:

Aug 3, 2010, 10:51:12 AM (15 years ago)

Author:

cmv

Message:

correction de bugs + inconsistances de la makefile, adaptation pour Linux, cmv 03/08/2010

File:

• trunk/AddOn/PIPhoto/makefile (modified) (5 diffs)

trunk/AddOn/PIPhoto/makefile

@@ -20 +20 @@
 #IMGMAGLIBS = -L/usr/lib \
 #             -lfreetype -lz \
-#             -lMagick++ -lWand -lMagick -llcms -ltiff -lfreetype \
+#             -lMagick++ -llcms -ltiff -lfreetype \
 #             -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz \
 #             -lpthread -lm -lpthread 
-#IMGMAGINCP = -I/usr/include
+#IMGMAGINCP = -I/usr/include/ImageMagick/
 ###########
 
@@ -34 +34 @@
 
 clean :
-        rm $(MEXE)/rgb2img  $(MEXE)/img2rgb  $(MEXE)/animrgbs $(MSLB)/imgmagmod.so
-        rm $(MOBJ)/rgb2img.o  $(MOBJ)/img2rgb.o  $(MOBJ)/animrgbs.o $(MOBJ)/imgmagmod.o $(MOBJ)imgmag_pi.o
+        rm -f $(MEXE)/rgb2img  $(MEXE)/img2rgb  $(MEXE)/animrgbs $(MSLB)/imgmagmod.so
+        rm -f $(MOBJ)/rgb2img.o  $(MOBJ)/img2rgb.o  $(MOBJ)/animrgbs.o $(MOBJ)/imgmagmod.o $(MOBJ)imgmag_pi.o
 
  
@@ -43 +43 @@
 
 $(MOBJ)/img2rgb.o : img2rgb.cc imgmag_pi.h
-         $(CXXCOMPILE) -I/sw/include -o $(MOBJ)/img2rgb.o img2rgb.cc
+         $(CXXCOMPILE) ${IMGMAGINCP} -o $(MOBJ)/img2rgb.o img2rgb.cc
 
 $(MEXE)/rgb2img : $(MOBJ)/rgb2img.o $(MOBJ)/imgmag_pi.o 
@@ -54 +54 @@
 
 $(MOBJ)/animrgbs.o : animrgbs.cc imgmag_pi.h
-         $(CXXCOMPILE) -I/sw/include -o $(MOBJ)/animrgbs.o animrgbs.cc
+         $(CXXCOMPILE) ${IMGMAGINCP} -o $(MOBJ)/animrgbs.o animrgbs.cc
 
 $(MOBJ)/rgb2img.o : rgb2img.cc imgmag_pi.h
-         $(CXXCOMPILE) -I/sw/include -o $(MOBJ)/rgb2img.o rgb2img.cc
-         
+         $(CXXCOMPILE) ${IMGMAGINCP} -o $(MOBJ)/rgb2img.o rgb2img.cc
+
 $(MOBJ)/imgmag_pi.o : imgmag_pi.cc imgmag_pi.h
-         $(CXXCOMPILE) -I/sw/include -o $(MOBJ)/imgmag_pi.o imgmag_pi.cc
-         
+         $(CXXCOMPILE) ${IMGMAGINCP} -o $(MOBJ)/imgmag_pi.o imgmag_pi.cc
+
 $(MSLB)/imgmagmod.so : $(MOBJ)/imgmagmod.o $(MOBJ)/imgmag_pi.o   
         $(CXXDLL) -o $(MSLB)/imgmagmod.so  $(MOBJ)/imgmagmod.o $(MOBJ)/imgmag_pi.o \
@@ -67 +67 @@
 
 $(MOBJ)/imgmagmod.o : imgmagmod.cc imgmag_pi.h
-         $(CXXCOMPILE) -I/sw/include -o $(MOBJ)/imgmagmod.o imgmagmod.cc
-         
+         $(CXXCOMPILE) ${IMGMAGINCP} -o $(MOBJ)/imgmagmod.o imgmagmod.cc
 
+