hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

LADSPA/SWH: fixed compiler warnings resulting in Win32 build failure

Browse Source
This commit is contained in:
Tobias Doerffel
2014-01-26 01:48:53 +01:00
parent 0063b891a8
commit 417a1566a0
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/ladspa_effect/swh/CMakeLists.txt
View File

@@ -29,8 +29,14 @@ FOREACH(_item ${PLUGIN_SOURCES})
ENDFOREACH(_item ${PLUGIN_SOURCES})
IF(LMMS_BUILD_WIN32)
SET(PIC_FLAGS "")
ELSE(LMMS_BUILD_WIN32)
SET(PIC_FLAGS "-fPIC")
ENDIF(LMMS_BUILD_WIN32)
ADD_LIBRARY(iir STATIC util/iir.c)
SET_TARGET_PROPERTIES(iir PROPERTIES COMPILE_FLAGS "-fPIC")
SET_TARGET_PROPERTIES(iir PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
TARGET_LINK_LIBRARIES(bandpass_a_iir_1893 iir)
TARGET_LINK_LIBRARIES(bandpass_iir_1892 iir)
TARGET_LINK_LIBRARIES(butterworth_1902 iir)
@@ -40,21 +46,21 @@ TARGET_LINK_LIBRARIES(notch_iir_1894 iir)
FILE(GLOB GSM_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/gsm/*.c)
ADD_LIBRARY(gsm STATIC ${GSM_SOURCES})
SET_TARGET_PROPERTIES(gsm PROPERTIES COMPILE_FLAGS "-fPIC")
SET_TARGET_PROPERTIES(gsm PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
TARGET_LINK_LIBRARIES(gsm_1215 gsm)
ADD_LIBRARY(gverb STATIC gverb/gverb.c gverb/gverbdsp.c)
SET_TARGET_PROPERTIES(gverb PROPERTIES COMPILE_FLAGS "-fPIC")
SET_TARGET_PROPERTIES(gverb PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
TARGET_LINK_LIBRARIES(gverb_1216 gverb)
ADD_LIBRARY(blo STATIC util/blo.c)
SET_TARGET_PROPERTIES(blo PROPERTIES COMPILE_FLAGS "-fPIC")
SET_TARGET_PROPERTIES(blo PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
TARGET_LINK_LIBRARIES(hermes_filter_1200 blo)
ADD_LIBRARY(rms STATIC util/rms.c)
ADD_LIBRARY(db STATIC util/db.c)
SET_TARGET_PROPERTIES(rms PROPERTIES COMPILE_FLAGS "-fPIC")
SET_TARGET_PROPERTIES(db PROPERTIES COMPILE_FLAGS "-fPIC")
SET_TARGET_PROPERTIES(rms PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
SET_TARGET_PROPERTIES(db PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
TARGET_LINK_LIBRARIES(sc1_1425 rms db)
TARGET_LINK_LIBRARIES(sc2_1426 rms db)
TARGET_LINK_LIBRARIES(sc3_1427 rms db)
@@ -63,6 +69,6 @@ TARGET_LINK_LIBRARIES(sc4m_1916 rms db)
TARGET_LINK_LIBRARIES(se4_1883 rms db)
ADD_LIBRARY(pitchscale STATIC util/pitchscale.c)
SET_TARGET_PROPERTIES(pitchscale PROPERTIES COMPILE_FLAGS "-fPIC")
SET_TARGET_PROPERTIES(pitchscale PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
TARGET_LINK_LIBRARIES(pitch_scale_1193 pitchscale)
TARGET_LINK_LIBRARIES(pitch_scale_1194 pitchscale)

2
plugins/ladspa_effect/swh/util/blo.c
View File

@@ -48,7 +48,9 @@ blo_h_tables *blo_h_tables_new(int table_size)
unsigned int h;
size_t all_tables_size = sizeof(float) * (table_size + BLO_TABLE_WR)
* (BLO_N_HARMONICS - 1) * 2;
#ifndef WIN32
int shm_fd;
#endif
char shm_path[128];
this = malloc(sizeof(blo_h_tables));