From 6c6cbdcb1c129ca02daa716a4e8a917c0857fa52 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 2 Feb 2007 16:10:06 +0000 Subject: [PATCH] The commit that will break everthing: - New library: libCGALimageIO - make shared libraries for CORE, and Benchmark. --- Benchmark/src/Benchmark/makefile | 9 +- Core/src/Core/makefile | 2 +- Installation/install_cgal | 69 +++++++++++-- Installation/src/CGAL/makefile | 1 + .../examples/Surface_mesher/makefile | 20 +--- .../include/CGAL/Gray_level_image_3.h | 2 +- .../CGAL}/imageio/ImageIO.h | 0 .../ImageIO => src/CGALimageIO}/ImageIO.c | 2 +- .../ImageIO => src/CGALimageIO}/analyze.c | 0 .../ImageIO => src/CGALimageIO}/analyze.h | 2 +- .../ImageIO => src/CGALimageIO}/bmp.c | 0 .../ImageIO => src/CGALimageIO}/bmp.h | 2 +- .../ImageIO => src/CGALimageIO}/bmpendian.c | 0 .../ImageIO => src/CGALimageIO}/bmpendian.h | 0 .../ImageIO => src/CGALimageIO}/bmpread.c | 0 .../ImageIO => src/CGALimageIO}/bmpread.h | 0 .../ImageIO => src/CGALimageIO}/bmptypes.h | 0 .../ImageIO => src/CGALimageIO}/convert.c | 0 .../ImageIO => src/CGALimageIO}/convert.h | 0 .../ImageIO => src/CGALimageIO}/gif.c | 0 .../ImageIO => src/CGALimageIO}/gif.h | 2 +- .../ImageIO => src/CGALimageIO}/gis.c | 0 .../ImageIO => src/CGALimageIO}/gis.h | 2 +- .../ImageIO => src/CGALimageIO}/inr.c | 0 .../ImageIO => src/CGALimageIO}/inr.h | 2 +- .../ImageIO => src/CGALimageIO}/iris.c | 0 .../ImageIO => src/CGALimageIO}/iris.h | 2 +- Surface_mesher/src/CGALimageIO/makefile | 98 +++++++++++++++++++ .../ImageIO => src/CGALimageIO}/mincio.c | 0 .../ImageIO => src/CGALimageIO}/mincio.h | 2 +- .../ImageIO => src/CGALimageIO}/pnm.c | 0 .../ImageIO => src/CGALimageIO}/pnm.h | 2 +- .../ImageIO => src/CGALimageIO}/recbuffer.c | 0 .../ImageIO => src/CGALimageIO}/recbuffer.h | 0 .../ImageIO => src/CGALimageIO}/recline.c | 0 .../ImageIO => src/CGALimageIO}/recline.h | 0 .../ImageIO => src/CGALimageIO}/reech4x4.c | 0 .../ImageIO => src/CGALimageIO}/reech4x4.h | 0 .../ImageIO => src/CGALimageIO}/typedefs.h | 0 39 files changed, 183 insertions(+), 36 deletions(-) rename Surface_mesher/{examples/Surface_mesher/ImageIO => include/CGAL}/imageio/ImageIO.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/ImageIO.c (99%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/analyze.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/analyze.h (95%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/bmp.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/bmp.h (96%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/bmpendian.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/bmpendian.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/bmpread.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/bmpread.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/bmptypes.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/convert.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/convert.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/gif.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/gif.h (91%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/gis.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/gis.h (98%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/inr.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/inr.h (97%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/iris.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/iris.h (87%) create mode 100644 Surface_mesher/src/CGALimageIO/makefile rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/mincio.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/mincio.h (98%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/pnm.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/pnm.h (94%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/recbuffer.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/recbuffer.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/recline.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/recline.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/reech4x4.c (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/reech4x4.h (100%) rename Surface_mesher/{examples/Surface_mesher/ImageIO => src/CGALimageIO}/typedefs.h (100%) diff --git a/Benchmark/src/Benchmark/makefile b/Benchmark/src/Benchmark/makefile index e44c582e18b..7dcb25daabc 100644 --- a/Benchmark/src/Benchmark/makefile +++ b/Benchmark/src/Benchmark/makefile @@ -57,6 +57,13 @@ Option_parser$(OBJ_EXT) static_lib: lib +shared_lib: $(CGAL_OBJECTS) + $(CGAL_BENCHMARK_SHARED_LIB_CREATE)$(CGAL_BENCHMARK_SHARED_LIB) \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_SHARED_LIB_LDFLAGS) + mv $(CGAL_BENCHMARK_SHARED_LIB) '$(CGAL_LIB_DESTINATION)' + rm $(CGAL_OBJECTS) + lib: lib_no_install mv $(CGAL_BENCHMARK_LIB) $(CGAL_LIB_DESTINATION) @@ -68,7 +75,7 @@ lib_no_install: $(CGAL_OBJECTS) rm $(CGAL_OBJECTS) clean: - rm -f $(CGAL_BENCHMARK_LIB) $(CGAL_OBJECTS) + rm -f $(CGAL_BENCHMARK_LIB) $(CGAL_BENCHMARK_SHARED_LIB) $(CGAL_OBJECTS) #---------------------------------------------------------------------# # suffix rules diff --git a/Core/src/Core/makefile b/Core/src/Core/makefile index c5c81b29ea9..8a58f7320bb 100644 --- a/Core/src/Core/makefile +++ b/Core/src/Core/makefile @@ -39,7 +39,7 @@ GmpIO$(OBJ_EXT) # - The Darwin install_name is buggy (it's libCGAL) shared_lib: $(CGAL_OBJECTS) - $(CGAL_SHARED_LIB_CREATE)$(CGAL_CORE_SHARED_LIB) \ + $(CGAL_CORE_SHARED_LIB_CREATE)$(CGAL_CORE_SHARED_LIB) \ `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ $(CGAL_SHARED_LIB_LDFLAGS) $(GMP_LIBPATHFLAGS) $(MPFR_LIBPATHFLAGS) $(GMP_LDFLAGS) mv $(CGAL_CORE_SHARED_LIB) '$(CGAL_LIB_DESTINATION)' diff --git a/Installation/install_cgal b/Installation/install_cgal index 057d1811436..c0e80e2361f 100755 --- a/Installation/install_cgal +++ b/Installation/install_cgal @@ -777,6 +777,10 @@ set_compiler_flags() CGAL_SHARED_LIB_LDFLAGS= CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -shared" CGAL_SHARED_LIB_INSTALL_NAME="" + CGAL_QT_SHARED_LIB_INSTALL_NAME="" + CGAL_BENCHMARK_SHARED_LIB_INSTALL_NAME="" + CGAL_IMAGEIO_SHARED_LIB_INSTALL_NAME="" + CGAL_CORE_SHARED_LIB_INSTALL_NAME="" CGAL_WINLIB_CXXFLAGS="" CGAL_QT_CXXFLAGS="" WINDOW_INCLUDE="" @@ -799,6 +803,7 @@ set_compiler_flags() CGAL_LIBNAME="libCGAL.a" CGAL_QT_LIBNAME="libCGALQt.a" CGAL_BENCHMARK_LIBNAME="libCGALBenchmark.a" + CGAL_IMAGEIO_LIBNAME="libCGALimageIO.a" CORE_LIBNAME="libcore++.a" CGAL_WIN_EXTRA_DIR=x11 MATH_LIB="m" @@ -829,6 +834,7 @@ set_compiler_flags() CGAL_LIBNAME="CGAL.lib" CGAL_QT_LIBNAME="CGALQt.lib" CGAL_BENCHMARK_LIBNAME="CGALBenchmark.lib" + CGAL_IMAGEIO_LIBNAME="CGALimageIO.lib" CORE_LIBNAME="libcore++.lib" CGAL_WIN_EXTRA_DIR=mswin MATH_LIB="" @@ -859,6 +865,7 @@ set_compiler_flags() CGAL_LIBNAME="CGAL.lib" CGAL_QT_LIBNAME="CGALQt.lib" CGAL_BENCHMARK_LIBNAME="CGALBenchmark.lib" + CGAL_IMAGEIO_LIBNAME="CGALimageIO.lib" CORE_LIBNAME="core++.lib" CGAL_WIN_EXTRA_DIR=mswin MATH_LIB= @@ -889,6 +896,7 @@ set_compiler_flags() CGAL_LIBNAME="CGAL.lib" CGAL_QT_LIBNAME="CGALQt.lib" CGAL_BENCHMARK_LIBNAME="CGALBenchmark.lib" + CGAL_IMAGEIO_LIBNAME="CGALimageIO.lib" CORE_LIBNAME="core++.lib" CGAL_WIN_EXTRA_DIR=mswin MATH_LIB= @@ -978,9 +986,11 @@ set_compiler_flags() ADDITIONAL_CXXFLAGS="-Wall" CGAL_SHARED_LIB_CXXFLAGS="-fno-common" CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -dynamiclib" - # Note : The following CGAL_SHARED_LIB_INSTALL_NAME definition - # prevents re-use for other shared libs, e.g. libCGALQt. CGAL_SHARED_LIB_INSTALL_NAME="-install_name \$(CGAL_LIB_DESTINATION)/\$(CGAL_SHARED_LIB)" + CGAL_QT_SHARED_LIB_INSTALL_NAME="-install_name \$(CGAL_LIB_DESTINATION)/\$(CGAL_QT_SHARED_LIB)" + CGAL_BENCHMARK_SHARED_LIB_INSTALL_NAME="-install_name \$(CGAL_LIB_DESTINATION)/\$(CGAL_BENCHMARK_SHARED_LIB)" + CGAL_IMAGEIO_SHARED_LIB_INSTALL_NAME="-install_name \$(CGAL_LIB_DESTINATION)/\$(CGAL_IMAGEIO_SHARED_LIB)" + CGAL_CORE_SHARED_LIB_INSTALL_NAME="-install_name \$(CGAL_LIB_DESTINATION)/\$(CGAL_CORE_SHARED_LIB)" SHARED_LIB_EXT=".dylib" RANLIB="ranlib" ;; @@ -3886,6 +3896,9 @@ write_linker_flags() if [ -d "${CGAL_SRC_DIR}/Benchmark" ]; then makefile_print_continuationline "`lib_option \"CGALBenchmark\"`" >> ${FILE} fi + if [ -d "${CGAL_SRC_DIR}/CGALimageIO" ]; then + makefile_print_continuationline "`lib_option \"CGALimageIO\"`" >> ${FILE} + fi for i in ${R_SUPPORT_PKGS}; do if [ -n "`value_of \"${i}_SUPPORT\"`" ]; then makefile_print_continuationline "\$(${i}_LDFLAGS)" >> ${FILE} @@ -3905,7 +3918,6 @@ write_linker_flags() ${_printf} "%s\n\n" "CGAL_WINDOW_LDFLAGS = \$(CGAL_LDFLAGS)" >> ${FILE} ${_printf} "%s\n\n" "CGAL_GEOWIN_LDFLAGS = \$(CGAL_LDFLAGS)" >> ${FILE} ${_printf} "%s\n\n" "CGAL_QT_LDFLAGS = \$(CGAL_LDFLAGS)" >> ${FILE} - ${_printf} "%s\n\n" "CGAL_BENCHMARK_LDFLAGS = \$(CGAL_LDFLAGS)" >> ${FILE} } # create the include makefile for current configuration @@ -4030,12 +4042,13 @@ create_include_makefile() >> ${FILE} # - # CGAL_(WIN)LIB + # CGAL_(*)LIB # ${_printf} "%s\n" "CGAL_LIB = ${CGAL_LIBNAME}" >> ${FILE} ${_printf} "%s\n" "CGAL_WIN_EXTRA_DIR = ${CGAL_WIN_EXTRA_DIR}" >> ${FILE} ${_printf} "%s\n" "CGAL_QT_LIB = ${CGAL_QT_LIBNAME}" >> ${FILE} ${_printf} "%s\n" "CGAL_BENCHMARK_LIB = ${CGAL_BENCHMARK_LIBNAME}" >> ${FILE} + ${_printf} "%s\n" "CGAL_IMAGEIO_LIB = ${CGAL_IMAGEIO_LIBNAME}" >> ${FILE} ${_printf} "%s\n" "CGAL_CORE_LIB = ${CORE_LIBNAME}" >> ${FILE} @@ -4065,6 +4078,7 @@ create_include_makefile() ${_printf} "%s\n" "CGAL_CORE_SHARED_LIB = libcore++${SHARED_LIB_EXT}" >> ${FILE} ${_printf} "%s\n" "CGAL_QT_SHARED_LIB = libCGALQt${SHARED_LIB_EXT}" >> ${FILE} ${_printf} "%s\n" "CGAL_BENCHMARK_SHARED_LIB = libCGALBenchmark${SHARED_LIB_EXT}" >> ${FILE} + ${_printf} "%s\n" "CGAL_IMAGEIO_SHARED_LIB = libCGALimageIO${SHARED_LIB_EXT}" >> ${FILE} # # CGAL_SHARED_LIB_CXXFLAGS @@ -4080,6 +4094,14 @@ create_include_makefile() "CGAL_SHARED_LIB_LDFLAGS = ${CGAL_SHARED_LIB_LDFLAGS}" >> ${FILE} ${_printf} "%s\n" >> ${FILE} + + ## CGAL_SHARED_LIB_CREATE, CGAL_QT_SHARED_LIB_CREATE, + ## CGAL_BENCHMARK_SHARED_LIB_CREATE, and CGAL_IMAGEIO_SHARED_LIB_CREATE + ## are makefile variables used only in the makefiles in src/*/. + ## + ## This is a temporary hack, I hope, until we use another build system. + ## -- Laurent Rineau, 2007/02/02. + # # CGAL_SHARED_LIB_CREATE # @@ -4087,6 +4109,34 @@ create_include_makefile() "CGAL_SHARED_LIB_CREATE = ${CGAL_SHARED_LIB_CREATE} ${CGAL_SHARED_LIB_INSTALL_NAME} -o ''" \ >> ${FILE} + # + # CGAL_QT_SHARED_LIB_CREATE + # + ${_printf} "%s\n\n" \ + "CGAL_QT_SHARED_LIB_CREATE = ${CGAL_SHARED_LIB_CREATE} ${CGAL_QT_SHARED_LIB_INSTALL_NAME} -o ''" \ + >> ${FILE} + + # + # CGAL_BENCHMARK_SHARED_LIB_CREATE + # + ${_printf} "%s\n\n" \ + "CGAL_BENCHMARK_SHARED_LIB_CREATE = ${CGAL_SHARED_LIB_CREATE} ${CGAL_BENCHMARK_SHARED_LIB_INSTALL_NAME} -o ''" \ + >> ${FILE} + + # + # CGAL_IMAGEIO_SHARED_LIB_CREATE + # + ${_printf} "%s\n\n" \ + "CGAL_IMAGEIO_SHARED_LIB_CREATE = ${CGAL_SHARED_LIB_CREATE} ${CGAL_IMAGEIO_SHARED_LIB_INSTALL_NAME} -o ''" \ + >> ${FILE} + + # + # CGAL_CORE_SHARED_LIB_CREATE + # + ${_printf} "%s\n\n" \ + "CGAL_CORE_SHARED_LIB_CREATE = ${CGAL_SHARED_LIB_CREATE} ${CGAL_CORE_SHARED_LIB_INSTALL_NAME} -o ''" \ + >> ${FILE} + # # PRINT_STACKTRACE_PROGRAM # @@ -4153,7 +4203,7 @@ generatemakefiles() } # compile $1 $2 -# $1 = libCGAL, libCore, libCGALQt, libCGALBenchmark ... +# $1 = libCGAL, libCore, libCGALQt, libCGALBenchmark, libCGALimageIO ... # $2 = static, shared # return 0, iff success _do_compile() @@ -4281,12 +4331,17 @@ build_cgal() if [ -d "${CGAL_SRC_DIR}/Benchmark" ]; then cd "${CGAL_SRC_DIR}/Benchmark" _do_compile libCGALBenchmark static - # _do_compile libCGALBenchmark shared # Not yet ready + _do_compile libCGALBenchmark shared + fi + if [ -d "${CGAL_SRC_DIR}/CGALimageIO" ]; then + cd "${CGAL_SRC_DIR}/CGALimageIO" + _do_compile libCGALimageIO static + _do_compile libCGALimageIO shared fi if [ -d "${CGAL_SRC_DIR}/Core" -a "${PROVIDE_PKG_CORE}" = "CGALCORE" ]; then cd "${CGAL_SRC_DIR}/Core" _do_compile libCore static - # _do_compile libCore shared # Not yet ready + _do_compile libCore shared fi fi write_buffer "\n" diff --git a/Installation/src/CGAL/makefile b/Installation/src/CGAL/makefile index 10347292086..a5dd4a81fd5 100644 --- a/Installation/src/CGAL/makefile +++ b/Installation/src/CGAL/makefile @@ -20,6 +20,7 @@ # # Author(s) : Radu Ursu # Sylvain Pion +# Laurent Rineau # This is the makefile for compiling static and shared libraries in CGAL. diff --git a/Surface_mesher/examples/Surface_mesher/makefile b/Surface_mesher/examples/Surface_mesher/makefile index 4804d0398bb..897e1560700 100644 --- a/Surface_mesher/examples/Surface_mesher/makefile +++ b/Surface_mesher/examples/Surface_mesher/makefile @@ -9,25 +9,12 @@ # CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) -default-rule: all - -.PHONY: default-rule - -#---------------------------------------------------------------------# -# ImageIO files -#---------------------------------------------------------------------# - -IMAGEIO_PATH = ImageIO/ - -include $(IMAGEIO_PATH)/imageio.mk - #---------------------------------------------------------------------# # compiler flags #---------------------------------------------------------------------# CXXFLAGS = \ -I../../include \ - -I$(IMAGEIO_PATH) \ $(OTHER_INCLUDES) \ $(CGAL_CXXFLAGS) \ $(LONG_NAME_PROBLEM_CXXFLAGS) \ @@ -53,16 +40,15 @@ TARGETS = mesh_a_3d_gray_image$(EXE_EXT) \ all: $(TARGETS) -mesh_a_3d_gray_image$(EXE_EXT): mesh_a_3d_gray_image$(OBJ_EXT) $(IMAGEIO_OBJECTS) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)mesh_a_3d_gray_image mesh_a_3d_gray_image$(OBJ_EXT) $(IMAGEIO_OBJECTS) $(LDFLAGS) +mesh_a_3d_gray_image$(EXE_EXT): mesh_a_3d_gray_image$(OBJ_EXT) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)mesh_a_3d_gray_image mesh_a_3d_gray_image$(OBJ_EXT) $(LDFLAGS) mesh_an_implicit_function$(EXE_EXT): mesh_an_implicit_function$(OBJ_EXT) $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)mesh_an_implicit_function mesh_an_implicit_function$(OBJ_EXT) $(LDFLAGS) clean: \ mesh_a_3d_gray_image.clean \ - mesh_an_implicit_function.clean \ - imageio-clean + mesh_an_implicit_function.clean diff --git a/Surface_mesher/include/CGAL/Gray_level_image_3.h b/Surface_mesher/include/CGAL/Gray_level_image_3.h index 3916e994bc0..486407a99f5 100644 --- a/Surface_mesher/include/CGAL/Gray_level_image_3.h +++ b/Surface_mesher/include/CGAL/Gray_level_image_3.h @@ -21,7 +21,7 @@ #define CGAL_MESH_3_GRAY_LEVEL_IMAGE_3_H #include -#include "imageio/ImageIO.h" +#include "CGAL/imageio/ImageIO.h" namespace CGAL { diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/imageio/ImageIO.h b/Surface_mesher/include/CGAL/imageio/ImageIO.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/imageio/ImageIO.h rename to Surface_mesher/include/CGAL/imageio/ImageIO.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/ImageIO.c b/Surface_mesher/src/CGALimageIO/ImageIO.c similarity index 99% rename from Surface_mesher/examples/Surface_mesher/ImageIO/ImageIO.c rename to Surface_mesher/src/CGALimageIO/ImageIO.c index 7f18c7bec4c..8222d3af06b 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/ImageIO.c +++ b/Surface_mesher/src/CGALimageIO/ImageIO.c @@ -12,7 +12,7 @@ #include #include -#include +#include /* formats actuellement lus diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/analyze.c b/Surface_mesher/src/CGALimageIO/analyze.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/analyze.c rename to Surface_mesher/src/CGALimageIO/analyze.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/analyze.h b/Surface_mesher/src/CGALimageIO/analyze.h similarity index 95% rename from Surface_mesher/examples/Surface_mesher/ImageIO/analyze.h rename to Surface_mesher/src/CGALimageIO/analyze.h index d246b2816c8..7231155d187 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/analyze.h +++ b/Surface_mesher/src/CGALimageIO/analyze.h @@ -10,7 +10,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include /* read analyse format header diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/bmp.c b/Surface_mesher/src/CGALimageIO/bmp.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/bmp.c rename to Surface_mesher/src/CGALimageIO/bmp.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/bmp.h b/Surface_mesher/src/CGALimageIO/bmp.h similarity index 96% rename from Surface_mesher/examples/Surface_mesher/ImageIO/bmp.h rename to Surface_mesher/src/CGALimageIO/bmp.h index 99c950b1ef5..df3d49777de 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/bmp.h +++ b/Surface_mesher/src/CGALimageIO/bmp.h @@ -30,7 +30,7 @@ extern "C" { #include /* open, close */ #include /* open, close */ #include -#include +#include extern int readBmpImage(const char *name, _image *im); extern void *_readBmpImage( const char *name, int *dimx, int *dimy, int *dimz ); int testBmpHeader(char *magic,const char *name); diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/bmpendian.c b/Surface_mesher/src/CGALimageIO/bmpendian.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/bmpendian.c rename to Surface_mesher/src/CGALimageIO/bmpendian.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/bmpendian.h b/Surface_mesher/src/CGALimageIO/bmpendian.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/bmpendian.h rename to Surface_mesher/src/CGALimageIO/bmpendian.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/bmpread.c b/Surface_mesher/src/CGALimageIO/bmpread.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/bmpread.c rename to Surface_mesher/src/CGALimageIO/bmpread.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/bmpread.h b/Surface_mesher/src/CGALimageIO/bmpread.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/bmpread.h rename to Surface_mesher/src/CGALimageIO/bmpread.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/bmptypes.h b/Surface_mesher/src/CGALimageIO/bmptypes.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/bmptypes.h rename to Surface_mesher/src/CGALimageIO/bmptypes.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/convert.c b/Surface_mesher/src/CGALimageIO/convert.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/convert.c rename to Surface_mesher/src/CGALimageIO/convert.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/convert.h b/Surface_mesher/src/CGALimageIO/convert.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/convert.h rename to Surface_mesher/src/CGALimageIO/convert.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/gif.c b/Surface_mesher/src/CGALimageIO/gif.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/gif.c rename to Surface_mesher/src/CGALimageIO/gif.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/gif.h b/Surface_mesher/src/CGALimageIO/gif.h similarity index 91% rename from Surface_mesher/examples/Surface_mesher/ImageIO/gif.h rename to Surface_mesher/src/CGALimageIO/gif.h index c2fc06e6f34..6e97449559d 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/gif.h +++ b/Surface_mesher/src/CGALimageIO/gif.h @@ -6,7 +6,7 @@ extern "C" { #endif #include -#include +#include int readGifImage(const char *name,_image *im); int testGifHeader(char *magic,const char *name); diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/gis.c b/Surface_mesher/src/CGALimageIO/gis.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/gis.c rename to Surface_mesher/src/CGALimageIO/gis.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/gis.h b/Surface_mesher/src/CGALimageIO/gis.h similarity index 98% rename from Surface_mesher/examples/Surface_mesher/ImageIO/gis.h rename to Surface_mesher/src/CGALimageIO/gis.h index 7b98379fbda..9f722d638ad 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/gis.h +++ b/Surface_mesher/src/CGALimageIO/gis.h @@ -2,7 +2,7 @@ #define GIS_H -#include +#include #ifdef __cplusplus diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/inr.c b/Surface_mesher/src/CGALimageIO/inr.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/inr.c rename to Surface_mesher/src/CGALimageIO/inr.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/inr.h b/Surface_mesher/src/CGALimageIO/inr.h similarity index 97% rename from Surface_mesher/examples/Surface_mesher/ImageIO/inr.h rename to Surface_mesher/src/CGALimageIO/inr.h index 4de690511d4..2287d8044c4 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/inr.h +++ b/Surface_mesher/src/CGALimageIO/inr.h @@ -3,7 +3,7 @@ #define INR_H -#include +#include #ifdef __cplusplus diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/iris.c b/Surface_mesher/src/CGALimageIO/iris.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/iris.c rename to Surface_mesher/src/CGALimageIO/iris.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/iris.h b/Surface_mesher/src/CGALimageIO/iris.h similarity index 87% rename from Surface_mesher/examples/Surface_mesher/ImageIO/iris.h rename to Surface_mesher/src/CGALimageIO/iris.h index 09461d90627..3e39a8892bd 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/iris.h +++ b/Surface_mesher/src/CGALimageIO/iris.h @@ -1,7 +1,7 @@ #ifndef IRIS_H #define IRIS_H -#include +#include #ifdef __cplusplus diff --git a/Surface_mesher/src/CGALimageIO/makefile b/Surface_mesher/src/CGALimageIO/makefile new file mode 100644 index 00000000000..3831def162f --- /dev/null +++ b/Surface_mesher/src/CGALimageIO/makefile @@ -0,0 +1,98 @@ +# Copyright (c) 1997-2006 Utrecht University (The Netherlands), +# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), +# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg +# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), +# and Tel-Aviv University (Israel). All rights reserved. +# +# This file is part of CGAL (www.cgal.org); you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; version 2.1 of the License. +# See the file LICENSE.LGPL distributed with CGAL. +# +# Licensees holding a valid commercial license may use this file in +# accordance with the commercial license agreement provided with the software. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +# +# $URL$ +# $Id$ +# +# Author(s) : Radu Ursu +# Sylvain Pion + +# This is the makefile for compiling static and shared libraries in CGAL. + +#---------------------------------------------------------------------# +# include platform specific settings +#---------------------------------------------------------------------# +# Choose the right include file from the /make directory. + +# The following line should better be passed as command line argument. +# CGAL_MAKEFILE = SHOULD_BE_SET_BY_INSTALL_CGAL +include $(CGAL_MAKEFILE) + +#---------------------------------------------------------------------# +# compiler flags +#---------------------------------------------------------------------# + +# CXXFLAGS needs to be passed as command line argument +# CXXFLAGS = $(CGAL_SHARED_LIB_CXXFLAGS) + +#---------------------------------------------------------------------# +# object files +#---------------------------------------------------------------------# + +CGAL_OBJECTS = \ + ImageIO$(OBJ_EXT) \ + analyze$(OBJ_EXT) \ + bmp$(OBJ_EXT) \ + bmpendian$(OBJ_EXT) \ + bmpread$(OBJ_EXT) \ + convert$(OBJ_EXT) \ + gif$(OBJ_EXT) \ + gis$(OBJ_EXT) \ + inr$(OBJ_EXT) \ + iris$(OBJ_EXT) \ + mincio$(OBJ_EXT) \ + pnm$(OBJ_EXT) \ + recbuffer$(OBJ_EXT) \ + recline$(OBJ_EXT) \ + reech4x4$(OBJ_EXT) + +#---------------------------------------------------------------------# +# target entries +#---------------------------------------------------------------------# + +shared_lib: $(CGAL_OBJECTS) + $(CGAL_IMAGEIO_SHARED_LIB_CREATE)$(CGAL_IMAGEIO_SHARED_LIB) \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_SHARED_LIB_LDFLAGS) + mv $(CGAL_IMAGEIO_SHARED_LIB) '$(CGAL_LIB_DESTINATION)' + rm $(CGAL_OBJECTS) + +static_lib: static_lib_no_install + mv $(CGAL_IMAGEIO_LIB) $(CGAL_LIB_DESTINATION) + +static_lib_no_install: $(CGAL_OBJECTS) + $(CGAL_LIB_CREATE)$(CGAL_IMAGEIO_LIB) \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_LIB_LDFLAGS) + $(RANLIB) $(CGAL_IMAGEIO_LIB) + rm $(CGAL_OBJECTS) + +clean: + rm -f $(CGAL_IMAGEIO_LIB) $(CGAL_IMAGEIO_SHARED_LIB) $(CGAL_OBJECTS) + +#---------------------------------------------------------------------# +# suffix rules +#---------------------------------------------------------------------# + +.SUFFIXES: .cpp $(SUFFIXES) + +.cpp$(OBJ_EXT): + $(CGAL_CXX) $(CXXFLAGS) -c $< + +.c$(OBJ_EXT): + $(CGAL_CXX) $(CXXFLAGS) -c $< + diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/mincio.c b/Surface_mesher/src/CGALimageIO/mincio.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/mincio.c rename to Surface_mesher/src/CGALimageIO/mincio.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/mincio.h b/Surface_mesher/src/CGALimageIO/mincio.h similarity index 98% rename from Surface_mesher/examples/Surface_mesher/ImageIO/mincio.h rename to Surface_mesher/src/CGALimageIO/mincio.h index 1590fc115b5..12f4a3cb92f 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/mincio.h +++ b/Surface_mesher/src/CGALimageIO/mincio.h @@ -3,7 +3,7 @@ #ifdef MINC_FILES -#include +#include #include #ifdef __cplusplus diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/pnm.c b/Surface_mesher/src/CGALimageIO/pnm.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/pnm.c rename to Surface_mesher/src/CGALimageIO/pnm.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/pnm.h b/Surface_mesher/src/CGALimageIO/pnm.h similarity index 94% rename from Surface_mesher/examples/Surface_mesher/ImageIO/pnm.h rename to Surface_mesher/src/CGALimageIO/pnm.h index 9212b36e17a..7a4bbfef174 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/pnm.h +++ b/Surface_mesher/src/CGALimageIO/pnm.h @@ -6,7 +6,7 @@ extern "C" { #endif #include -#include +#include int readPpmImage(const char *name,_image *im); diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/recbuffer.c b/Surface_mesher/src/CGALimageIO/recbuffer.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/recbuffer.c rename to Surface_mesher/src/CGALimageIO/recbuffer.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/recbuffer.h b/Surface_mesher/src/CGALimageIO/recbuffer.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/recbuffer.h rename to Surface_mesher/src/CGALimageIO/recbuffer.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/recline.c b/Surface_mesher/src/CGALimageIO/recline.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/recline.c rename to Surface_mesher/src/CGALimageIO/recline.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/recline.h b/Surface_mesher/src/CGALimageIO/recline.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/recline.h rename to Surface_mesher/src/CGALimageIO/recline.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/reech4x4.c b/Surface_mesher/src/CGALimageIO/reech4x4.c similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/reech4x4.c rename to Surface_mesher/src/CGALimageIO/reech4x4.c diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/reech4x4.h b/Surface_mesher/src/CGALimageIO/reech4x4.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/reech4x4.h rename to Surface_mesher/src/CGALimageIO/reech4x4.h diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/typedefs.h b/Surface_mesher/src/CGALimageIO/typedefs.h similarity index 100% rename from Surface_mesher/examples/Surface_mesher/ImageIO/typedefs.h rename to Surface_mesher/src/CGALimageIO/typedefs.h