aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2016-03-31 09:44:41 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2016-03-31 09:44:41 +0200
commit33837ba2ca7fc1d35349a5ab26aef2d3a83d9f7f (patch)
tree09bf4b1289ffeec7060a06687474d351523004a8
parent710553e747d745aad3aef6501ff839448df7bcbf (diff)
downloadsherlock.lv2-33837ba2ca7fc1d35349a5ab26aef2d3a83d9f7f.tar.xz
adapt C_FLAGS, use CMAKE_SHARED_MODULE_SUFFIX.
* adapt C_FLAGS for less verbose warnings with GCC. * use CMAKE_SHARED_MODULE_SUFFIX. * remove unnedded #include.
-rw-r--r--CMakeLists.txt11
-rw-r--r--atom_inspector_ui.c2
-rw-r--r--manifest.ttl.in30
-rw-r--r--midi_inspector_ui.c2
-rw-r--r--osc_inspector_ui.c2
5 files changed, 17 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d08dff..35ae444 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ include_directories(${PROJECT_SOURCE_DIR}/libosc)
include_directories(${PROJECT_SOURCE_DIR}/eo_ui.lv2)
include_directories(${PROJECT_SOURCE_DIR}/osc.lv2)
-set(CMAKE_C_FLAGS "-std=gnu99 -Wextra -Wno-unused-parameter -ffast-math -fvisibility=hidden ${CMAKE_C_FLAGS}")
-set(CMAKE_C_FLAGS "-Wshadow -Wimplicit-function-declaration -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes ${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "-std=gnu11 -Wextra -Wno-unused-parameter -ffast-math -fvisibility=hidden ${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "-Wshadow -Wimplicit-function-declaration -Wmissing-prototypes -Wstrict-prototypes ${CMAKE_C_FLAGS}")
set(CMAKE_MODULE_LINKER_FLAGS "-Wl,-z,nodelete ${CMAKE_MODULE_LINKER_FLAGS}")
set(SHERLOCK_MAJOR_VERSION 0)
@@ -19,13 +19,6 @@ add_definitions("-DSHERLOCK_VERSION=\"${SHERLOCK_VERSION}\"")
add_definitions("-D_GNU_SOURCE=1") # asprintf
set(DEST lib/lv2/sherlock.lv2)
-if(WIN32)
- set(LIB_EXT ".dll")
-elseif(APPLE)
- set(LIB_EXT ".so")
-else()
- set(LIB_EXT ".so")
-endif()
find_package(PkgConfig) # ${PKG_CONFIG_FOUND}
diff --git a/atom_inspector_ui.c b/atom_inspector_ui.c
index 800b5c8..f9370a0 100644
--- a/atom_inspector_ui.c
+++ b/atom_inspector_ui.c
@@ -19,8 +19,6 @@
#include <sherlock.h>
-#include <Elementary.h>
-
#include <lv2_eo_ui.h>
#define COUNT_MAX 2048 // maximal amount of events shown
diff --git a/manifest.ttl.in b/manifest.ttl.in
index 859fb3c..8c63cb3 100644
--- a/manifest.ttl.in
+++ b/manifest.ttl.in
@@ -36,7 +36,7 @@ sherlock:atom_inspector
a lv2:Plugin ;
lv2:minorVersion @SHERLOCK_MINOR_VERSION@ ;
lv2:microVersion @SHERLOCK_MICRO_VERSION@ ;
- lv2:binary <sherlock@LIB_EXT@> ;
+ lv2:binary <sherlock@CMAKE_SHARED_MODULE_SUFFIX@> ;
@EO_UI_WRAP@ui:ui sherlock:atom_inspector_eo ;
@UI_UI_WRAP@ui:ui sherlock:atom_inspector_ui ;
@KX_UI_WRAP@ui:ui sherlock:atom_inspector_kx ;
@@ -45,19 +45,19 @@ sherlock:atom_inspector
sherlock:atom_inspector_eo
a ui:EoUI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:atom_inspector_ui
a ui:UI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:atom_inspector_x11
a ui:X11UI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:atom_inspector_kx
a kx:Widget ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
# MIDI Inspector Plugin
@@ -65,7 +65,7 @@ sherlock:midi_inspector
a lv2:Plugin ;
lv2:minorVersion @SHERLOCK_MINOR_VERSION@ ;
lv2:microVersion @SHERLOCK_MICRO_VERSION@ ;
- lv2:binary <sherlock@LIB_EXT@> ;
+ lv2:binary <sherlock@CMAKE_SHARED_MODULE_SUFFIX@> ;
@EO_UI_WRAP@ui:ui sherlock:midi_inspector_eo ;
@UI_UI_WRAP@ui:ui sherlock:midi_inspector_ui ;
@KX_UI_WRAP@ui:ui sherlock:midi_inspector_kx ;
@@ -74,19 +74,19 @@ sherlock:midi_inspector
sherlock:midi_inspector_eo
a ui:EoUI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:midi_inspector_ui
a ui:UI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:midi_inspector_x11
a ui:X11UI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:midi_inspector_kx
a kx:Widget ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
# OSC Inspector Plugin
@@ -94,7 +94,7 @@ sherlock:osc_inspector
a lv2:Plugin ;
lv2:minorVersion @SHERLOCK_MINOR_VERSION@ ;
lv2:microVersion @SHERLOCK_MICRO_VERSION@ ;
- lv2:binary <sherlock@LIB_EXT@> ;
+ lv2:binary <sherlock@CMAKE_SHARED_MODULE_SUFFIX@> ;
@EO_UI_WRAP@ui:ui sherlock:osc_inspector_eo ;
@UI_UI_WRAP@ui:ui sherlock:osc_inspector_ui ;
@KX_UI_WRAP@ui:ui sherlock:osc_inspector_kx ;
@@ -103,17 +103,17 @@ sherlock:osc_inspector
sherlock:osc_inspector_eo
a ui:EoUI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:osc_inspector_ui
a ui:UI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:osc_inspector_x11
a ui:X11UI ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
sherlock:osc_inspector_kx
a kx:Widget ;
- ui:binary <sherlock_ui@LIB_EXT@> ;
+ ui:binary <sherlock_ui@CMAKE_SHARED_MODULE_SUFFIX@> ;
rdfs:seeAlso <sherlock.ttl> .
diff --git a/midi_inspector_ui.c b/midi_inspector_ui.c
index d5649ad..09383cb 100644
--- a/midi_inspector_ui.c
+++ b/midi_inspector_ui.c
@@ -17,8 +17,6 @@
#include <sherlock.h>
-#include <Elementary.h>
-
#include <lv2_eo_ui.h>
#define COUNT_MAX 2048 // maximal amount of events shown
diff --git a/osc_inspector_ui.c b/osc_inspector_ui.c
index 955ddae..ee8d53e 100644
--- a/osc_inspector_ui.c
+++ b/osc_inspector_ui.c
@@ -19,8 +19,6 @@
#include <sherlock.h>
-#include <Elementary.h>
-
#include <lv2_eo_ui.h>
#include <lv2_osc.h>