From 15d467a7f9828ef4c8a1eb7f4dfd81a7410c09d6 Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Thu, 26 Mar 2015 16:25:50 +0100 Subject: [PATCH 1/4] add CMakeLists.txt to build easily with Jamoma --- CMakeLists.txt | 6 ++++++ Sources/CMakeLists.txt | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 Sources/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..c5ffea9 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.0) +project(CicmWrapper) + +message("Configuring CicmWrapper") + +add_subdirectory(Sources) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt new file mode 100644 index 0000000..d1fd5e6 --- /dev/null +++ b/Sources/CMakeLists.txt @@ -0,0 +1,25 @@ +add_definitions(-O2 -fPIC) + +file(GLOB_RECURSE PROJECT_SRCS +${CMAKE_CURRENT_SOURCE_DIR}/*.c +${CMAKE_CURRENT_SOURCE_DIR}/ebox/*.c +${CMAKE_CURRENT_SOURCE_DIR}/eclass/*.c +${CMAKE_CURRENT_SOURCE_DIR}/ecommons/*.c +${CMAKE_CURRENT_SOURCE_DIR}/egraphics/*.c +${CMAKE_CURRENT_SOURCE_DIR}/eobj/*.c +${CMAKE_CURRENT_SOURCE_DIR}/epopup/*.c +) + +add_library(${PROJECT_NAME} ${PROJECT_SRCS}) + +#[[ +add_subdirectory(ebox) +add_subdirectory(eclass) +add_subdirectory(ecommon) +add_subdirectory(egraphics) +add_subdirectory(eobj) +add_subdirectory(epopup) + +add_target_libraries(${PROJECT_NAME} ebox eclass ecommon egraphics eobj epopup) +]] + From 6cc3fd80c15ca8d3f0ba552c99fc2481c2b6b84d Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Fri, 26 Jun 2015 18:05:25 +0200 Subject: [PATCH 2/4] update CMakeLists to reflect repo reorganisation --- CMakeLists.txt | 8 +++++++- Sources/CMakeLists.txt | 25 ------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 Sources/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index c5ffea9..ac94dc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,4 +3,10 @@ project(CicmWrapper) message("Configuring CicmWrapper") -add_subdirectory(Sources) +add_definitions(-O2 -fPIC) + +file(GLOB_RECURSE PROJECT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.c) + +file(GLOB_RECURSE PROJECT_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) + +add_library(${PROJECT_NAME} ${PROJECT_SRCS}) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt deleted file mode 100644 index d1fd5e6..0000000 --- a/Sources/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -add_definitions(-O2 -fPIC) - -file(GLOB_RECURSE PROJECT_SRCS -${CMAKE_CURRENT_SOURCE_DIR}/*.c -${CMAKE_CURRENT_SOURCE_DIR}/ebox/*.c -${CMAKE_CURRENT_SOURCE_DIR}/eclass/*.c -${CMAKE_CURRENT_SOURCE_DIR}/ecommons/*.c -${CMAKE_CURRENT_SOURCE_DIR}/egraphics/*.c -${CMAKE_CURRENT_SOURCE_DIR}/eobj/*.c -${CMAKE_CURRENT_SOURCE_DIR}/epopup/*.c -) - -add_library(${PROJECT_NAME} ${PROJECT_SRCS}) - -#[[ -add_subdirectory(ebox) -add_subdirectory(eclass) -add_subdirectory(ecommon) -add_subdirectory(egraphics) -add_subdirectory(eobj) -add_subdirectory(epopup) - -add_target_libraries(${PROJECT_NAME} ebox eclass ecommon egraphics eobj epopup) -]] - From bb6bf6b05a9ec3483b534b182c516dc2cac59972 Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Mon, 5 Dec 2016 00:36:03 +0100 Subject: [PATCH 3/4] update CMakeLists.txt add pd include add explicitly each .cpp and .h files, so a change will trig a build --- CMakeLists.txt | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac94dc5..4406dc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,28 @@ message("Configuring CicmWrapper") add_definitions(-O2 -fPIC) -file(GLOB_RECURSE PROJECT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.c) +include_directories(${PD_MAIN_PATH}/src) -file(GLOB_RECURSE PROJECT_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +set(PROJECT_SRCS + Sources/ebox.c + Sources/eclass.c + Sources/ecommon.c + Sources/egraphics.c + Sources/eobj.c + Sources/epopup.c +) + +set(PROJECT_HDRS + Sources/cicm_wrapper.h + Sources/ebox.h + Sources/eclass.h + Sources/ecommon.h + Sources/edefine.h + Sources/egraphics.h + Sources/enative.h + Sources/eobj.h + Sources/epdmax.h + Sources/epopup.h +) add_library(${PROJECT_NAME} ${PROJECT_SRCS}) From b64f0430c35725970610641bbcd24d7bd71aebe4 Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Mon, 5 Dec 2016 00:36:23 +0100 Subject: [PATCH 4/4] typo --- Sources/ebox.h | 2 +- Sources/ecommon.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/ebox.h b/Sources/ebox.h index 18f78b1..1b93272 100644 --- a/Sources/ebox.h +++ b/Sources/ebox.h @@ -46,7 +46,7 @@ void ebox_ready(t_ebox *x); /*! * \fn void ebox_free(t_ebox* x) - * \brief Indicates that the t_ebox can be drawn. + * \brief Free the object. * \details Deletes the drawings. \n This function should replace pd_free() and you shouldn't have to call eobj_free() or eobj_dspfree(); * \param x The t_ebox pointer. */ diff --git a/Sources/ecommon.h b/Sources/ecommon.h index 0b60c41..412d73a 100644 --- a/Sources/ecommon.h +++ b/Sources/ecommon.h @@ -20,6 +20,7 @@ #include "edefine.h" +// TODO av : method documentation void object_method(void* x, t_symbol* s, void* z, t_typ_method method, long number, void* other); /*! @addtogroup groupcommon The Common Part